lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / coreutils / printenv.c

diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index 753f7cb4da4f219eb4f2bc91ad33bcd235c9279d..d38f8fb5f5986cdd134a78aa4b185d7fd4734711 100644 (file)
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -1,53 +1,37 @@
+/* vi: set sw=4 ts=4: */
 /*
  * printenv implementation for busybox
  *
  * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
  * 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 source tree.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
-int printenv_main(int argc, char **argv)
+int printenv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int printenv_main(int argc UNUSED_PARAM, char **argv)
 {
-       extern char **environ;
-       int e = 0;
+       int exit_code = EXIT_SUCCESS;
 
        /* no variables specified, show whole env */
-       if (argc == 1)
+       if (!argv[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);
+                       else
+                               exit_code = EXIT_FAILURE;
+               }
        }
 
-       bb_fflush_stdout_and_exit();
+       fflush_stdout_and_exit(exit_code);
 }