projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sulogin: use bb_error_msg instead of bb_info_msg; better message
[oweals/busybox.git]
/
coreutils
/
printenv.c
diff --git
a/coreutils/printenv.c
b/coreutils/printenv.c
index 935f52df3ffa9402be34c0145e435f33c9d2ff3c..bd5db7073a318331847884504d5bddd2c3666e38 100644
(file)
--- a/
coreutils/printenv.c
+++ b/
coreutils/printenv.c
@@
-5,38
+5,46
@@
* Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
* Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.org>
*
* Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
* Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.org>
*
- * Licensed under GPLv2 or later, see file LICENSE in this
tarball for details
.
+ * Licensed under GPLv2 or later, see file LICENSE in this
source tree
.
*/
*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
#include "busybox.h
"
-extern char **environ;
+//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."
-int printenv_main(int argc, char **argv);
-int printenv_main(int argc, char **argv)
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+int printenv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int printenv_main(int argc UNUSED_PARAM, char **argv)
{
{
- int e
= 0
;
+ int e
xit_code = EXIT_SUCCESS
;
/* no variables specified, show whole env */
/* no variables specified, show whole env */
- if (argc == 1)
- while (environ[e])
- puts(environ[e++]);
-
- /* search for specified variables and print them out if found */
- else {
- int i;
- size_t l;
+ if (!argv[1]) {
+ 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 */
char *arg, *env;
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;
+ }
}
}
- fflush_stdout_and_exit(
0
);
+ fflush_stdout_and_exit(
exit_code
);
}
}