CVS commit: pkgsrc/archivers/libarchive/files/libarchive_fe

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Jun 22 13:01:14 UTC 2016

Modified Files:
        pkgsrc/archivers/libarchive/files/libarchive_fe: passphrase.c

Log Message:
Make signo static again to reduce diff against upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c
diff -u pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.3 pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.4
--- pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c:1.3    Wed Jun 22 12:04:03 2016
+++ pkgsrc/archivers/libarchive/files/libarchive_fe/passphrase.c        Wed Jun 22 13:01:14 2016
@@ -153,7 +153,7 @@ readpassphrase(const char *prompt, char 
                     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 
                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;