From fd85f74489eabdc02ad2a02d0591c313f636c5b1 Mon Sep 17 00:00:00 2001 From: David Nugent Date: Sun, 18 Jun 2000 02:39:17 +0000 Subject: 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 --- pw/pw.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pw') diff --git a/pw/pw.c b/pw/pw.c index c17775f..6c070ac 100644 --- a/pw/pw.c +++ b/pw/pw.c @@ -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]); -- cgit v1.2.3-56-ge451