Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/printenv.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

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

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

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * printenv implementation for busybox
@@ -5 +6 @@
  * Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
+extern char **environ;
 
+int printenv_main(int argc, char **argv);
 int printenv_main(int argc, char **argv)
 {
-    extern char **environ;
-    int e = 0;
-
     /* no variables specified, show whole env */
-    if (argc == 1)
+    if (argc == 1) {
+        int e = 0;
         while (environ[e])
             puts(environ[e++]);
-
-    /* search for specified variables and print them out if found */
-    else {
-        int i;
-        size_t l;
+    } else {
+        /* search for specified variables and print them out if found */
         char *arg, *env;
 
-        for (i=1; (arg = argv[i]); ++i)
-            for (; (env = environ[e]); ++e) {
-                l = strlen(arg);
-                if (!strncmp(env, arg, l) && env[l] == '=')
-                    puts(env + l + 1);
-            }
+        while ((arg = *++argv) != NULL) {
+            env = getenv(arg);
+            if (env)
+                puts(env);
+        }
     }
 
-    bb_fflush_stdout_and_exit(0);
+    fflush_stdout_and_exit(0);
 }