Changeset 3216 for trunk/src/kmk

Timestamp:

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

Author:

bird

Message:

kmk_rm, kmk_rmdir: changed to use getopt_r.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• rm.c (modified) (7 diffs)
• rmdir.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/rm.c

@@ -46 +46 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define FAKES_NO_GETOPT_H /* bird */
 #include "config.h"
 #include <sys/stat.h>
@@ -69 +70 @@
 #include <unistd.h>
 #include <ctype.h>
-#include "getopt.h"
+#include "getopt_r.h"
 #ifdef __HAIKU__
 # include "haikufakes.h"
@@ -187 +188 @@
 {
         RMINSTANCE This;
+        struct getopt_state_r gos;
         int ch, rflag;
 
@@ -205 +207 @@
         kBuildProtectionInit(&This.g_ProtData, pCtx);
 
-        /* kmk: reset getopt and set program name. */
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
-        optind = 0; /* init */
-
         rflag = 0;
-        while ((ch = getopt_long(argc, argv, "dfiPRvW", long_options, NULL)) != -1)
+        getopt_initialize_r(&gos, argc, argv, "dfiPRvW", long_options, envp, pCtx);
+        while ((ch = getopt_long_r(&gos, NULL)) != -1)
                 switch (ch) {
                 case 'd':
@@ -262 +259 @@
                         break;
                 case 267:
-                        if (kBuildProtectionSetDepth(&This.g_ProtData, optarg)) {
+                        if (kBuildProtectionSetDepth(&This.g_ProtData, gos.optarg)) {
                             kBuildProtectionTerm(&This.g_ProtData);
                             return 1;
@@ -277 +274 @@
                         return usage(pCtx, 1);
                 }
-        argc -= optind;
-        argv += optind;
+        argc -= gos.optind;
+        argv += gos.optind;
 
         if (argc < 1) {
@@ -347 +344 @@
 
         flags = FTS_PHYSICAL;
+#ifndef KMK_BUILTIN_STANDALONE
+        flags |= FTS_NOCHDIR; /* Must not change the directory from inside kmk! */
+#endif
         if (!needstat)
                 flags |= FTS_NOSTAT;

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)