Changeset 3192 for trunk/src/kmk/kmkbuiltin/cp_utils.c

Timestamp:

Mar 26, 2018, 10:25:56 PM (7 years ago)

Author:

bird

Message:

kmkbuiltin: funnel output thru output.c (usually via err.c).

File:

• trunk/src/kmk/kmkbuiltin/cp_utils.c (modified) (20 diffs)

trunk/src/kmk/kmkbuiltin/cp_utils.c

@@ -87 +87 @@
 
 int
-copy_file(const FTSENT *entp, int dne, int changed_only, int *pcopied)
+copy_file(PKMKBUILTINCTX pCtx, const FTSENT *entp, int dne, int changed_only, int *pcopied)
 {
         static char buf[MAXBSIZE];
@@ -103 +103 @@
 
         if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
-                warn("open: %s", entp->fts_path);
+                warn(pCtx, "open: %s", entp->fts_path);
                 return (1);
         }
@@ -120 +120 @@
                 /* compare the files first if requested */
                 if (changed_only) {
-                        if (cmp_fd_and_file(from_fd, entp->fts_path, to.p_path,
+                        if (cmp_fd_and_file(pCtx, from_fd, entp->fts_path, to.p_path,
                                             1 /* silent */, 0 /* lflag */,
                                             0 /* special */) == OK_EXIT) {
@@ -129 +129 @@
                                 close(from_fd);
                                 if ((from_fd = open(entp->fts_path, O_RDONLY | O_BINARY, 0)) == -1) {
-                                        warn("open: %s", entp->fts_path);
+                                        warn(pCtx, "open: %s", entp->fts_path);
                                         return (1);
                                 }
@@ -138 +138 @@
                 if (nflag) {
                         if (vflag)
-                                printf("%s not overwritten\n", to.p_path);
+                                kmk_builtin_ctx_printf(pCtx, 0, "%s not overwritten\n", to.p_path);
                         return (0);
                 } else if (iflag) {
@@ -148 +148 @@
                         if (checkch != 'y' && checkch != 'Y') {
                                 (void)close(from_fd);
-                                (void)fprintf(stderr, "not overwritten\n");
+                                kmk_builtin_ctx_printf(pCtx, 1, "not overwritten\n");
                                 return (1);
                         }
@@ -167 +167 @@
 
         if (to_fd == -1) {
-                warn("open: %s", to.p_path);
+                warn(pCtx, "open: %s", to.p_path);
                 (void)close(from_fd);
                 return (1);
@@ -185 +185 @@
                 if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
                     MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
-                        warn("mmap: %s", entp->fts_path);
+                        warn(pCtx, "mmap: %s", entp->fts_path);
                         rval = 1;
                 } else {
@@ -195 +195 @@
                                 if (info) {
                                         info = 0;
-                                        (void)fprintf(stderr,
+                                        kmk_builtin_ctx_printf(pCtx, 1,
                                                 "%s -> %s %3d%%\n",
                                                 entp->fts_path, to.p_path,
@@ -205 +205 @@
                         }
                         if (wcount != (ssize_t)wresid) {
-                                warn("write[%zd != %zu]: %s", wcount, wresid, to.p_path);
+                                warn(pCtx, "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("munmap: %s", entp->fts_path);
+                                warn(pCtx, "munmap: %s", entp->fts_path);
                                 rval = 1;
                         }
@@ -225 +225 @@
                                 if (info) {
                                         info = 0;
-                                        (void)fprintf(stderr,
+                                        kmk_builtin_ctx_printf(pCtx, 1,
                                                 "%s -> %s %3d%%\n",
                                                 entp->fts_path, to.p_path,
@@ -235 +235 @@
                         }
                         if (wcount != (ssize_t)wresid) {
-                                warn("write[%zd != %zu]: %s", wcount, wresid, to.p_path);
+                                warn(pCtx, "write[%zd != %zu]: %s", wcount, wresid, to.p_path);
                                 rval = 1;
                                 break;
@@ -241 +241 @@
                 }
                 if (rcount < 0) {
-                        warn("read: %s", entp->fts_path);
+                        warn(pCtx, "read: %s", entp->fts_path);
                         rval = 1;
                 }
@@ -253 +253 @@
          */
 
-        if (pflag && setfile(fs, to_fd))
+        if (pflag && setfile(pCtx, fs, to_fd))
                 rval = 1;
         (void)close(from_fd);
         if (close(to_fd)) {
-                warn("close: %s", to.p_path);
+                warn(pCtx, "close: %s", to.p_path);
                 rval = 1;
         }
@@ -264 +264 @@
 
 int
-copy_link(const FTSENT *p, int exists)
+copy_link(PKMKBUILTINCTX pCtx, const FTSENT *p, int exists)
 {
         int len;
@@ -270 +270 @@
 
         if ((len = readlink(p->fts_path, llink, sizeof(llink) - 1)) == -1) {
-                warn("readlink: %s", p->fts_path);
+                warn(pCtx, "readlink: %s", p->fts_path);
                 return (1);
         }
         llink[len] = '\0';
         if (exists && unlink(to.p_path)) {
-                warn("unlink: %s", to.p_path);
+                warn(pCtx, "unlink: %s", to.p_path);
                 return (1);
         }
         if (symlink(llink, to.p_path)) {
-                warn("symlink: %s", llink);
-                return (1);
-        }
-        return (pflag ? setfile(p->fts_statp, -1) : 0);
-}
-
-int
-copy_fifo(struct stat *from_stat, int exists)
+                warn(pCtx, "symlink: %s", llink);
+                return (1);
+        }
+        return (pflag ? setfile(pCtx, p->fts_statp, -1) : 0);
+}
+
+int
+copy_fifo(PKMKBUILTINCTX pCtx, struct stat *from_stat, int exists)
 {
         if (exists && unlink(to.p_path)) {
-                warn("unlink: %s", to.p_path);
+                warn(pCtx, "unlink: %s", to.p_path);
                 return (1);
         }
         if (mkfifo(to.p_path, from_stat->st_mode)) {
-                warn("mkfifo: %s", to.p_path);
-                return (1);
-        }
-        return (pflag ? setfile(from_stat, -1) : 0);
-}
-
-int
-copy_special(struct stat *from_stat, int exists)
+                warn(pCtx, "mkfifo: %s", to.p_path);
+                return (1);
+        }
+        return (pflag ? setfile(pCtx, from_stat, -1) : 0);
+}
+
+int
+copy_special(PKMKBUILTINCTX pCtx, struct stat *from_stat, int exists)
 {
         if (exists && unlink(to.p_path)) {
-                warn("unlink: %s", to.p_path);
+                warn(pCtx, "unlink: %s", to.p_path);
                 return (1);
         }
         if (mknod(to.p_path, from_stat->st_mode, from_stat->st_rdev)) {
-                warn("mknod: %s", to.p_path);
-                return (1);
-        }
-        return (pflag ? setfile(from_stat, -1) : 0);
-}
-
-int
-setfile(struct stat *fs, int fd)
+                warn(pCtx, "mknod: %s", to.p_path);
+                return (1);
+        }
+        return (pflag ? setfile(pCtx, from_stat, -1) : 0);
+}
+
+int
+setfile(PKMKBUILTINCTX pCtx, struct stat *fs, int fd)
 {
         static struct timeval tv[2];
@@ -335 +335 @@
 #endif
         if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
-                warn("%sutimes: %s", islink ? "l" : "", to.p_path);
+                warn(pCtx, "%sutimes: %s", islink ? "l" : "", to.p_path);
                 rval = 1;
         }
@@ -357 +357 @@
                     chown(to.p_path, fs->st_uid, fs->st_gid))) {
                         if (errno != EPERM) {
-                                warn("chown: %s", to.p_path);
+                                warn(pCtx, "chown: %s", to.p_path);
                                 rval = 1;
                         }
@@ -367 +367 @@
                     (islink ? lchmod(to.p_path, fs->st_mode) :
                     chmod(to.p_path, fs->st_mode))) {
-                        warn("chmod: %s", to.p_path);
+                        warn(pCtx, "chmod: %s", to.p_path);
                         rval = 1;
                 }
@@ -377 +377 @@
                     (islink ? (errno = ENOSYS) :
                     chflags(to.p_path, fs->st_flags))) {
-                        warn("chflags: %s", to.p_path);
+                        warn(pCtx, "chflags: %s", to.p_path);
                         rval = 1;
                 }