diff options
author | David Nugent <davidn@FreeBSD.org> | 2000-06-18 02:39:17 +0000 |
---|---|---|
committer | David Nugent <davidn@FreeBSD.org> | 2000-06-18 02:39:17 +0000 |
commit | fd85f74489eabdc02ad2a02d0591c313f636c5b1 (patch) | |
tree | 6e4fc9b8c1ff3653b4d68262e2c4da0ae0dce723 /pw | |
parent | 4205d2d71c2eaf3380216ab31b2e0619f8001539 (diff) | |
download | pw-darwin-fd85f74489eabdc02ad2a02d0591c313f636c5b1.tar.gz pw-darwin-fd85f74489eabdc02ad2a02d0591c313f636c5b1.tar.zst pw-darwin-fd85f74489eabdc02ad2a02d0591c313f636c5b1.zip |
Be a little more strict about handling command line args. This allows user and
group names like 'help' 'mod' 'user' 'group' etc. to work correctly without
requiring the -n style invocation.
PR: misc/17069
Diffstat (limited to 'pw')
-rw-r--r-- | pw/pw.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -153,14 +153,16 @@ main(int argc, char *argv[]) } else break; } - else if ((tmp = getindex(Modes, argv[1])) != -1) + else if (mode == -1 && (tmp = getindex(Modes, argv[1])) != -1) mode = tmp; - else if ((tmp = getindex(Which, argv[1])) != -1) + else if (which == -1 && (tmp = getindex(Which, argv[1])) != -1) which = tmp; - else if ((tmp = getindex(Combo1, argv[1])) != -1 || (tmp = getindex(Combo2, argv[1])) != -1) { + else if ((mode == -1 && which == -1) && + ((tmp = getindex(Combo1, argv[1])) != -1 || + (tmp = getindex(Combo2, argv[1])) != -1)) { which = tmp / M_NUM; mode = tmp % M_NUM; - } else if (strcmp(argv[1], "help") == 0) + } else if (strcmp(argv[1], "help") == 0 && argv[2] == NULL) cmdhelp(mode, which); else if (which != -1 && mode != -1) addarg(&arglist, 'n', argv[1]); |