X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/034abb1cc56e6b4d15282635ea46f276b97680d8..7bee8d7b3e221dbe5d5fde11d6e232482c5c454d:/sbr/m_mktemp.c

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index 009df0a1..2ab8d129 100644
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -156,9 +156,8 @@ m_mktemps(
     if (suffix == NULL) {
         if ((tmpfil = m_mktemp2(NULL, pfx_in, fd_ret, fp_ret))) {
             return add(tmpfil, NULL);
-        } else {
-            return NULL;
         }
+        return NULL;
     }
 
 #if HAVE_MKSTEMPS
@@ -170,7 +169,7 @@ m_mktemps(
 
     fd = mkstemps(tmpfil, (int) strlen(suffix));
 #else  /* ! HAVE_MKSTEMPS */
-    /* Solaris 10, e.g. */
+    /* NetBSD, Solaris 10 */
 
     if (pfx_in == NULL) {
         tmpfil = concat(get_temp_dir(), "/nmhXXXXXX", NULL);
@@ -355,13 +354,13 @@ remove_registered_files(int sig) {
 
         exit(1);
     } else {
+        remove_registered_files_atexit();
+
         act.sa_handler = SIG_DFL;
         (void) sigemptyset(&act.sa_mask);
         act.sa_flags = 0;
         (void) sigaction(sig, &act, 0);
 
-        remove_registered_files_atexit();
-
         (void) raise(sig);
     }
 }