Changeset 3216 for trunk/src/kmk/kmkbuiltin/rmdir.c

Timestamp:

Mar 31, 2018, 12:09:15 AM (7 years ago)

Author:

bird

Message:

kmk_rm, kmk_rmdir: changed to use getopt_r.

File:

• trunk/src/kmk/kmkbuiltin/rmdir.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/rmdir.c

@@ -48 +48 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define FAKES_NO_GETOPT_H /* bird */
 #include "config.h"
 #include "err.h"
@@ -58 +59 @@
 # include <alloca.h>
 #endif
-#include "getopt.h"
+#include "getopt_r.h"
 #include "kmkbuiltin.h"
 
@@ -110 +111 @@
 {
         RMDIRINSTANCE This;
+        struct getopt_state_r gos;
         int ch, errors;
 
@@ -119 +121 @@
         This.pflag = 0;
 
-        /* kmk: reset getopt and set progname */
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
-        optind = 0; /* init */
-        while ((ch = getopt_long(argc, argv, "pv", long_options, NULL)) != -1)
+        getopt_initialize_r(&gos, argc, argv, "pv", long_options, envp, pCtx);
+        while ((ch = getopt_long_r(&gos, NULL)) != -1)
                 switch(ch) {
                 case 'p':
@@ -147 +145 @@
                         return usage(pCtx, 1);
                 }
-        argc -= optind;
-        argv += optind;
+        argc -= gos.optind;
+        argv += gos.optind;
 
         if (argc == 0)