projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
slocal: use mhetcdir instead of NMHETCDIR.
[mmh]
/
uip
/
slocal.c
diff --git
a/uip/slocal.c
b/uip/slocal.c
index
d97af90
..
eecd760
100644
(file)
--- a/
uip/slocal.c
+++ b/
uip/slocal.c
@@
-86,10
+86,6
@@
static struct swit switches[] = {
};
};
-/* global maildelivery file */
-char *maildelivery = NMHETCDIR"/maildelivery";
-
-
static int globbed = 0; /* have we built "vars" table yet? */
static int parsed = 0; /* have we built header field table yet */
static int utmped = 0; /* have we scanned umtp(x) file yet */
static int globbed = 0; /* have we built "vars" table yet? */
static int parsed = 0; /* have we built header field table yet */
static int utmped = 0; /* have we scanned umtp(x) file yet */
@@
-437,12
+433,15
@@
main(int argc, char **argv)
static int
localmail(int fd, char *mdlvr)
{
static int
localmail(int fd, char *mdlvr)
{
+ char buf[BUFSIZ];
+
/* delivery according to personal Maildelivery file */
if (usr_delivery(fd, mdlvr ? mdlvr : ".maildelivery", 0) != -1) {
return 0;
}
/* delivery according to global Maildelivery file */
/* delivery according to personal Maildelivery file */
if (usr_delivery(fd, mdlvr ? mdlvr : ".maildelivery", 0) != -1) {
return 0;
}
/* delivery according to global Maildelivery file */
- if (usr_delivery(fd, maildelivery, 1) != -1) {
+ snprintf(buf, sizeof buf, "%s/%s", mhetcdir, "maildelivery");
+ if (usr_delivery(fd, buf, 1) != -1) {
return 0;
}
if (verbose) {
return 0;
}
if (verbose) {