about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSebastian Gniazdowski <psprint@zdharma.org>2017-03-25 07:55:54 +0100
committerPeter Stephenson <pws@zsh.org>2017-05-24 15:53:42 +0100
commit135075e48c6c2789bd8bae0a643961c0c2361dfc (patch)
treec90e8d11809460b52d005bdc37778f91de1459d8
parent99fff8f15cb010ca675cbb4a8c055512a2556107 (diff)
downloadzsh-135075e48c6c2789bd8bae0a643961c0c2361dfc.tar.gz
zsh-135075e48c6c2789bd8bae0a643961c0c2361dfc.tar.xz
zsh-135075e48c6c2789bd8bae0a643961c0c2361dfc.zip
40898: fix GDBM error handling
-rw-r--r--ChangeLog4
-rw-r--r--Src/Modules/db_gdbm.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f4b17ea34..a8e6eabb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-24  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* Sebastian: 40898: Src/Modules/db_gdbm.c: fix GDBM error handling.
+
 2017-05-23  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* Stephane: 41142: Src/Modules/system.c: ensure close-on-exec is
diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c
index 596a8ae24..0a28a0740 100644
--- a/Src/Modules/db_gdbm.c
+++ b/Src/Modules/db_gdbm.c
@@ -154,12 +154,13 @@ bin_ztie(char *nam, char **args, Options ops, UNUSED(int func))
 	    return 1;
     }
 
+    gdbm_errno=0;
     dbf = gdbm_open(resource_name, 0, read_write, 0666, 0);
     if(dbf) {
 	addmodulefd(gdbm_fdesc(dbf), FDT_MODULE);
         append_tied_name(pmname);
     } else {
-	zwarnnam(nam, "error opening database file %s", resource_name);
+	zwarnnam(nam, "error opening database file %s (%s)", resource_name, gdbm_strerror(gdbm_errno));
 	return 1;
     }