X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=587bd846df21b930424bd3d934a86545a46222c2;hb=2d48b455c303a807041c35e4248955f8bec59eeb;hp=2a866e925867497638a42f80b770fd2465aa64e1;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;p=mmh

diff --git a/uip/inc.c b/uip/inc.c
index 2a866e9..587bd84 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -34,7 +34,6 @@
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>
-#include <h/mts.h>
 #include <errno.h>
 #include <signal.h>
 
@@ -121,8 +120,6 @@ static FILE *in;
 /*
 ** prototypes
 */
-char *map_name(char *);
-
 static void inc_done(int) NORETURN;
 
 
@@ -168,7 +165,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;
 
@@ -290,12 +286,12 @@ main(int argc, char **argv)
 	else if ((newmail = context_find("maildrop")) && *newmail)
 		newmail = toabsdir(newmail);
 	else {
-		newmail = concat(MAILDIR, "/", MAILFIL, NULL);
+		newmail = concat(mailspool, "/", getusername(), NULL);
 	}
 	if (stat(newmail, &s1) == NOTOK || s1.st_size == 0)
 		adios(NULL, "no mail to incorporate");
 
-	if ((cp = strdup(newmail)) == (char *)0)
+	if ((cp = strdup(newmail)) == NULL)
 		adios(NULL, "error allocating memory to copy newmail");
 
 	newmail = cp;
@@ -304,7 +300,7 @@ main(int argc, char **argv)
 		folder = getdeffol();
 	maildir = toabsdir(folder);
 
-	if ((maildir_copy = strdup(maildir)) == (char *)0)
+	if ((maildir_copy = strdup(maildir)) == NULL)
 		adios(maildir, "error allocating memory to copy maildir");
 
 	if (!folder_exists(maildir)) {
@@ -432,7 +428,7 @@ main(int argc, char **argv)
 
 			snprintf(b, sizeof (b), "%s/%d", maildir_copy,
 					msgnum + 1);
-			ext_hook("add-hook", b, (char *)0);
+			ext_hook("add-hook", b, NULL);
 
 			if (aud)
 				fputs(scanl, aud);
@@ -463,7 +459,7 @@ main(int argc, char **argv)
 	if (incerr < 0) {  /* error */
 		if (locked) {
 			GETGROUPPRIVS();  /* Be sure we can unlock mail file */
-			(void) lkfclose(in, newmail); in = NULL;
+			lkfclose(in, newmail); in = NULL;
 			DROPGROUPPRIVS();  /*
 					** And then return us to normal
 					** privileges
@@ -497,7 +493,6 @@ main(int argc, char **argv)
 				close(newfd);
 			else
 				admonish(newmail, "error zero'ing");
-			unlink(map_name(newmail));
 		}
 	} else if (noisy) {
 		printf("%s not zero'd\n", newmail);
@@ -506,7 +501,7 @@ main(int argc, char **argv)
 	if (msgnum == hghnum) {
 		admonish(NULL, "no messages incorporated");
 	} else {
-		context_replace(pfolder, folder);  /* update current folder */
+		context_replace(curfolder, folder); /* update current folder */
 		if (chgflag)
 			mp->curmsg = hghnum + 1;
 		mp->hghmsg = msgnum;
@@ -521,13 +516,13 @@ main(int argc, char **argv)
 	*/
 	if (locked) {
 		GETGROUPPRIVS();  /* Be sure we can unlock mail file */
-		(void) lkfclose(in, newmail); in = NULL;
+		lkfclose(in, newmail); in = NULL;
 		DROPGROUPPRIVS();  /* And then return us to normal privileges */
 	} else {
 		fclose(in); in = NULL;
 	}
 
-	seq_setunseen(mp, 0);  /* set the Unseen-Sequence */
+	seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
 	seq_save(mp);  /* synchronize sequences   */
 	context_save();  /* save the context file   */
 	done(0);