d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be a little more strict about handling command line args. This allows user and

Browse Source 
group names like 'help' 'mod' 'user' 'group' etc. to work correctly without
requiring the -n style invocation.
PR:		misc/17069
This commit is contained in:
David Nugent 2000-06-18 02:39:17 +00:00
parent 25fa020ea5
commit c4e667b9d7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/pw/pw.c
View File

@ -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]);