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

1) print an error and exit if fed a directory as a database

Browse Source 
Patch submitted by Soren Jacobsen in PR bin/21016, but
   heavily edited by me.
2) error and exit out if you can't open a database instead of just
   warning and going on.
This commit is contained in:
perry 2003-04-05 16:36:38 +00:00
parent 773de18a27
commit fa066122ba
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: locate.c,v 1.10 2003/04/03 01:20:26 christos Exp $ */ /* $NetBSD: locate.c,v 1.11 2003/04/05 16:36:38 perry Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93"; static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
#endif #endif
__RCSID("$NetBSD: locate.c,v 1.10 2003/04/03 01:20:26 christos Exp $"); __RCSID("$NetBSD: locate.c,v 1.11 2003/04/05 16:36:38 perry Exp $");
#endif /* not lint */ #endif /* not lint */
/* /*
@ -85,6 +85,7 @@ __RCSID("$NetBSD: locate.c,v 1.10 2003/04/03 01:20:26 christos Exp $");
#include <stdlib.h> #include <stdlib.h>
#include <err.h> #include <err.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/stat.h>
#include "locate.h" #include "locate.h"
#include "pathnames.h" #include "pathnames.h"
@ -113,16 +114,23 @@ add_db(path)
{ {
FILE *fp; FILE *fp;
struct locate_db *dbp; struct locate_db *dbp;
struct stat s;
if (!(path && *path)) if (!(path && *path))
path = _PATH_FCODES; path = _PATH_FCODES;
if (stat(path, &s) == -1)
err(1, "can't open database `%s'", path);
if (S_ISDIR(s.st_mode))
errx(1, "can't open database `%s': is a directory", path);
if ((fp = fopen(path, "r"))) { if ((fp = fopen(path, "r"))) {
dbp = NEW(struct locate_db); dbp = NEW(struct locate_db);
dbp->db_fp = fp; dbp->db_fp = fp;
dbp->db_path = path; dbp->db_path = path;
LIST_INSERT_HEAD(&db_list, dbp, db_link); LIST_INSERT_HEAD(&db_list, dbp, db_link);
} else { } else {
warnx("no database file `%s'", path); err(1, "can't open database `%s'", path);
} }
} }