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 31d76d7122bd7d150fa4476db17ca94fb2e82cf8..bd5db7073a318331847884504d5bddd2c3666e38 100644
(file)
--- a/
coreutils/printenv.c
+++ b/
coreutils/printenv.c
@@
-5,19
+5,34
@@
* 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
.
*/
*/
+//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"
#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, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int printenv_main(int argc
ATTRIBUTE_UNUSED
, char **argv)
+int printenv_main(int argc
UNUSED_PARAM
, char **argv)
{
{
+ int exit_code = EXIT_SUCCESS;
+
/* no variables specified, show whole env */
if (!argv[1]) {
/* 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 */
char *arg, *env;
} else {
/* search for specified variables and print them out if found */
char *arg, *env;
@@
-26,8
+41,10
@@
int printenv_main(int argc ATTRIBUTE_UNUSED, char **argv)
env = getenv(arg);
if (env)
puts(env);
env = getenv(arg);
if (env)
puts(env);
+ else
+ exit_code = EXIT_FAILURE;
}
}
}
}
- fflush_stdout_and_exit(
0
);
+ fflush_stdout_and_exit(
exit_code
);
}
}