X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dc0fb68d25efd03d4536dd3c112d609f8be79ac1..ac153baba6893597d9bfc0e22469736fbc5e6821:/uip/inc.c

diff --git a/uip/inc.c b/uip/inc.c
index c337dde5..552d7932 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -40,9 +40,10 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "h/done.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #ifndef TLS_SUPPORT
 # define TLSminc(a) (a)
@@ -156,10 +157,11 @@ static FILE *in;
 /*
  * prototypes
  */
+static int maildir_srt(const void *va, const void *vb) PURE;
 static void inc_done(int) NORETURN;
 static int pop_action(void *closure, char *);
 
-int
+static int
 maildir_srt(const void *va, const void *vb)
 {
     const struct Maildir_entry *a = va, *b = vb;
@@ -195,7 +197,7 @@ main (int argc, char **argv)
 
     int nmsgs, nbytes;
     char *MAILHOST_env_variable;
-    done=inc_done;
+    set_done(inc_done);
 
 /* absolutely the first thing we do is save our privileges,
  * and drop them if we can.
@@ -247,7 +249,7 @@ main (int argc, char **argv)
 	    case AUDSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-		audfile = getcpy (m_maildir (cp));
+		audfile = mh_xstrdup(m_maildir(cp));
 		continue;
 	    case NAUDSW:
 		audfile = NULL;
@@ -376,8 +378,7 @@ main (int argc, char **argv)
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else {
 	    adios (NULL, "usage: %s [+folder] [switches]", invo_name);
 	}
@@ -556,7 +557,7 @@ main (int argc, char **argv)
 	    inform("Creating Receive-Audit: %s", audfile);
 	if ((aud = fopen (audfile, "a")) == NULL)
 	    adios (audfile, "unable to append to");
-	else if (i == NOTOK)
+	if (i == NOTOK)
 	    chmod (audfile, m_gmprot ());
 
 	if (from)
@@ -907,7 +908,7 @@ skip:
 static void NORETURN
 inc_done (int status)
 {
-    done = exit;
+    set_done(exit);
     if (locked)
     {
         GETGROUPPRIVS();