diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-11-25 18:51:00 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-11-25 18:51:00 +0100 |
| commit | 317ec32cb1cbd15b31e17bcb07f09c52cd37c44a (patch) | |
| tree | 88a02c853dfafd82a2d551d862d8dfb056b1bee6 /Src/Modules/db_gdbm.c | |
| parent | 1637291aaea12ddcfd549d50d49c480185995c1a (diff) | |
| parent | cce4261a3c6f4bf78b483db61623c80e3c98d10b (diff) | |
| download | zsh-317ec32cb1cbd15b31e17bcb07f09c52cd37c44a.tar.gz zsh-317ec32cb1cbd15b31e17bcb07f09c52cd37c44a.zip | |
Merge tag 'zsh-5.1.1-test-1' into debian
Diffstat (limited to 'Src/Modules/db_gdbm.c')
| -rw-r--r-- | Src/Modules/db_gdbm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c index 76d4751bf..032963262 100644 --- a/Src/Modules/db_gdbm.c +++ b/Src/Modules/db_gdbm.c @@ -106,7 +106,9 @@ bin_ztie(char *nam, char **args, Options ops, UNUSED(int func)) } dbf = gdbm_open(resource_name, 0, read_write, 0666, 0); - if(!dbf) { + if(dbf) + addmodulefd(gdbm_fdesc(dbf), FDT_INTERNAL); + else { zwarnnam(nam, "error opening database file %s", resource_name); return 1; } @@ -114,6 +116,7 @@ bin_ztie(char *nam, char **args, Options ops, UNUSED(int func)) if (!(tied_param = createspecialhash(pmname, &getgdbmnode, &scangdbmkeys, pmflags))) { zwarnnam(nam, "cannot create the requested parameter %s", pmname); + fdtable[gdbm_fdesc(dbf)] = FDT_UNUSED; gdbm_close(dbf); return 1; } @@ -319,8 +322,10 @@ gdbmuntie(Param pm) GDBM_FILE dbf = (GDBM_FILE)(pm->u.hash->tmpdata); HashTable ht = pm->u.hash; - if (dbf) /* paranoia */ + if (dbf) { /* paranoia */ + fdtable[gdbm_fdesc(dbf)] = FDT_UNUSED; gdbm_close(dbf); + } ht->tmpdata = NULL; |