projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed mmailid masquerading.
[mmh]
/
uip
/
inc.c
diff --git
a/uip/inc.c
b/uip/inc.c
index
1834c92
..
f000d47
100644
(file)
--- a/
uip/inc.c
+++ b/
uip/inc.c
@@
-121,8
+121,6
@@
static FILE *in;
/*
** prototypes
*/
/*
** prototypes
*/
-char *map_name(char *);
-
static void inc_done(int) NORETURN;
static void inc_done(int) NORETURN;
@@
-290,12
+288,12
@@
main(int argc, char **argv)
else if ((newmail = context_find("maildrop")) && *newmail)
newmail = toabsdir(newmail);
else {
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 (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;
adios(NULL, "error allocating memory to copy newmail");
newmail = cp;
@@
-304,7
+302,7
@@
main(int argc, char **argv)
folder = getdeffol();
maildir = toabsdir(folder);
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)) {
adios(maildir, "error allocating memory to copy maildir");
if (!folder_exists(maildir)) {
@@
-432,7
+430,7
@@
main(int argc, char **argv)
snprintf(b, sizeof (b), "%s/%d", maildir_copy,
msgnum + 1);
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);
if (aud)
fputs(scanl, aud);
@@
-497,7
+495,6
@@
main(int argc, char **argv)
close(newfd);
else
admonish(newmail, "error zero'ing");
close(newfd);
else
admonish(newmail, "error zero'ing");
- unlink(map_name(newmail));
}
} else if (noisy) {
printf("%s not zero'd\n", newmail);
}
} else if (noisy) {
printf("%s not zero'd\n", newmail);
@@
-527,7
+524,7
@@
main(int argc, char **argv)
fclose(in); in = NULL;
}
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);
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
done(0);