Changeset 3215 for trunk/src/kmk/kmkbuiltin/mkdir.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/mkdir.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/mkdir.c

@@ -42 +42 @@
 #endif
 
+#define FAKES_NO_GETOPT_H /* bird */
 #include "config.h"
 #include <sys/types.h>
@@ -61 +62 @@
 # include <alloca.h>
 #endif
-#include "getopt.h"
+#include "getopt_r.h"
 #ifdef __HAIKU__
 # include "haikufakes.h"
@@ -90 +91 @@
 kmk_builtin_mkdir(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
 {
+        struct getopt_state_r gos;
         int ch, exitval, success, pflag, vflag;
         mode_t omode, *set = (mode_t *)NULL;
@@ -97 +99 @@
         mode = NULL;
 
-        /* kmk: reset getopt and set progname */
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
-        optind = 0; /* init */
-        while ((ch = getopt_long(argc, argv, "m:pv", long_options, NULL)) != -1)
+        getopt_initialize_r(&gos, argc, argv, "m:pv", long_options, envp, pCtx);
+        while ((ch = getopt_long_r(&gos, NULL)) != -1)
                 switch(ch) {
                 case 'm':
-                        mode = optarg;
+                        mode = gos.optarg;
                         break;
                 case 'p':
@@ -123 +121 @@
                 }
 
-        argc -= optind;
-        argv += optind;
+        argc -= gos.optind;
+        argv += gos.optind;
         if (argv[0] == NULL)
                 return usage(pCtx, 1);