Signed-off-by: Andreas Fenkart andreas.fenkart@dev.digitalstrom.org --- tools/env/fw_env.c | 40 +++++++++++----------------------------- tools/env/fw_env_main.c | 4 ++++ 2 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 32bb3aa..a89bde5 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -236,15 +236,10 @@ int fw_printenv (int argc, char *argv[]) char *env, *nxt; int i, rc = 0;
- if (argc >= 2 && strcmp(argv[1], "-a") == 0) { - argv += 2; - argc -= 2; - } - if (fw_env_open()) return -1;
- if (argc == 1) { /* Print all env variables */ + if (argc == 0) { /* Print all env variables */ for (env = environment.data; *env; env = nxt + 1) { for (nxt = env; *nxt; ++nxt) { if (nxt >= &environment.data[ENV_SIZE]) { @@ -259,17 +254,13 @@ int fw_printenv (int argc, char *argv[]) return 0; }
- if (strcmp (argv[1], "-n") == 0) { - ++argv; - --argc; - if (argc != 2) { - fprintf (stderr, "## Error: " - "`-n' option requires exactly one argument\n"); - return -1; - } + if (printenv_args.name_suppress && argc != 1) { + fprintf(stderr, + "## Error: `-n' option requires exactly one argument\n"); + return -1; }
- for (i = 1; i < argc; ++i) { /* print single env variables */ + for (i = 0; i < argc; ++i) { /* print single env variables */ char *name = argv[i]; char *val = NULL;
@@ -466,17 +457,8 @@ int fw_setenv(int argc, char *argv[]) char *value = NULL; int valc;
- if (argc < 2) { - errno = EINVAL; - return -1; - } - - if (strcmp(argv[1], "-a") == 0) { - argv += 2; - argc -= 2; - } - - if (argc < 2) { + if (argc < 1) { + fprintf(stderr, "## Error: variable name missing\n"); errno = EINVAL; return -1; } @@ -486,9 +468,9 @@ int fw_setenv(int argc, char *argv[]) return -1; }
- name = argv[1]; - valv = argv + 2; - valc = argc - 2; + name = argv[0]; + valv = argv + 1; + valc = argc - 1;
if (env_flags_validate_env_set_params(name, valv, valc) < 0) return 1; diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index c828fd0..c20325f 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -158,6 +158,10 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); }
+ /* shift parsed flags, jump to non-option arguments */ + argc -= optind; + argv += optind; + lockfd = open(lockname, O_WRONLY | O_CREAT | O_TRUNC, 0666); if (-1 == lockfd) { fprintf(stderr, "Error opening lock file %s\n", lockname);