diff options
author | delphij <delphij@FreeBSD.org> | 2009-03-28 07:09:51 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2009-03-28 07:09:51 +0000 |
commit | 67cfc8aca68a9ff46aee6d7f86315f2c57f4db64 (patch) | |
tree | b4c6bbf80b2c06d69f3a9c66f3c7f8a47b35477e /lib/libc/db | |
parent | 643b09b14049932ff77ddf2e99f6935754899f36 (diff) | |
download | FreeBSD-src-67cfc8aca68a9ff46aee6d7f86315f2c57f4db64.zip FreeBSD-src-67cfc8aca68a9ff46aee6d7f86315f2c57f4db64.tar.gz |
Simplify the logic when determining whether to zero out a db file to after
open(). The previous logic only initializes the database when O_CREAT is
set, but as long as we can open and write the database, and the database
is empty, we should initialize it anyway.
Obtained from: OpenBSD
Diffstat (limited to 'lib/libc/db')
-rw-r--r-- | lib/libc/db/hash/hash.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c index e333185..dda70f8 100644 --- a/lib/libc/db/hash/hash.c +++ b/lib/libc/db/hash/hash.c @@ -120,25 +120,15 @@ __hash_open(const char *file, int flags, int mode, */ hashp->flags = flags; - new_table = 0; - if (!file || (flags & O_TRUNC) || - (stat(file, &statbuf) && (errno == ENOENT))) { - if (errno == ENOENT) - errno = 0; /* Just in case someone looks at errno */ - new_table = 1; - } if (file) { if ((hashp->fp = _open(file, flags, mode)) == -1) RETURN_ERROR(errno, error0); - - /* if the .db file is empty, and we had permission to create - a new .db file, then reinitialize the database */ - if ((flags & O_CREAT) && - _fstat(hashp->fp, &statbuf) == 0 && statbuf.st_size == 0) - new_table = 1; - (void)_fcntl(hashp->fp, F_SETFD, 1); - } + new_table = _fstat(hashp->fp, &statbuf) == 0 && + statbuf.st_size == 0 && (flags & O_ACCMODE) != O_RDONLY; + } else + new_table = 1; + if (new_table) { if (!(hashp = init_hash(hashp, file, info))) RETURN_ERROR(errno, error1); |