Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

locate: fix support for multiple databases

Browse Source 
Ensure that the first database is correctly added when
more than one database is provided.

Fixes problem I introduced in rev 1.17 on 2009-04-12,
and noticed recently by Simon.
This commit is contained in:
lukem 2018-05-14 05:17:10 +00:00
parent 146c9cdc07
commit 94c0b8f918
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.bin/locate/locate/locate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: locate.c,v 1.18 2016/09/05 00:40:29 sevan Exp $ */
/* $NetBSD: locate.c,v 1.19 2018/05/14 05:17:10 lukem Exp $ */
/*
* Copyright (c) 1989, 1993
@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
#if 0
static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
#endif
__RCSID("$NetBSD: locate.c,v 1.18 2016/09/05 00:40:29 sevan Exp $");
__RCSID("$NetBSD: locate.c,v 1.19 2018/05/14 05:17:10 lukem Exp $");
#endif /* not lint */
/*
@ -153,15 +153,15 @@ main(int argc, char *argv[])
}
if (!locate_path)
locate_path = _PATH_FCODES;
if ((cp = strrchr(locate_path, ':'))) {
char *lp = strdup(locate_path);
while ((cp = strrchr(lp, ':'))) {
*cp++ = '\0';
add_db(cp);
}
free(lp);
char *lp = strdup(locate_path);
while ((cp = strrchr(lp, ':'))) {
*cp++ = '\0';
add_db(cp);
}
add_db(locate_path);
add_db(lp);
free(lp);
if (LIST_EMPTY(&db_list))
exit(1);
for (; optind < argc; ++optind) {