aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/finger/finger.c
diff options
context:
space:
mode:
authorBrian Somers <brian@FreeBSD.org>2000-09-12 21:58:31 +0000
committerBrian Somers <brian@FreeBSD.org>2000-09-12 21:58:31 +0000
commit1b57e365891b4a83e050043b2666388160c35a96 (patch)
treeeb095a0fae470cf834315cca1a21585156afb876 /usr.bin/finger/finger.c
parentcbd8ecd6ac6068a98afafb0a5ece7ea718cb45fe (diff)
Don't drop out when we've processed argc - 1 names.... arguments
may expand to more than one user. PR: 21228
Notes
Notes: svn path=/head/; revision=65787
Diffstat (limited to 'usr.bin/finger/finger.c')
-rw-r--r--usr.bin/finger/finger.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 18ca2873709a..006c67d11f23 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -274,7 +274,6 @@ userlist(argc, argv)
char conf_alias[LINE_MAX];
char *conf_realname;
int conf_length;
- int nip;
if ((nargv = malloc((argc+1) * sizeof(char *))) == NULL ||
(used = calloc(argc, sizeof(int))) == NULL)
@@ -333,17 +332,14 @@ userlist(argc, argv)
}
}
else {
- nip = 0;
- while (nip < argc && (pw = getpwent()) != NULL) {
+ while ((pw = getpwent()) != NULL) {
for (p = argv, ip = used; *p; ++p, ++ip)
if (**p == '/' && *ip != 1
- && show_text("", *p, "")) {
+ && show_text("", *p, ""))
*ip = 1;
- nip++;
- } else if (match(pw, *p) && !hide(pw)) {
+ else if (match(pw, *p) && !hide(pw)) {
enter_person(pw);
*ip = 1;
- nip++;
}
}
for (p = argv, ip = used; *p; ++p, ++ip)