Changeset 3192 for trunk/src/kmk/kmkbuiltin/mv.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/mv.c (modified) (22 diffs)

trunk/src/kmk/kmkbuiltin/mv.c

@@ -47 +47 @@
 #endif
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include "config.h"
 #include <sys/types.h>
@@ -89 +93 @@
 
 
-static int fflg, iflg, nflg, vflg;
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+typedef struct MVINSTANCE
+{
+    PKMKBUILTINCTX pCtx;
+    int fflg, iflg, nflg, vflg;
+} MVINSTANCE;
+typedef MVINSTANCE *PMVINSTANCE;
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 static struct option long_options[] =
 {
@@ -98 +115 @@
 
 
-static int      do_move(char *, char *);
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+extern void     bsd_strmode(mode_t mode, char *p); /* strmode.c */
+
+static int      do_move(PMVINSTANCE, char *, char *);
 #ifdef CROSS_DEVICE_MOVE
 static int      fastcopy(char *, char *, struct stat *);
 static int      copy(char *, char *);
 #endif
-static int      usage(FILE *);
-
-extern void bsd_strmode(mode_t mode, char *p);
+static int      usage(PKMKBUILTINCTX, int);
+
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
@@ -132 +153 @@
 
 int
-kmk_builtin_mv(int argc, char *argv[], char **envp)
-{
+kmk_builtin_mv(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
+{
+        MVINSTANCE This;
         size_t baselen, len;
         int rval;
@@ -141 +163 @@
         char path[PATH_MAX];
 
-        /* kmk: reinitialize globals */
-        fflg = iflg = nflg = vflg = 0;
+        /* Initialize instance. */
+        This.pCtx = pCtx;
+        This.fflg = 0;
+        This.iflg = 0;
+        This.nflg = 0;
+        This.vflg = 0;
 
         /* kmk: reset getopt and set progname */
-        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -154 +179 @@
                 switch (ch) {
                 case 'i':
-                        iflg = 1;
-                        fflg = nflg = 0;
+                        This.iflg = 1;
+                        This.fflg = This.nflg = 0;
                         break;
                 case 'f':
-                        fflg = 1;
-                        iflg = nflg = 0;
+                        This.fflg = 1;
+                        This.iflg = This.nflg = 0;
                         break;
                 case 'n':
-                        nflg = 1;
-                        fflg = iflg = 0;
+                        This.nflg = 1;
+                        This.fflg = This.iflg = 0;
                         break;
                 case 'v':
-                        vflg = 1;
+                        This.vflg = 1;
                         break;
                 case 261:
-                        usage(stdout);
+                        usage(pCtx, 0);
                         return 0;
                 case 262:
                         return kbuild_version(argv[0]);
                 default:
-                        return usage(stderr);
+                        return usage(pCtx, 1);
                 }
         argc -= optind;
@@ -180 +205 @@
 
         if (argc < 2)
-                return usage(stderr);
+                return usage(pCtx, 1);
 
         /*
@@ -188 +213 @@
         if (stat(argv[argc - 1], &sb) || !S_ISDIR(sb.st_mode)) {
                 if (argc > 2)
-                        return usage(stderr);
-                return do_move(argv[0], argv[1]);
+                        return usage(pCtx, 1);
+                return do_move(&This, argv[0], argv[1]);
         }
 
         /* It's a directory, move each file into it. */
-        if (strlen(argv[argc - 1]) > sizeof(path) - 1)
-                return errx(1, "%s: destination pathname too long", *argv);
-        (void)strcpy(path, argv[argc - 1]);
-        baselen = strlen(path);
+        baselen = strlen(argv[argc - 1]);
+        if (baselen > sizeof(path) - 1)
+                return errx(pCtx, 1, "%s: destination pathname too long", *argv);
+        memcpy(path, argv[argc - 1], baselen);
         endp = &path[baselen];
+        *endp = '\0';
 #if defined(_MSC_VER) || defined(__EMX__)
         if (!baselen || (*(endp - 1) != '/' && *(endp - 1) != '\\' && *(endp - 1) != ':')) {
@@ -225 +251 @@
 
                 if ((baselen + (len = strlen(p))) >= PATH_MAX) {
-                        warnx("%s: destination pathname too long", *argv);
+                        warnx(pCtx, "%s: destination pathname too long", *argv);
                         rval = 1;
                 } else {
                         memmove(endp, p, (size_t)len + 1);
-                        if (do_move(*argv, path))
+                        if (do_move(&This, *argv, path))
                                 rval = 1;
                 }
@@ -236 +262 @@
 }
 
+#ifdef KMK_BUILTIN_STANDALONE
+int main(int argc, char **argv, char **envp)
+{
+    KMKBUILTINCTX Ctx = { "kmk_mv", NULL };
+    return kmk_builtin_mv(argc, argv, envp, &Ctx);
+}
+#endif
+
 static int
-do_move(char *from, char *to)
+do_move(PMVINSTANCE pThis, char *from, char *to)
 {
         struct stat sb;
@@ -248 +282 @@
          * make sure the user wants to clobber it.
          */
-        if (!fflg && !access(to, F_OK)) {
+        if (!pThis->fflg && !access(to, F_OK)) {
 
                 /* prompt only if source exist */
                 if (lstat(from, &sb) == -1) {
-                        warn("%s", from);
+                        warn(pThis->pCtx, "%s", from);
                         return (1);
                 }
@@ -258 +292 @@
 #define YESNO "(y/n [n]) "
                 ask = 0;
-                if (nflg) {
-                        if (vflg)
-                                printf("%s not overwritten\n", to);
+                if (pThis->nflg) {
+                        if (pThis->vflg)
+                                kmk_builtin_ctx_printf(pThis->pCtx, 0, "%s not overwritten\n", to);
                         return (0);
-                } else if (iflg) {
+                } else if (pThis->iflg) {
                         (void)fprintf(stderr, "overwrite %s? %s", to, YESNO);
                         ask = 1;
@@ -274 +308 @@
                 }
                 if (ask) {
+                        fflush(stderr);
                         first = ch = getchar();
                         while (ch != '\n' && ch != EOF)
                                 ch = getchar();
                         if (first != 'y' && first != 'Y') {
-                                (void)fprintf(stderr, "not overwritten\n");
+                                kmk_builtin_ctx_printf(pThis->pCtx, 1, "not overwritten\n");
                                 return (0);
                         }
@@ -284 +319 @@
         }
         if (!rename(from, to)) {
-                if (vflg)
-                        printf("%s -> %s\n", from, to);
+                if (pThis->vflg)
+                        kmk_builtin_ctx_printf(pThis->pCtx, 0, "%s -> %s\n", from, to);
                 return (0);
         }
@@ -292 +327 @@
                 remove(to);
                 if (!rename(from, to)) {
-                        if (vflg)
-                                printf("%s -> %s\n", from, to);
+                        if (pThis->vflg)
+                                kmk_builtin_ctx_printf(pThis->pCtx, 0, "%s -> %s\n", from, to);
                         return (0);
                 }
@@ -301 +336 @@
         if (errno == EXDEV) {
 #ifndef CROSS_DEVICE_MOVE
-                warnx("cannot move `%s' to a different device: `%s'", from, to);
+                warnx(pThis->pCtx, "cannot move `%s' to a different device: `%s'", from, to);
                 return (1);
 #else
@@ -312 +347 @@
                  */
                 if (lstat(from, &sb) == -1) {
-                        warn("%s", from);
+                        warn(pThis->pCtx, "%s", from);
                         return (1);
                 }
@@ -318 +353 @@
                         /* Can't mv(1) a mount point. */
                         if (realpath(from, path) == NULL) {
-                                warnx("cannot resolve %s: %s", from, path);
+                                warnx(pThis->pCtx, "cannot resolve %s: %s", from, path);
                                 return (1);
                         }
                         if (!statfs(path, &sfs) &&
                             !strcmp(path, sfs.f_mntonname)) {
-                                warnx("cannot rename a mount point");
+                                warnx(pThis->pCtx, "cannot rename a mount point");
                                 return (1);
                         }
@@ -329 +364 @@
 #endif
         } else {
-                warn("rename %s to %s", from, to);
+                warn(pThis->pCtx, "rename %s to %s", from, to);
                 return (1);
         }
@@ -340 +375 @@
          */
         if (lstat(from, &sb)) {
-                warn("%s", from);
+                warn(pThis->pCtx, "%s", from);
                 return (1);
         }
         return (S_ISREG(sb.st_mode) ?
-            fastcopy(from, to, &sb) : copy(from, to));
+            fastcopy(pThis, from, to, &sb) : copy(pThis, from, to));
 #endif
 }
@@ -451 +486 @@
         }
         if (vflg)
-                printf("%s -> %s\n", from, to);
+                kmk_builtin_ctx_printf(pThis->pCtx, 0, "%s -> %s\n", from, to);
         return (0);
 }
@@ -503 +538 @@
 
 static int
-usage(FILE *pf)
-{
-        fprintf(pf, "usage: %s [-f | -i | -n] [-v] source target\n"
-                    "   or: %s [-f | -i | -n] [-v] source ... directory\n"
-                    "   or: %s --help\n"
-                    "   or: %s --version\n",
-                g_progname, g_progname, g_progname, g_progname);
+usage(PKMKBUILTINCTX pCtx, int fIsErr)
+{
+        kmk_builtin_ctx_printf(pCtx, fIsErr,
+                               "usage: %s [-f | -i | -n] [-v] source target\n"
+                               "   or: %s [-f | -i | -n] [-v] source ... directory\n"
+                               "   or: %s --help\n"
+                               "   or: %s --version\n",
+                               pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName);
         return EX_USAGE;
 }