diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/env.c | 11 | ||||
-rw-r--r-- | coreutils/uudecode.c | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/coreutils/env.c b/coreutils/env.c index eb1f0b268..4cdbeae6a 100644 --- a/coreutils/env.c +++ b/coreutils/env.c | |||
@@ -29,14 +29,9 @@ | |||
29 | * - use bb_default_error_retval | 29 | * - use bb_default_error_retval |
30 | */ | 30 | */ |
31 | 31 | ||
32 | 32 | #include "busybox.h" | |
33 | #include <stdio.h> | ||
34 | #include <string.h> | ||
35 | #include <stdlib.h> | ||
36 | #include <errno.h> | 33 | #include <errno.h> |
37 | #include <unistd.h> | ||
38 | #include <getopt.h> /* struct option */ | 34 | #include <getopt.h> /* struct option */ |
39 | #include "busybox.h" | ||
40 | 35 | ||
41 | #if ENABLE_FEATURE_ENV_LONG_OPTIONS | 36 | #if ENABLE_FEATURE_ENV_LONG_OPTIONS |
42 | static const struct option env_long_options[] = { | 37 | static const struct option env_long_options[] = { |
@@ -50,7 +45,7 @@ int env_main(int argc, char** argv) | |||
50 | { | 45 | { |
51 | static char *cleanenv[1] = { NULL }; | 46 | static char *cleanenv[1] = { NULL }; |
52 | 47 | ||
53 | char **ep, *p; | 48 | char **ep; |
54 | unsigned long opt; | 49 | unsigned long opt; |
55 | llist_t *unset_env = NULL; | 50 | llist_t *unset_env = NULL; |
56 | extern char **environ; | 51 | extern char **environ; |
@@ -77,7 +72,7 @@ int env_main(int argc, char** argv) | |||
77 | } | 72 | } |
78 | } | 73 | } |
79 | 74 | ||
80 | while (*argv && ((p = strchr(*argv, '=')) != NULL)) { | 75 | while (*argv && (strchr(*argv, '=') != NULL)) { |
81 | if (putenv(*argv) < 0) { | 76 | if (putenv(*argv) < 0) { |
82 | bb_perror_msg_and_die("putenv"); | 77 | bb_perror_msg_and_die("putenv"); |
83 | } | 78 | } |
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 6050c0af7..2ec4306d0 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c | |||
@@ -129,9 +129,8 @@ int uudecode_main(int argc, char **argv) | |||
129 | FILE *src_stream; | 129 | FILE *src_stream; |
130 | char *outname = NULL; | 130 | char *outname = NULL; |
131 | char *line; | 131 | char *line; |
132 | int opt; | ||
133 | 132 | ||
134 | opt = bb_getopt_ulflags(argc, argv, "o:", &outname); | 133 | bb_getopt_ulflags(argc, argv, "o:", &outname); |
135 | 134 | ||
136 | if (optind == argc) { | 135 | if (optind == argc) { |
137 | src_stream = stdin; | 136 | src_stream = stdin; |