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

trunk/src/kmk/kmkbuiltin/ln.c

@@ -42 +42 @@
 #endif /* no $id */
 
+#define FAKES_NO_GETOPT_H /* bird */
 #include "config.h"
 #ifndef _MSC_VER
@@ -55 +56 @@
 #include <string.h>
 #include <unistd.h>
-#include "getopt.h"
+#include "getopt_r.h"
 #ifdef _MSC_VER
 # include "mscfakes.h"
@@ -93 +94 @@
 {
         LNINSTANCE This;
+        struct getopt_state_r gos;
         struct stat sb;
         char *sourcedir;
@@ -107 +109 @@
         This.linkf = NULL;
 
-        /* kmk: reset getopt() and set program name. */
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
-        optind = 0; /* init */
-
-        while ((ch = getopt_long(argc, argv, "fhinsv", long_options, NULL)) != -1)
+        getopt_initialize_r(&gos, argc, argv, "fhinsv", long_options, envp, pCtx);
+        while ((ch = getopt_long_r(&gos, NULL)) != -1)
                 switch (ch) {
                 case 'f':
@@ -143 +140 @@
                 }
 
-        argv += optind;
-        argc -= optind;
+        argv += gos.optind;
+        argc -= gos.optind;
 
         This.linkf = This.sflag ? symlink : link;