X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/41e77b5863b95012777eac3b172b2b339b209fbd..bddd9ca00cd2e2e73aded115a59614af3a74a6cb:/uip/rcvstore.c

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 25bb8780..660d7cee 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -1,6 +1,4 @@
-
-/*
- * rcvstore.c -- asynchronously add mail to a folder
+/* rcvstore.c -- asynchronously add mail to a folder
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -11,6 +9,10 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/mts.h>
+#include <h/utils.h>
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"
+#include "../sbr/makedir.h"
 
 #define RCVSTORE_SWITCHES \
     X("create", 0, CRETSW) \
@@ -121,8 +123,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);
 	}
@@ -175,7 +176,7 @@ main (int argc, char **argv)
     /* don't add file if it is empty */
     if (st.st_size == 0) {
 	(void) m_unlink (tmpfilenam);
-	advise (NULL, "empty file");
+	inform("empty file");
 	done (0);
     }
 
@@ -222,7 +223,7 @@ main (int argc, char **argv)
 /*
  * Clean up and exit
  */
-static void
+static void NORETURN
 unlink_done(int status)
 {
     if (tmpfilenam && *tmpfilenam)