Augmented new_fs() with an additional argument for a default form.

[mmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 1834c92..762a858 100644 (file)
--- 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)) {
@@ -377,7 +373,7 @@ main(int argc, char **argv)
 #endif /* MHE */
 
        /* Get new format string */
-       nfs = new_fs(form, format, FORMAT);
+       nfs = new_fs(form, format, NULL, FORMAT);
 
        if (noisy) {
                printf("Incorporating new mail into %s...\n\n", folder);
@@ -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);
@@ -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);
@@ -527,7 +522,7 @@ main(int argc, char **argv)
                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);