Changeset 10909

Timestamp:

11/13/08 20:44:48 (5 years ago)

Author:

BrainSlayer

Message:

patches

Location:

src/router/busybox/libbb

Files:

• getopt32.c (modified) (1 diff)
• lineedit.c (modified) (1 diff)

src/router/busybox/libbb/getopt32.c

@@ -515 +515 @@
                 }
         }
+
+        /* In case getopt32 was already called:
+         * reset the libc getopt() function, which keeps internal state.
+         * run_nofork_applet_prime() does this, but we might end up here
+         * also via gunzip_main() -> gzip_main(). Play safe.
+         */
+#ifdef __GLIBC__
+        optind = 0;
+#else /* BSD style */
+        optind = 1;
+        /* optreset = 1; */
+#endif
+        /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */
 
         pargv = NULL;

src/router/busybox/libbb/lineedit.c

@@ -1416 +1416 @@
                 load_history(state->hist_file);
 #endif
+#if MAX_HISTORY > 0
         if (state->flags & DO_HISTORY)
                 state->cur_history = state->cnt_history;
+#endif
 
         /* prepare before init handlers */