diff options
| -rw-r--r-- | src/logging.c | 4 | ||||
| -rw-r--r-- | src/sysutils.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/logging.c b/src/logging.c index 96adce3..9008ba4 100644 --- a/src/logging.c +++ b/src/logging.c @@ -249,7 +249,7 @@ fun_writer (void *cookie_arg, const void *buffer, size_t size) srvr_addr_un.sun_family = af; if (!*name) { - if ((name = socket_dir_cb ()) && *name + if (socket_dir_cb && (name = socket_dir_cb ()) && *name && strlen (name) + 7 < sizeof (srvr_addr_un.sun_path)-1) { strncpy (srvr_addr_un.sun_path, @@ -887,7 +887,7 @@ _gpgrt_logv_internal (int level, int ignore_arg_ptr, const char *extrastring, if (ignore_arg_ptr) { /* This is used by log_string and comes with the extra - * feature that after a LF the next line is indent at the + * feature that after a LF the next line is indented by the * length of the prefix. Note that we do not yet include * the length of the timestamp and pid in the indent * computation. */ diff --git a/src/sysutils.c b/src/sysutils.c index 1251ed6..fac72bf 100644 --- a/src/sysutils.c +++ b/src/sysutils.c @@ -141,6 +141,10 @@ _gpgrt_setenv (const char *name, const char *value, int overwrite) if (!value && overwrite) { + /* Deleting an envvar. Although the Microsoft specs for + * putenv tell us that one may use "NAME=" to unset an envvar, + * this seems not to be correct. Thus we do the same as what + * we do in Unix (or well in GNU libc) and use just "NAME". */ if (!SetEnvironmentVariable (name, NULL)) return GPG_ERR_EINVAL; if (getenv (name)) |