X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=6a756d9855f24302836557e3acc570bad53ab6a1;hb=d455d79d05331347130d3ab59628c3fd77b87279;hp=2a866e925867497638a42f80b770fd2465aa64e1;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;p=mmh diff --git a/uip/inc.c b/uip/inc.c index 2a866e9..6a756d9 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -295,7 +295,7 @@ main(int argc, char **argv) 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 +304,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 +432,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 +463,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 @@ -506,7 +506,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 +521,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);