diff options
| author | joerg <joerg@pkgsrc.org> | 2016-06-22 13:01:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-06-22 13:01:14 +0000 |
| commit | b9b97f36e1febcda7a287c81487813af315cf86f (patch) | |
| tree | 42c20e3d04f6d60bde34d37d3f0f3265e6b80e16 /archivers | |
| parent | c59568aff8a01d83f8bb7f3b68fc3bb61ae09015 (diff) | |
| download | pkgsrc-b9b97f36e1febcda7a287c81487813af315cf86f.tar.gz | |
Make signo static again to reduce diff against upstream.
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/libarchive/files/libarchive_fe/passphrase.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/archivers/libarchive/files/libarchive_fe/passphrase.c b/archivers/libarchive/files/libarchive_fe/passphrase.c index 8e67bb33b35..8c38ad77782 100644 --- a/archivers/libarchive/files/libarchive_fe/passphrase.c +++ b/archivers/libarchive/files/libarchive_fe/passphrase.c @@ -153,7 +153,7 @@ readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags) M(M(SIGQUIT, SIGTERM), \ M(M(SIGTSTP, SIGTTIN), SIGTTOU))) -static volatile sig_atomic_t *signo; +static volatile sig_atomic_t signo[MAX_SIGNO + 1]; static void handler(int s) @@ -178,10 +178,6 @@ readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags) return(NULL); } - if (signo == NULL) { - signo = calloc(MAX_SIGNO + 1, sizeof(sig_atomic_t)); - } - restart: for (i = 0; i <= MAX_SIGNO; i++) signo[i] = 0; |