projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separated send from whatnow, similar to the previous commit.
[mmh]
/
uip
/
conflict.c
diff --git
a/uip/conflict.c
b/uip/conflict.c
index
4251ab2
..
03de873
100644
(file)
--- a/
uip/conflict.c
+++ b/
uip/conflict.c
@@
-74,7
+74,6
@@
main(int argc, char **argv)
if (context_foil(NULL) == -1)
done(1);
if (context_foil(NULL) == -1)
done(1);
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
@@
-283,10
+282,7
@@
maildrops(void)
{
register int i;
{
register int i;
- if (mmdfldir && *mmdfldir)
- mdrop(mmdfldir);
- if (uucpldir && *uucpldir)
- mdrop(uucpldir);
+ mdrop(mailspool);
for (i = 0; dirs[i]; i++)
mdrop(dirs[i]);
}
for (i = 0; dirs[i]; i++)
mdrop(dirs[i]);
}