diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1999-04-18 17:08:11 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1999-04-18 17:08:11 +0000 |
| commit | b835de039b7bd67bb933abfe4d90444ba26ca99e (patch) | |
| tree | afa214c1486bb083dbb31848772368afdba36e46 /lib/libc/db/hash/hash.c | |
| parent | 44df8b77706890435e485c323ff5be8bec119bcb (diff) | |
o Opening a zero-length hash file should not be an error
o Correct odbm support
o Add man links for ndbm and odbm
Diffstat (limited to 'lib/libc/db/hash/hash.c')
| -rw-r--r-- | lib/libc/db/hash/hash.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c index bfa79e61546..f3635ed7772 100644 --- a/lib/libc/db/hash/hash.c +++ b/lib/libc/db/hash/hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.c,v 1.7 1999/02/15 05:11:23 millert Exp $ */ +/* $OpenBSD: hash.c,v 1.8 1999/04/18 17:08:07 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94"; #else -static char rcsid[] = "$OpenBSD: hash.c,v 1.7 1999/02/15 05:11:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: hash.c,v 1.8 1999/04/18 17:08:07 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -108,7 +108,7 @@ __hash_open(file, flags, mode, info, dflags) HTAB *hashp; struct stat statbuf; DB *dbp; - int bpages, hdrsize, new_table, nsegs, save_errno; + int bpages, hdrsize, new_table, nsegs, save_errno, rv; if ((flags & O_ACCMODE) == O_WRONLY) { errno = EINVAL; @@ -129,7 +129,8 @@ __hash_open(file, flags, mode, info, dflags) new_table = 0; if (!file || (flags & O_TRUNC) || - (stat(file, &statbuf) && (errno == ENOENT))) { + ((rv = stat(file, &statbuf)) && errno == ENOENT) || + (rv == 0 && statbuf.st_size == 0)) { if (errno == ENOENT) errno = 0; /* Just in case someone looks at errno */ new_table = 1; |