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

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index ca8789f..3e0961e 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -42,13 +42,13 @@ static struct swit switches[] = {
     { 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)
@@ -61,6 +61,8 @@ main (int argc, char **argv)
     struct msgs *mp;
     struct stat st;
 
+    done=unlink_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -135,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);
 	}
@@ -203,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);
 
     /*
@@ -229,8 +231,8 @@ main (int argc, char **argv)
 /*
  * Clean up and exit
  */
-int
-done(int status)
+static int
+unlink_done(int status)
 {
     if (tmpfilenam && *tmpfilenam)
 	unlink (tmpfilenam);