diff options
| author | Werner Koch <[email protected]> | 2021-10-20 14:39:23 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2021-11-02 19:57:03 +0000 |
| commit | bcd8f0239dfc36f99fbbb8ee309828ccee8974c0 (patch) | |
| tree | 1bee44eceb1640007eb223d8e388af4b7dab88b5 | |
| parent | common: Respect gpgconf.ctl when looking up translations (diff) | |
| download | gnupg-bcd8f0239dfc36f99fbbb8ee309828ccee8974c0.tar.gz gnupg-bcd8f0239dfc36f99fbbb8ee309828ccee8974c0.zip | |
common: Silence warning from unix_rootdir on systems w/o /proc
* common/homedir.c (unix_rootdir): Silence diagnostic in the common
case.
(MYPROC_SELF_EXE): Support NetBSD.
--
GnuPG-bug-id: 5656
| -rw-r--r-- | common/homedir.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/common/homedir.c b/common/homedir.c index 7a714980d..df87e3891 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -68,7 +68,9 @@ * text was read. */ #if __linux__ # define MYPROC_SELF_EXE "/proc/self/exe" -#else /* Assume *BSD*/ +#elif defined(__NetBSD__) +# define MYPROC_SELF_EXE "/proc/curproc/exe" +#else /* Assume other BSDs */ # define MYPROC_SELF_EXE "/proc/curproc/file" #endif @@ -482,13 +484,13 @@ unix_rootdir (int want_sysconfdir) if (nread < 0) { err = gpg_error_from_syserror (); - log_info ("error reading symlink '%s': %s\n", - MYPROC_SELF_EXE, gpg_strerror (err)); buffer[0] = 0; if ((name = getenv ("GNUPG_BUILD_ROOT")) && *name == '/') { /* Try a fallback for systems w/o a supported /proc - * file system. */ + * file system if we are running a regression test. */ + log_info ("error reading symlink '%s': %s\n", + MYPROC_SELF_EXE, gpg_strerror (err)); xfree (buffer); buffer = xstrconcat (name, "/bin/gpgconf", NULL); log_info ("trying fallback '%s'\n", buffer); |