From ed119a2411ebc8480b1a982d304b7b61ed37a2c9 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Mon, 3 Feb 2014 22:48:38 -0600
Subject: [PATCH] Reordered a bit of code in signal handler.  Noted in comment
 that NetBSD doesn't have mkstemps(3).

---
 sbr/m_mktemp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index 009df0a1..6bfa705f 100644
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -170,7 +170,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 +355,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);
     }
 }
-- 
2.56.0