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

Correctly handle empty path arguments, e.g., whereis -S -f biff.

Browse Source 
Approved by:	joerg, sheldonh (mentor)
This commit is contained in:
Johan Karlsson 2002-08-18 18:21:18 +00:00
parent 92fd901869
commit ad23c58318
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=102072
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/whereis/whereis.c
View File

@ -114,20 +114,16 @@ scanopts(int argc, char **argv)
dirlist = &sourcedirs;
dolist:
i = 0;
*dirlist = realloc(*dirlist, (i + 1) * sizeof(char *));
(*dirlist)[i] = NULL;
while (optind < argc &&
strcmp(argv[optind], "-f") != 0 &&
strcmp(argv[optind], "-B") != 0 &&
strcmp(argv[optind], "-M") != 0 &&
strcmp(argv[optind], "-S") != 0) {
*dirlist = realloc(*dirlist,
(i + 2) * sizeof(char *));
if (*dirlist == NULL)
abort();
(*dirlist)[i] = argv[optind];
i++;
decolonify(argv[optind], dirlist, &i);
optind++;
}
(*dirlist)[i] = NULL;
break;
case 'b':