zsh-workers
 help / color / mirror / code / Atom feed
* [PATCH] Use gdbm_errno with gdbm_open
@ 2017-03-25  6:55 Sebastian Gniazdowski
  2017-03-25 10:12 ` Daniel Shahaf
  0 siblings, 1 reply; 3+ messages in thread
From: Sebastian Gniazdowski @ 2017-03-25  6:55 UTC (permalink / raw)
  To: zsh-workers

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

Hello,
there was one report about gdbm_open() failing. The patch uses gdbm_errno / gdbm_strerror() to know what exactly happened. I've checked that it works:

ztie: error opening database file /Users/sgniazdowski/db3 (Can't be writer)

– after ztie to already opened database. I hope Airmail will not mess up the patch. It is also attached.

Sebastian Gniazdowski
psprint [at] zdharma.org

diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c
index 596a8ae..0a28a07 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;
     }
 

[-- Attachment #2: gdbm_errno.diff --]
[-- Type: application/octet-stream, Size: 629 bytes --]

diff --git a/Src/Modules/db_gdbm.c b/Src/Modules/db_gdbm.c
index 596a8ae..0a28a07 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;
     }
 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Use gdbm_errno with gdbm_open
  2017-03-25  6:55 [PATCH] Use gdbm_errno with gdbm_open Sebastian Gniazdowski
@ 2017-03-25 10:12 ` Daniel Shahaf
  2017-03-25 13:52   ` Sebastian Gniazdowski
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Shahaf @ 2017-03-25 10:12 UTC (permalink / raw)
  To: zsh-workers

Sebastian Gniazdowski wrote on Sat, Mar 25, 2017 at 07:55:54 +0100:
> +++ b/Src/Modules/db_gdbm.c
> @@ -154,12 +154,13 @@ bin_ztie(char *nam, char **args, Options ops, UNUSED(int func))
> +    gdbm_errno=0;

Nitpick: whitespace around assignment operator.

>      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));

How about
    "error opening database file '%s'; gdbm error: %s"
?

That is: add quotes, avoid parentheses around pertinent information, and
sign gdbm's error message.  (I'd have used %q as in printf(1), but
I don't think zerrmsg() supports that yet.)

Cheers,

Daniel


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Use gdbm_errno with gdbm_open
  2017-03-25 10:12 ` Daniel Shahaf
@ 2017-03-25 13:52   ` Sebastian Gniazdowski
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Gniazdowski @ 2017-03-25 13:52 UTC (permalink / raw)
  To: Daniel Shahaf, zsh-workers

On 25 marca 2017 at 11:18:13, Daniel Shahaf (d.s@daniel.shahaf.name) wrote:
> How about
> "error opening database file '%s'; gdbm error: %s"
> ?
>  
> That is: add quotes, avoid parentheses around pertinent information, and
> sign gdbm's error message. (I'd have used %q as in printf(1), but
> I don't think zerrmsg() supports that yet.)

I think it's typical what I've done, cannot give examples but this is how messages are passed around in many applications

-- 
Sebastian Gniazdowski
psprint [at] zdharma.org


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-03-25 13:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-25  6:55 [PATCH] Use gdbm_errno with gdbm_open Sebastian Gniazdowski
2017-03-25 10:12 ` Daniel Shahaf
2017-03-25 13:52   ` Sebastian Gniazdowski

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).