Changeset 3215 for trunk/src/kmk/kmkbuiltin/mv.c

Timestamp:

Mar 31, 2018, 12:01:55 AM (7 years ago)

Author:

bird

Message:

kmk_ln, kmk_mkdir, kmk_mv, kmk_printf: changed to use getopt_r and got rid of remaining static buffers.

File:

• trunk/src/kmk/kmkbuiltin/mv.c (modified) (10 diffs)

trunk/src/kmk/kmkbuiltin/mv.c

@@ -51 +51 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define FAKES_NO_GETOPT_H /* bird */
 #include "config.h"
 #include <sys/types.h>
@@ -80 +81 @@
 #endif
 #include <unistd.h>
-#include "getopt.h"
+#include "getopt_r.h"
 #ifdef __sun__
 # include "solfakes.h"
@@ -121 +122 @@
 
 static int      do_move(PMVINSTANCE, char *, char *);
-#ifdef CROSS_DEVICE_MOVE
+#if 0 // def CROSS_DEVICE_MOVE
 static int      fastcopy(char *, char *, struct stat *);
 static int      copy(char *, char *);
@@ -128 +129 @@
 
 
-#if !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) && !defined(__OpenBSD__)
-# ifdef __OS2__
-static
-# endif
-const char *user_from_uid(uid_t id, int x)
-{
-        static char s_buf[64];
-        sprintf(s_buf, "%ld", (long int)id);
-        (void)x;
-        return s_buf;
-}
-# ifdef __OS2__
-static
-# endif
-const char *group_from_gid(gid_t id, int x)
-{
-        static char s_buf[64];
-        sprintf(s_buf, "%ld", (long int)id);
-        (void)x;
-        return s_buf;
-}
-#endif /* 'not in libc' */
-
-
 int
 kmk_builtin_mv(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
 {
         MVINSTANCE This;
+        struct getopt_state_r gos;
         size_t baselen, len;
         int rval;
@@ -170 +148 @@
         This.vflg = 0;
 
-        /* kmk: reset getopt and set progname */
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
-        optind = 0; /* init */
-
-        while ((ch = getopt_long(argc, argv, "finv", long_options, NULL)) != -1)
+        getopt_initialize_r(&gos, argc, argv, "finv", long_options, envp, pCtx);
+        while ((ch = getopt_long_r(&gos, NULL)) != -1)
                 switch (ch) {
                 case 'i':
@@ -201 +174 @@
                         return usage(pCtx, 1);
                 }
-        argc -= optind;
-        argv += optind;
+        argc -= gos.optind;
+        argv += gos.optind;
 
         if (argc < 2)
@@ -301 +274 @@
                 } else if (access(to, W_OK) && !stat(to, &sb)) {
                         bsd_strmode(sb.st_mode, modep);
+#if 0 /* probably not thread safe, also BSDism. */
                         (void)fprintf(stderr, "override %s%s%s/%s for %s? %s",
                             modep + 1, modep[9] == ' ' ? "" : " ",
                             user_from_uid((unsigned long)sb.st_uid, 0),
                             group_from_gid((unsigned long)sb.st_gid, 0), to, YESNO);
+#else
+                        (void)fprintf(stderr, "override %s%s%ul/%ul for %s? %s",
+                                      modep + 1, modep[9] == ' ' ? "" : " ",
+                                      (unsigned long)sb.st_uid, (unsigned long)sb.st_gid,
+                                      to, YESNO);
+#endif
                         ask = 1;
                 }
@@ -335 +315 @@
 
         if (errno == EXDEV) {
-#ifndef CROSS_DEVICE_MOVE
+#if 1 //ndef CROSS_DEVICE_MOVE
                 warnx(pThis->pCtx, "cannot move `%s' to a different device: `%s'", from, to);
                 return (1);
@@ -368 +348 @@
         }
 
-#ifdef CROSS_DEVICE_MOVE
+#if 0//def CROSS_DEVICE_MOVE
         /*
          * If rename fails because we're trying to cross devices, and
@@ -383 +363 @@
 }
 
-#ifdef CROSS_DEVICE_MOVE
+#if 0 //def CROSS_DEVICE_MOVE - using static buffers and fork.
 int
 static fastcopy(char *from, char *to, struct stat *sbp)