diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-14 22:08:04 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-03-14 22:08:04 +0000 |
| commit | 16c7fb7fc5ae647bcc273827f507d90866419560 (patch) | |
| tree | 35766e878699512ceac5c73829308c6caaa9fa1d /coreutils/env.c | |
| parent | e1e93c1e1cf0ddbb1749176d5f1fc430c869c37a (diff) | |
| download | busybox-w32-16c7fb7fc5ae647bcc273827f507d90866419560.tar.gz busybox-w32-16c7fb7fc5ae647bcc273827f507d90866419560.tar.bz2 busybox-w32-16c7fb7fc5ae647bcc273827f507d90866419560.zip | |
chown, env: stop using statics
Diffstat (limited to 'coreutils/env.c')
| -rw-r--r-- | coreutils/env.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/coreutils/env.c b/coreutils/env.c index 7be0c63a5..f47d450c5 100644 --- a/coreutils/env.c +++ b/coreutils/env.c | |||
| @@ -44,8 +44,8 @@ static const struct option env_long_options[] = { | |||
| 44 | int env_main(int argc, char** argv); | 44 | int env_main(int argc, char** argv); |
| 45 | int env_main(int argc, char** argv) | 45 | int env_main(int argc, char** argv) |
| 46 | { | 46 | { |
| 47 | static char *cleanenv[1] = { NULL }; | 47 | /* cleanenv was static - why? */ |
| 48 | 48 | char *cleanenv[1]; | |
| 49 | char **ep; | 49 | char **ep; |
| 50 | unsigned opt; | 50 | unsigned opt; |
| 51 | llist_t *unset_env = NULL; | 51 | llist_t *unset_env = NULL; |
| @@ -55,18 +55,16 @@ int env_main(int argc, char** argv) | |||
| 55 | #if ENABLE_FEATURE_ENV_LONG_OPTIONS | 55 | #if ENABLE_FEATURE_ENV_LONG_OPTIONS |
| 56 | applet_long_options = env_long_options; | 56 | applet_long_options = env_long_options; |
| 57 | #endif | 57 | #endif |
| 58 | |||
| 59 | opt = getopt32(argc, argv, "+iu:", &unset_env); | 58 | opt = getopt32(argc, argv, "+iu:", &unset_env); |
| 60 | |||
| 61 | argv += optind; | 59 | argv += optind; |
| 62 | if (*argv && LONE_DASH(argv[0])) { | 60 | if (*argv && LONE_DASH(argv[0])) { |
| 63 | opt |= 1; | 61 | opt |= 1; |
| 64 | ++argv; | 62 | ++argv; |
| 65 | } | 63 | } |
| 66 | 64 | if (opt & 1) { | |
| 67 | if (opt & 1) | 65 | cleanenv[0] = NULL; |
| 68 | environ = cleanenv; | 66 | environ = cleanenv; |
| 69 | else if (opt & 2) { | 67 | } else if (opt & 2) { |
| 70 | while (unset_env) { | 68 | while (unset_env) { |
| 71 | unsetenv(unset_env->data); | 69 | unsetenv(unset_env->data); |
| 72 | unset_env = unset_env->link; | 70 | unset_env = unset_env->link; |