X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvstore.c;h=3e0961e51a1ddc6ddd6905a856b956dc7dfdb55e;hp=81a03e8f98f0feac456fd84db802924645037352;hb=56a805299de35d8924969138aef4d0f1580daa6d;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 81a03e8..3e0961e 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -3,6 +3,10 @@
  * rcvstore.c -- asynchronously add mail to a folder
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -10,6 +14,7 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
+#include <h/mts.h>
 
 static struct swit switches[] = {
 #define CRETSW         0
@@ -33,17 +38,17 @@ static struct swit switches[] = {
 #define VERSIONSW      9
     { "version", 0 },
 #define HELPSW        10
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
-extern int errno;
 
 /*
  * name of temporary file to store incoming message
  */
 static char *tmpfilenam = NULL;
 
+static int unlink_done(int);
 
 int
 main (int argc, char **argv)
@@ -56,6 +61,8 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
+    done=unlink_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -130,7 +137,7 @@ main (int argc, char **argv)
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
 	    else
-		folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+		folder = pluspath (cp);
 	} else {
 	    adios (NULL, "usage: %s [+folder] [switches]", invo_name);
 	}
@@ -198,7 +205,7 @@ main (int argc, char **argv)
      * Link message into folder, and possibly add
      * to the Unseen-Sequence's.
      */
-    if ((msgnum = folder_addmsg (&mp, tmpfilenam, 0, unseensw, 0)) == -1)
+    if ((msgnum = folder_addmsg (&mp, tmpfilenam, 0, unseensw, 0, 0, (char *)0)) == -1)
 	done (1);
 
     /*
@@ -218,16 +225,17 @@ main (int argc, char **argv)
     unlink (tmpfilenam);	/* remove temporary file                  */
     tmpfilenam = NULL;
 
-    done (0);
+    return done (0);
 }
 
 /*
  * Clean up and exit
  */
-void
-done(int status)
+static int
+unlink_done(int status)
 {
     if (tmpfilenam && *tmpfilenam)
 	unlink (tmpfilenam);
     exit (status);
+    return 1;  /* dead code to satisfy the compiler */
 }