Changeset 2466 for trunk/src/kmk/kmkbuiltin/cp.c

Timestamp:

Jul 12, 2011, 11:52:39 AM (14 years ago)

Author:

bird

Message:

kmkbuiltins: More specific error messages (solaris EINTR).

File:

• trunk/src/kmk/kmkbuiltin/cp.c (modified) (4 diffs)

trunk/src/kmk/kmkbuiltin/cp.c

@@ -337 +337 @@
         if (r == -1 && errno != ENOENT) {
                 kBuildProtectionTerm(&g_ProtData);
-                return err(1, "%s", to.p_path);
+                return err(1, "stat: %s", to.p_path);
         }
         if (r == -1 || !S_ISDIR(to_stat.st_mode)) {
@@ -424 +424 @@
                             && curr->fts_errno == ENOENT) {
                                 if (vflag) {
-                                        warnx("%s: %s", curr->fts_path,
+                                        warnx("fts: %s: %s", curr->fts_path,
                                               strerror(curr->fts_errno));
                                 }
@@ -431 +431 @@
                 case FTS_DNR:
                 case FTS_ERR:
-                        warnx("%s: %s",
+                        warnx("fts: %s: %s",
                             curr->fts_path, strerror(curr->fts_errno));
                         badcp = rval = 1;
@@ -594 +594 @@
                                 if (mkdir(to.p_path,
                                     curr->fts_statp->st_mode | S_IRWXU) < 0)
-                                        return err(1, "%s", to.p_path);
+                                        return err(1, "mkdir: %s", to.p_path);
                         } else if (!S_ISDIR(to_stat.st_mode)) {
                                 errno = ENOTDIR;
-                                return err(1, "%s", to.p_path);
+                                return err(1, "to-mode: %s", to.p_path);
                         }
                         /*