X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvstore.c;h=5602dbc963e2840fb4393c57c573f79df32cde50;hp=06b8b694d69049fcc08800e101fbe05a9b89b793;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=240013872c392fe644bd4f79382d9f5314b4ea60

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 06b8b69..5602dbc 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -11,7 +11,6 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
-#include <h/mts.h>
 
 static struct swit switches[] = {
 #define CRETSW  0
@@ -33,7 +32,7 @@ static struct swit switches[] = {
 #define SEQSW  8
 	{ "sequence name", 0 },
 #define VERSIONSW  9
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  10
 	{ "help", 0 },
 	{ NULL, 0 }
@@ -52,7 +51,8 @@ main(int argc, char **argv)
 {
 	int publicsw = -1, zerosw = 0;
 	int create = 1, unseensw = 1;
-	int fd, msgnum, seqp = 0;
+	int fd, msgnum;
+	size_t seqp = 0;
 	char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
 	char **argp, **arguments, *seqs[NUMATTRS+1];
 	struct msgs *mp;
@@ -68,7 +68,6 @@ main(int argc, char **argv)
 	/* read user profile/context */
 	context_read();
 
-	mts_init(invo_name);
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
@@ -135,7 +134,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(NULL, "only one folder at a time!");
 			else
-				folder = pluspath(cp);
+				folder = getcpy(expandfol(cp));
 		} else {
 			adios(NULL, "usage: %s [+folder] [switches]",
 					invo_name);
@@ -144,13 +143,10 @@ main(int argc, char **argv)
 
 	seqs[seqp] = NULL;  /* NULL terminate list of sequences */
 
-	if (!context_find("path"))
-		free(path("./", TFOLDER));
-
 	/* if no folder is given, use default folder */
 	if (!folder)
-		folder = getfolder(0);
-	maildir = m_maildir(folder);
+		folder = getdeffol();
+	maildir = toabsdir(folder);
 
 	/* check if folder exists */
 	if (stat(maildir, &st) == NOTOK) {
@@ -205,8 +201,8 @@ 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, 0,
-			(char *)0)) == -1)
+	if ((msgnum = folder_addmsg(&mp, tmpfilenam, 0, unseensw, 0, 0, NULL))
+			== -1)
 		done(1);
 
 	/*
@@ -218,7 +214,7 @@ main(int argc, char **argv)
 			done(1);
 	}
 
-	seq_setunseen(mp, 0);  /* synchronize any Unseen-Sequence's */
+	seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
 	seq_save(mp);  /* synchronize and save message sequences */
 	folder_free(mp);  /* free folder/message structure */