Changeset 2466 for trunk/src/kmk/kmkbuiltin/rm.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/rm.c (modified) (18 diffs)

trunk/src/kmk/kmkbuiltin/rm.c

@@ -39 +39 @@
 #endif /* not lint */
 #include <sys/cdefs.h>
-//__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.47 2004/04/06 20:06:50 markm Exp $");
+/*__FBSDID("$FreeBSD: src/bin/rm/rm.c,v 1.47 2004/04/06 20:06:50 markm Exp $");*/
 #endif
 
@@ -287 +287 @@
         }
         while ((p = fts_read(fts)) != NULL) {
+                const char *operation = "chflags";
                 switch (p->fts_info) {
                 case FTS_DNR:
                         if (!fflag || p->fts_errno != ENOENT) {
-                                fprintf(stderr, "%s: %s: %s" CUR_LINE() "\n",
+                                fprintf(stderr, "fts: %s: %s: %s" CUR_LINE() "\n",
                                         argv0, p->fts_path, strerror(p->fts_errno));
                                 eval = 1;
@@ -297 +298 @@
                 case FTS_ERR:
                         fts_close(fts);
-                        return errx(1, "%s: %s " CUR_LINE(), p->fts_path, strerror(p->fts_errno));
+                        return errx(1, "fts: %s: %s " CUR_LINE(), p->fts_path, strerror(p->fts_errno));
                 case FTS_NS:
                         /*
@@ -306 +307 @@
                                 break;
                         if (!fflag || p->fts_errno != ENOENT) {
-                                fprintf(stderr, "%s: %s: %s " CUR_LINE() "\n",
-                                        argv0, p->fts_path, strerror(p->fts_errno), __LINE__);
+                                fprintf(stderr, "fts: %s: %s: %s " CUR_LINE() "\n",
+                                        argv0, p->fts_path, strerror(p->fts_errno));
                                 eval = 1;
                         }
@@ -370 +371 @@
                                         continue;
                                 }
+                                operation = "mkdir";
                                 break;
 
@@ -381 +383 @@
                                         continue;
                                 }
+                                operation = "undelete";
                                 break;
 #endif
@@ -410 +413 @@
                                         continue;
                                 }
+                                operation = "unlink";
+                                break;
                         }
                 }
@@ -415 +420 @@
 err:
 #endif
-                fprintf(stderr, "%s: %s: %s " CUR_LINE() "\n", argv0, p->fts_path, strerror(errno));
+                fprintf(stderr, "%s: %s: %s: %s " CUR_LINE() "\n", operation, argv0, p->fts_path, strerror(errno));
                 eval = 1;
         }
@@ -447 +452 @@
          */
         while ((f = *argv++) != NULL) {
+                const char *operation = "?";
                 /* Assume if can't stat the file, can't unlink it. */
                 if (lstat(f, &sb)) {
@@ -457 +463 @@
 #endif
                                 if (!fflag || errno != ENOENT) {
-                                        fprintf(stderr, "%s: %s: %s " CUR_LINE() "\n", argv0, f, strerror(errno));
+                                        fprintf(stderr, "lstat: %s: %s: %s " CUR_LINE() "\n", argv0, f, strerror(errno));
                                         eval = 1;
                                 }
@@ -485 +491 @@
 #endif
                 if (rval == 0) {
-                        if (S_ISWHT(sb.st_mode))
+                        if (S_ISWHT(sb.st_mode)) {
                                 rval = undelete(f);
-                        else if (S_ISDIR(sb.st_mode))
+                                operation = "undelete";
+                        } else if (S_ISDIR(sb.st_mode)) {
                                 rval = rmdir(f);
-                        else {
+                                operation = "rmdir";
+                        } else {
                                 if (Pflag)
                                         if (!rm_overwrite(f, &sb))
@@ -500 +508 @@
                                 }
 #endif
+                                operation = "unlink";
                         }
                 }
                 if (rval && (!fflag || errno != ENOENT)) {
-                        fprintf(stderr, "%s: %s: %s" CUR_LINE() "\n", argv0, f, strerror(errno));
+                        fprintf(stderr, "%s: %s: %s: %s" CUR_LINE() "\n", operation, argv0, f, strerror(errno));
                         eval = 1;
                 }
@@ -533 +542 @@
         int bsize, fd, wlen;
         char *buf = NULL;
+        const char *operation = "lstat";
 
         fd = -1;
@@ -542 +552 @@
         if (!S_ISREG(sbp->st_mode))
                 return (1);
+        operation = "open";
         if ((fd = open(file, O_WRONLY, 0)) == -1)
                 goto err;
@@ -557 +568 @@
 
 #define PASS(byte) {                                                    \
+        operation = "write";                                            \
         memset(buf, byte, bsize);                                       \
         for (len = sbp->st_size; len > 0; len -= wlen) {                \
@@ -565 +577 @@
 }
         PASS(0xff);
+        operation = "fsync/lseek";
         if (fsync(fd) || lseek(fd, (off_t)0, SEEK_SET))
                 goto err;
         PASS(0x00);
+        operation = "fsync/lseek";
         if (fsync(fd) || lseek(fd, (off_t)0, SEEK_SET))
                 goto err;
@@ -575 +589 @@
                 return (1);
         }
+        operation = "fsync/close";
 
 err:    eval = 1;
@@ -581 +596 @@
         if (fd != -1)
                 close(fd);
-        fprintf(stderr, "%s: %s: %s" CUR_LINE() "\n", argv0, file, strerror(errno));
+        fprintf(stderr, "%s: %s: %s: %s" CUR_LINE() "\n", operation, argv0, file, strerror(errno));
         return (0);
 }