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

trunk/src/kmk/kmkbuiltin/cp_utils.c

@@ -98 +98 @@
 
         if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
-                warn("%s", entp->fts_path);
+                warn("open: %s", entp->fts_path);
                 return (1);
         }
@@ -124 +124 @@
                                 close(from_fd);
                                 if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
-                                        warn("%s", entp->fts_path);
+                                        warn("open: %s", entp->fts_path);
                                         return (1);
                                 }
@@ -162 +162 @@
 
         if (to_fd == -1) {
-                warn("%s", to.p_path);
+                warn("open: %s", to.p_path);
                 (void)close(from_fd);
                 return (1);
@@ -180 +180 @@
                 if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
                     MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
-                        warn("%s", entp->fts_path);
+                        warn("mmap: %s", entp->fts_path);
                         rval = 1;
                 } else {
@@ -200 +200 @@
                         }
                         if (wcount != (ssize_t)wresid) {
-                                warn("%s", to.p_path);
+                                warn("write[%zd != %zu]: %s", wcount, wresid, to.p_path);
                                 rval = 1;
                         }
                         /* Some systems don't unmap on close(2). */
                         if (munmap(p, fs->st_size) < 0) {
-                                warn("%s", entp->fts_path);
+                                warn("munmap: %s", entp->fts_path);
                                 rval = 1;
                         }
@@ -230 +230 @@
                         }
                         if (wcount != (ssize_t)wresid) {
-                                warn("%s", to.p_path);
+                                warn("write[%zd != %zu]: %s", wcount, wresid, to.p_path);
                                 rval = 1;
                                 break;
@@ -236 +236 @@
                 }
                 if (rcount < 0) {
-                        warn("%s", entp->fts_path);
+                        warn("read: %s", entp->fts_path);
                         rval = 1;
                 }
@@ -252 +252 @@
         (void)close(from_fd);
         if (close(to_fd)) {
-                warn("%s", to.p_path);
+                warn("close: %s", to.p_path);
                 rval = 1;
         }