Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/printenv.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/printenv.c (modified) (2 diffs)

branches/3.2/mindi-busybox/coreutils/printenv.c

@@ -8 +8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define printenv_trivial_usage
+//usage:       "[VARIABLE]..."
+//usage:#define printenv_full_usage "\n\n"
+//usage:       "Print environment VARIABLEs.\n"
+//usage:       "If no VARIABLE specified, print all."
 
 #include "libbb.h"
@@ -20 +26 @@
     /* no variables specified, show whole env */
     if (!argv[1]) {
-        int e = 0;
-        while (environ[e])
-            puts(environ[e++]);
+        char **e = environ;
+
+        /* environ can be NULL! (for example, after clearenv())
+         * Check for that:
+         */
+        if (e)
+            while (*e)
+                puts(*e++);
     } else {
         /* search for specified variables and print them out if found */