summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorjoerg <joerg>2016-06-22 13:01:14 +0000
committerjoerg <joerg>2016-06-22 13:01:14 +0000
commit65cd173492409117d5ffac1947b558f7b4947e7f (patch)
treec0f64d49d32f754b48eb2c0c4f96b8c0c700ee70 /archivers
parent9530132c9379b171eafae9e04a10a16ea15896d3 (diff)
downloadpkgsrc-65cd173492409117d5ffac1947b558f7b4947e7f.tar.gz
Make signo static again to reduce diff against upstream.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/libarchive/files/libarchive_fe/passphrase.c6
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;