{ "Resent-From", NULL, P_ADR },
{ "Resent-Sender", NULL, P_ADR },
{ "Resent-To", NULL, P_ADR },
- { "Resent-cc", NULL, P_ADR },
+ { "Resent-Cc", NULL, P_ADR },
{ NULL, NULL, 0 }
};
/*
** static prototypes
*/
-static int localmail (int, char *);
-static int usr_delivery (int, char *, int);
-static int split (char *, char **);
-static int parse (int);
-static void expand (char *, char *, int);
-static void glob (int);
-static struct pair *lookup (struct pair *, char *);
-static int logged_in (void);
-static int timely (char *, char *);
-static int usr_file (int, char *, int);
-static int usr_pipe (int, char *, char *, char **, int);
-static int usr_folder (int, char *);
-static RETSIGTYPE alrmser (int);
-static void get_sender (char *, char **);
-static int copy_message (int, char *, int);
-static void verbose_printf (char *fmt, ...);
-static void adorn (char *, char *, ...);
-static void debug_printf (char *fmt, ...);
-static int suppress_duplicates (int, char *);
-static char *trim (char *);
+static int localmail(int, char *);
+static int usr_delivery(int, char *, int);
+static int split(char *, char **);
+static int parse(int);
+static void expand(char *, char *, int);
+static void glob(int);
+static struct pair *lookup(struct pair *, char *);
+static int logged_in(void);
+static int timely(char *, char *);
+static int usr_file(int, char *, int);
+static int usr_pipe(int, char *, char *, char **, int);
+static int usr_folder(int, char *);
+static RETSIGTYPE alrmser(int);
+static void get_sender(char *, char **);
+static int copy_message(int, char *, int);
+static void verbose_printf(char *fmt, ...);
+static void adorn(char *, char *, ...);
+static void debug_printf(char *fmt, ...);
+static int suppress_duplicates(int, char *);
+static char *trim(char *);
int
-main (int argc, char **argv)
+main(int argc, char **argv)
{
int fd, status;
FILE *fp = stdin;
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex (*argv, '/');
+ invo_name = mhbasename(*argv);
/* foil search of user profile/context */
- 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);
+ mts_init(invo_name);
+ arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
/* Parse arguments */
while ((cp = *argp++)) {
if (*cp == '-') {
- switch (smatch (++cp, switches)) {
- case AMBIGSW:
- ambigsw (cp, switches);
- done (1);
- case UNKWNSW:
- adios (NULL, "-%s unknown", cp);
-
- case HELPSW:
- snprintf (buf, sizeof(buf),
- "%s [switches] [address info sender]", invo_name);
- print_help (buf, switches, 0);
- done (1);
- case VERSIONSW:
- print_version(invo_name);
- done (1);
-
- case ADDRSW:
- if (!(addr = *argp++))
- /* allow -xyz arguments */
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case INFOSW:
- if (!(info = *argp++))
- /* allow -xyz arguments */
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case USERSW:
- if (!(user = *argp++))
- /* allow -xyz arguments */
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case FILESW:
- if (!(file = *argp++) || *file == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case SENDERSW:
- if (!(sender = *argp++))
- /* allow -xyz arguments */
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case MAILBOXSW:
- if (!(mbox = *argp++) || *mbox == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
- case HOMESW:
- if (!(home = *argp++) || *home == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- continue;
+ switch (smatch(++cp, switches)) {
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ done(1);
+ case UNKWNSW:
+ adios(NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf), "%s [switches] [address info sender]", invo_name);
+ print_help(buf, switches, 0);
+ done(1);
+ case VERSIONSW:
+ print_version(invo_name);
+ done(1);
+
+ case ADDRSW:
+ if (!(addr = *argp++))
+ /* allow -xyz arguments */
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+ case INFOSW:
+ if (!(info = *argp++))
+ /* allow -xyz arguments */
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+ case USERSW:
+ if (!(user = *argp++))
+ /* allow -xyz arguments */
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+ case FILESW:
+ if (!(file = *argp++) || *file == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+ case SENDERSW:
+ if (!(sender = *argp++))
+ /* allow -xyz arguments */
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+ case MAILBOXSW:
+ if (!(mbox = *argp++) || *mbox == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+ case HOMESW:
+ if (!(home = *argp++) || *home == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
- case MAILSW:
- if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
- if (mdlvr)
- adios (NULL, "only one maildelivery file at a time!");
- mdlvr = cp;
- continue;
+ case MAILSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ if (mdlvr)
+ adios(NULL, "only one maildelivery file at a time!");
+ mdlvr = cp;
+ continue;
- case VERBSW:
- verbose++;
- continue;
- case NVERBSW:
- verbose = 0;
- continue;
+ case VERBSW:
+ verbose++;
+ continue;
+ case NVERBSW:
+ verbose = 0;
+ continue;
- case SUPPRESSDUP:
- suppressdup++;
- continue;
- case NSUPPRESSDUP:
- suppressdup = 0;
- continue;
- case DEBUGSW:
- debug++;
- continue;
+ case SUPPRESSDUP:
+ suppressdup++;
+ continue;
+ case NSUPPRESSDUP:
+ suppressdup = 0;
+ continue;
+ case DEBUGSW:
+ debug++;
+ continue;
}
}
switch (argp - (argv + 1)) {
- case 1:
- addr = cp;
- break;
-
- case 2:
- info = cp;
- break;
-
- case 3:
- sender = cp;
- break;
+ case 1:
+ addr = cp;
+ break;
+ case 2:
+ info = cp;
+ break;
+ case 3:
+ sender = cp;
+ break;
}
}
if (addr == NULL)
- addr = getusername ();
+ addr = getusername();
if (user == NULL)
user = (cp = strchr(addr, '.')) ? ++cp : addr;
- if ((pw = getpwnam (user)) == NULL)
- adios (NULL, "no such local user as %s", user);
+ if ((pw = getpwnam(user)) == NULL)
+ adios(NULL, "no such local user as %s", user);
- if (chdir (pw->pw_dir) == -1)
- chdir ("/");
- umask (0077);
+ if (chdir(pw->pw_dir) == -1)
+ chdir("/");
+ umask(0077);
if (geteuid() == 0) {
- setgid (pw->pw_gid);
- initgroups (pw->pw_name, pw->pw_gid);
- setuid (pw->pw_uid);
+ setgid(pw->pw_gid);
+ initgroups(pw->pw_name, pw->pw_gid);
+ setuid(pw->pw_uid);
}
if (info == NULL)
info = "";
- setbuf (stdin, NULL);
+ setbuf(stdin, NULL);
/* Record the delivery time */
- if ((now = dlocaltimenow ()) == NULL)
- adios (NULL, "unable to ascertain local time");
- snprintf (ddate, sizeof(ddate), "Delivery-Date: %s\n", dtimenow (0));
+ if ((now = dlocaltimenow()) == NULL)
+ adios(NULL, "unable to ascertain local time");
+ snprintf(ddate, sizeof(ddate), "Delivery-Date: %s\n", dtimenow(0));
/*
** Copy the message to a temporary file
int tempfd;
/* getting message from file */
- if ((tempfd = open (file, O_RDONLY)) == -1)
- adios (file, "unable to open");
+ if ((tempfd = open(file, O_RDONLY)) == -1)
+ adios(file, "unable to open");
if (debug)
- debug_printf ("retrieving message from file \"%s\"\n", file);
- if ((fd = copy_message (tempfd, tmpfil, 1)) == -1)
- adios (NULL, "unable to create temporary file");
- close (tempfd);
+ debug_printf("retrieving message from file \"%s\"\n",
+ file);
+ if ((fd = copy_message(tempfd, tmpfil, 1)) == -1)
+ adios(NULL, "unable to create temporary file");
+ close(tempfd);
} else {
/* getting message from stdin */
if (debug)
- debug_printf ("retrieving message from stdin\n");
- if ((fd = copy_message (fileno (stdin), tmpfil, 1)) == -1)
- adios (NULL, "unable to create temporary file");
+ debug_printf("retrieving message from stdin\n");
+ if ((fd = copy_message(fileno(stdin), tmpfil, 1)) == -1)
+ adios(NULL, "unable to create temporary file");
}
if (debug)
- debug_printf ("temporary file=\"%s\"\n", tmpfil);
+ debug_printf("temporary file=\"%s\"\n", tmpfil);
/*
** Delete the temp file now or a copy of every single message
** someone who cares about the temp-file-accessing functionality
** (they'll have to watch out for cases where we adios()).
*/
- unlink (tmpfil);
+ unlink(tmpfil);
- if (!(fp = fdopen (fd, "r+")))
- adios (NULL, "unable to access temporary file");
+ if (!(fp = fdopen(fd, "r+")))
+ adios(NULL, "unable to access temporary file");
/*
** If no sender given, extract it
** from envelope information.
*/
if (sender == NULL)
- get_sender (envelope, &sender);
+ get_sender(envelope, &sender);
if (mbox == NULL) {
- snprintf (mailbox, sizeof(mailbox), "%s/%s",
+ snprintf(mailbox, sizeof(mailbox), "%s/%s",
mmdfldir[0] ? mmdfldir : pw->pw_dir,
mmdflfil[0] ? mmdflfil : pw->pw_name);
mbox = mailbox;
home = pw->pw_dir;
if (debug) {
- debug_printf ("addr=\"%s\"\n", trim(addr));
- debug_printf ("user=\"%s\"\n", trim(user));
- debug_printf ("info=\"%s\"\n", trim(info));
- debug_printf ("sender=\"%s\"\n", trim(sender));
- debug_printf ("envelope=\"%s\"\n",
+ debug_printf("addr=\"%s\"\n", trim(addr));
+ debug_printf("user=\"%s\"\n", trim(user));
+ debug_printf("info=\"%s\"\n", trim(info));
+ debug_printf("sender=\"%s\"\n", trim(sender));
+ debug_printf("envelope=\"%s\"\n",
envelope ? trim(envelope) : "");
- debug_printf ("mbox=\"%s\"\n", trim(mbox));
- debug_printf ("home=\"%s\"\n", trim(home));
- debug_printf ("ddate=\"%s\"\n", trim(ddate));
- debug_printf ("now=%02d:%02d\n\n", now->tw_hour, now->tw_min);
+ debug_printf("mbox=\"%s\"\n", trim(mbox));
+ debug_printf("home=\"%s\"\n", trim(home));
+ debug_printf("ddate=\"%s\"\n", trim(ddate));
+ debug_printf("now=%02d:%02d\n\n", now->tw_hour, now->tw_min);
}
/* deliver the message */
- status = localmail (fd, mdlvr);
+ status = localmail(fd, mdlvr);
- done (status != -1 ? RCV_MOK : RCV_MBX);
+ done(status != -1 ? RCV_MOK : RCV_MBX);
return 1;
}
*/
static int
-localmail (int fd, char *mdlvr)
+localmail(int fd, char *mdlvr)
{
/* check if this message is a duplicate */
- if (suppressdup &&
- suppress_duplicates(fd,
- mdlvr ? mdlvr : ".maildelivery") == DONE)
+ if (suppressdup && suppress_duplicates(fd, mdlvr ?
+ mdlvr : ".maildelivery") == DONE)
return 0;
/* delivery according to personal Maildelivery file */
- if (usr_delivery (fd, mdlvr ? mdlvr : ".maildelivery", 0) != -1)
+ if (usr_delivery(fd, mdlvr ? mdlvr : ".maildelivery", 0) != -1)
return 0;
/* delivery according to global Maildelivery file */
- if (usr_delivery (fd, maildelivery, 1) != -1)
+ if (usr_delivery(fd, maildelivery, 1) != -1)
return 0;
if (verbose)
- verbose_printf ("(delivering to standard mail spool)\n");
+ verbose_printf("(delivering to standard mail spool)\n");
/* last resort - deliver to standard mail spool */
#ifdef SLOCAL_MBOX
- return usr_file (fd, mbox, MBOX_FORMAT);
+ return usr_file(fd, mbox, MBOX_FORMAT);
#else
- return usr_file (fd, mbox, MMDF_FORMAT);
+ return usr_file(fd, mbox, MMDF_FORMAT);
#endif
}
-#define matches(a,b) (stringdex (b, a) >= 0)
+#define matches(a,b) (stringdex(b, a) >= 0)
/*
** Parse the delivery file, and process incoming message.
*/
static int
-usr_delivery (int fd, char *delivery, int su)
+usr_delivery(int fd, char *delivery, int su)
{
int i, accept, status=1, won, vecp, next;
char *field, *pattern, *action, *result, *string;
FILE *fp;
/* open the delivery file */
- if ((fp = fopen (delivery, "r")) == NULL)
+ if ((fp = fopen(delivery, "r")) == NULL)
return -1;
/* check if delivery file has bad ownership or permissions */
- if (fstat (fileno (fp), &st) == -1
- || (st.st_uid != 0 && (su || st.st_uid != pw->pw_uid))
- || st.st_mode & (S_IWGRP|S_IWOTH)) {
+ if (fstat(fileno(fp), &st) == -1 ||
+ (st.st_uid != 0 && (su || st.st_uid != pw->pw_uid)) ||
+ st.st_mode & (S_IWGRP|S_IWOTH)) {
if (verbose) {
- verbose_printf ("WARNING: %s has bad ownership/modes (su=%d,uid=%d,owner=%d,mode=0%o)\n", delivery, su, (int) pw->pw_uid, (int) st.st_uid, (int) st.st_mode);
+ verbose_printf("WARNING: %s has bad ownership/modes (su=%d,uid=%d,owner=%d,mode=0%o)\n", delivery, su, (int) pw->pw_uid, (int) st.st_uid, (int) st.st_mode);
}
return -1;
}
next = 1;
/* read and process delivery file */
- while (fgets (buffer, sizeof(buffer), fp)) {
+ while (fgets(buffer, sizeof(buffer), fp)) {
/* skip comments and empty lines */
if (*buffer == '#' || *buffer == '\n')
continue;
*cp = 0;
/* split buffer into fields */
- vecp = split (buffer, vec);
+ vecp = split(buffer, vec);
/* check for too few fields */
if (vecp < 5) {
if (debug)
- debug_printf ("WARNING: entry with only %d fields, skipping.\n", vecp);
+ debug_printf("WARNING: entry with only %d fields, skipping.\n", vecp);
continue;
}
if (debug) {
for (i = 0; vec[i]; i++)
- debug_printf ("vec[%d]: \"%s\"\n",
+ debug_printf("vec[%d]: \"%s\"\n",
i, trim(vec[i]));
}
/* find out how to perform the action */
switch (result[0]) {
- case 'N':
- case 'n':
- /*
- ** If previous condition failed, don't
- ** do this - else fall through
- */
- if (!next)
- continue; /* else fall */
+ case 'N':
+ case 'n':
+ /*
+ ** If previous condition failed, don't
+ ** do this - else fall through
+ */
+ if (!next)
+ continue; /* else fall */
- case '?':
- /*
- ** If already delivered, skip this action.
- ** Else consider delivered if action is
- ** successful.
- */
- if (won)
- continue; /* else fall */
+ case '?':
+ /*
+ ** If already delivered, skip this action.
+ ** Else consider delivered if action is
+ ** successful.
+ */
+ if (won)
+ continue; /* else fall */
- case 'A':
- case 'a':
- /*
- ** Take action, and consider delivered if
- ** action is successful.
- */
- accept = 1;
- break;
+ case 'A':
+ case 'a':
+ /*
+ ** Take action, and consider delivered if
+ ** action is successful.
+ */
+ accept = 1;
+ break;
- case 'R':
- case 'r':
- default:
- /*
- ** Take action, but don't consider delivered,
- ** even if action is successful
- */
- accept = 0;
- break;
+ case 'R':
+ case 'r':
+ default:
+ /*
+ ** Take action, but don't consider delivered,
+ ** even if action is successful
+ */
+ accept = 0;
+ break;
}
if (vecp > 5) {
- if (!mh_strcasecmp (vec[5], "select")) {
- if (logged_in () != -1)
+ if (!mh_strcasecmp(vec[5], "select")) {
+ if (logged_in() != -1)
continue;
- if (vecp > 7 && timely (vec[6], vec[7]) == -1)
+ if (vecp > 7 && timely(vec[6], vec[7]) == -1)
continue;
}
}
/* check if the field matches */
switch (*field) {
- case '*':
- /* always matches */
+ case '*':
+ /* always matches */
+ break;
+
+ case 'd':
+ /*
+ ** "default" matches only if the message hasn't
+ ** been delivered yet.
+ */
+ if (!mh_strcasecmp(field, "default")) {
+ if (won)
+ continue;
break;
+ } /* else fall */
- case 'd':
+ default:
+ /* parse message and build lookup table */
+ if (!parsed && parse(fd) == -1) {
+ fclose(fp);
+ return -1;
+ }
/*
- ** "default" matches only if the message hasn't
- ** been delivered yet.
+ ** find header field in lookup table, and
+ ** see if the pattern matches.
*/
- if (!mh_strcasecmp (field, "default")) {
- if (won)
- continue;
- break;
- } /* else fall */
-
- default:
- /* parse message and build lookup table */
- if (!parsed && parse (fd) == -1) {
- fclose (fp);
- return -1;
- }
- /*
- ** find header field in lookup table, and
- ** see if the pattern matches.
- */
- if ((p = lookup (hdrs, field)) &&
- (p->p_value != NULL) &&
- matches (p->p_value, pattern)
- ) {
- next = 1;
- } else {
- next = 0;
- continue;
- }
- break;
+ if ((p = lookup(hdrs, field)) && (p->p_value != NULL)
+ && matches(p->p_value, pattern)) {
+ next = 1;
+ } else {
+ next = 0;
+ continue;
+ }
+ break;
}
/* find out the action to perform */
switch (*action) {
- case 'q':
- /* deliver to quoted pipe */
- if (mh_strcasecmp (action, "qpipe"))
- continue; /* else fall */
- case '^':
- expand (tmpbuf, string, fd);
- if (split (tmpbuf, vec) < 1)
- continue;
- status = usr_pipe (fd, tmpbuf, vec[0], vec, 0);
- break;
+ case 'q':
+ /* deliver to quoted pipe */
+ if (mh_strcasecmp(action, "qpipe"))
+ continue; /* else fall */
+ case '^':
+ expand(tmpbuf, string, fd);
+ if (split(tmpbuf, vec) < 1)
+ continue;
+ status = usr_pipe(fd, tmpbuf, vec[0], vec, 0);
+ break;
- case 'p':
- /* deliver to pipe */
- if (mh_strcasecmp (action, "pipe"))
- continue; /* else fall */
- case '|':
- vec[2] = "sh";
- vec[3] = "-c";
- expand (tmpbuf, string, fd);
- vec[4] = tmpbuf;
- vec[5] = NULL;
- status = usr_pipe (fd, tmpbuf, "/bin/sh",
- vec + 2, 0);
- break;
+ case 'p':
+ /* deliver to pipe */
+ if (mh_strcasecmp(action, "pipe"))
+ continue; /* else fall */
+ case '|':
+ vec[2] = "sh";
+ vec[3] = "-c";
+ expand(tmpbuf, string, fd);
+ vec[4] = tmpbuf;
+ vec[5] = NULL;
+ status = usr_pipe(fd, tmpbuf, "/bin/sh",
+ vec + 2, 0);
+ break;
- case 'f':
- /* mbox format */
- if (!mh_strcasecmp (action, "file")) {
- status = usr_file (fd, string,
- MBOX_FORMAT);
- break;
- }
- /* deliver to nmh folder */
- else if (mh_strcasecmp (action, "folder"))
- continue; /* else fall */
- case '+':
- status = usr_folder (fd, string);
+ case 'f':
+ /* mbox format */
+ if (!mh_strcasecmp(action, "file")) {
+ status = usr_file(fd, string,
+ MBOX_FORMAT);
break;
+ }
+ /* deliver to nmh folder */
+ else if (mh_strcasecmp(action, "folder"))
+ continue; /* else fall */
+ case '+':
+ status = usr_folder(fd, string);
+ break;
- case 'm':
- /* mmdf format */
- if (!mh_strcasecmp (action, "mmdf")) {
- status = usr_file (fd, string,
- MMDF_FORMAT);
- break;
- }
- /* mbox format */
- else if (mh_strcasecmp (action, "mbox"))
- continue; /* else fall */
-
- case '>':
- /* mbox format */
- status = usr_file (fd, string, MBOX_FORMAT);
+ case 'm':
+ /* mmdf format */
+ if (!mh_strcasecmp(action, "mmdf")) {
+ status = usr_file(fd, string,
+ MMDF_FORMAT);
break;
+ }
+ /* mbox format */
+ else if (mh_strcasecmp(action, "mbox"))
+ continue; /* else fall */
- case 'd':
- /* ignore message */
- if (mh_strcasecmp (action, "destroy"))
- continue;
- status = 0;
- break;
+ case '>':
+ /* mbox format */
+ status = usr_file(fd, string, MBOX_FORMAT);
+ break;
+
+ case 'd':
+ /* ignore message */
+ if (mh_strcasecmp(action, "destroy"))
+ continue;
+ status = 0;
+ break;
}
- if (status) next = 0; /* action failed, mark for 'N' result */
+ if (status)
+ next = 0; /* action failed, mark for 'N' result */
if (accept && status == 0)
won++;
}
- fclose (fp);
+ fclose(fp);
return (won ? 0 : -1);
}
*/
static int
-split (char *cp, char **vec)
+split(char *cp, char **vec)
{
int i;
unsigned char *s;
vec[i] = NULL;
/* zap any whitespace and comma's */
- while (isspace (*s) || *s == ',')
+ while (isspace(*s) || *s == ',')
*s++ = 0;
/* end of buffer, time to leave */
*/
if (*s == QUOTE) {
if (*++s == '"')
- strcpy (s - 1, s);
+ strcpy(s - 1, s);
s--;
}
}
vec[i++] = s++;
/* move forward to next field delimiter */
- while (*s && !isspace (*s) && *s != ',')
+ while (*s && !isspace(*s) && *s != ',')
s++;
}
vec[i] = NULL;
*/
static int
-parse (int fd)
+parse(int fd)
{
int i, state;
int fd1;
return 0;
/* get a new FILE pointer to message */
- if ((fd1 = dup (fd)) == -1)
+ if ((fd1 = dup(fd)) == -1)
return -1;
- if ((in = fdopen (fd1, "r")) == NULL) {
- close (fd1);
+ if ((in = fdopen(fd1, "r")) == NULL) {
+ close(fd1);
return -1;
}
- rewind (in);
+ rewind(in);
/* add special entries to lookup table */
- if ((p = lookup (hdrs, "source")))
- p->p_value = getcpy (sender);
- if ((p = lookup (hdrs, "addr")))
- p->p_value = getcpy (addr);
+ if ((p = lookup(hdrs, "source")))
+ p->p_value = getcpy(sender);
+ if ((p = lookup(hdrs, "addr")))
+ p->p_value = getcpy(addr);
/*
* Scan the headers of the message and build
* a lookup table.
*/
for (i = 0, state = FLD;;) {
- switch (state = m_getfld (state, name, field, sizeof(field),
+ switch (state = m_getfld(state, name, field, sizeof(field),
in)) {
- case FLD:
- case FLDEOF:
- case FLDPLUS:
- lp = add (field, NULL);
- while (state == FLDPLUS) {
- state = m_getfld (state, name, field, sizeof(field), in);
- lp = add (field, lp);
- }
- for (p = hdrs; p->p_name; p++) {
- if (!mh_strcasecmp (p->p_name, name)) {
- if (!(p->p_flags & P_HID)) {
- if ((cp = p->p_value)) {
- if (p->p_flags & P_ADR) {
- dp = cp + strlen (cp) - 1;
- if (*dp == '\n')
- *dp = 0;
- cp = add (",\n\t", cp);
- } else {
- cp = add ("\t", cp);
- }
+ case FLD:
+ case FLDEOF:
+ case FLDPLUS:
+ lp = getcpy(field);
+ while (state == FLDPLUS) {
+ state = m_getfld(state, name, field,
+ sizeof(field), in);
+ lp = add(field, lp);
+ }
+ for (p = hdrs; p->p_name; p++) {
+ if (!mh_strcasecmp(p->p_name, name)) {
+ if (!(p->p_flags & P_HID)) {
+ if ((cp = p->p_value)) {
+ if (p->p_flags & P_ADR) {
+ dp = cp + strlen(cp) - 1;
+ if (*dp == '\n')
+ *dp = 0;
+ cp = add(",\n\t", cp);
+ } else {
+ cp = add("\t", cp);
}
- p->p_value = add (lp, cp);
}
- free (lp);
- break;
+ p->p_value = add(lp, cp);
}
+ free(lp);
+ break;
}
- if (p->p_name == NULL && i < NVEC) {
- p->p_name = getcpy (name);
- p->p_value = lp;
- p->p_flags = P_NIL;
- p++, i++;
- p->p_name = NULL;
- }
- if (state != FLDEOF)
- continue;
- break;
+ }
+ if (p->p_name == NULL && i < NVEC) {
+ p->p_name = getcpy(name);
+ p->p_value = lp;
+ p->p_flags = P_NIL;
+ p++, i++;
+ p->p_name = NULL;
+ }
+ if (state != FLDEOF)
+ continue;
+ break;
- case BODY:
- case BODYEOF:
- case FILEEOF:
- break;
+ case BODY:
+ case BODYEOF:
+ case FILEEOF:
+ break;
- case LENERR:
- case FMTERR:
- advise (NULL, "format error in message");
- break;
+ case LENERR:
+ case FMTERR:
+ advise(NULL, "format error in message");
+ break;
- default:
- advise (NULL, "internal error in m_getfld");
- fclose (in);
- return -1;
+ default:
+ advise(NULL, "internal error in m_getfld");
+ fclose(in);
+ return -1;
}
break;
}
- fclose (in);
+ fclose(in);
- if ((p = lookup (vars, "reply-to"))) {
- if ((q = lookup (hdrs, "reply-to")) == NULL || q->p_value == NULL)
- q = lookup (hdrs, "from");
- p->p_value = getcpy (q ? q->p_value : "");
+ if ((p = lookup(vars, "reply-to"))) {
+ if ((q = lookup(hdrs, "reply-to")) == NULL ||
+ q->p_value == NULL)
+ q = lookup(hdrs, "from");
+ p->p_value = getcpy(q ? q->p_value : "");
p->p_flags &= ~P_CHK;
if (debug)
- debug_printf ("vars[%d]: name=\"%s\" value=\"%s\"\n",
+ debug_printf("vars[%d]: name=\"%s\" value=\"%s\"\n",
p - vars, p->p_name, trim(p->p_value));
}
if (debug) {
for (p = hdrs; p->p_name; p++)
- debug_printf ("hdrs[%d]: name=\"%s\" value=\"%s\"\n",
- p - hdrs, p->p_name, p->p_value ? trim(p->p_value) : "");
+ debug_printf("hdrs[%d]: name=\"%s\" value=\"%s\"\n",
+ p - hdrs, p->p_name,
+ p->p_value ? trim(p->p_value) : "");
}
return 0;
*/
static void
-expand (char *s1, char *s2, int fd)
+expand(char *s1, char *s2, int fd)
{
char c, *cp;
struct pair *p;
if (!globbed)
- glob (fd);
+ glob(fd);
while ((c = *s2++)) {
if (c != '$' || *s2 != LPAREN) {
continue;
}
*s2++ = 0;
- if ((p = lookup (vars, cp))) {
+ if ((p = lookup(vars, cp))) {
if (!parsed && (p->p_flags & P_CHK))
- parse (fd);
+ parse(fd);
- strcpy (s1, p->p_value);
- s1 += strlen (s1);
+ strcpy(s1, p->p_value);
+ s1 += strlen(s1);
}
}
}
*/
static void
-glob (int fd)
+glob(int fd)
{
char buffer[BUFSIZ];
struct stat st;
if (globbed++)
return;
- if ((p = lookup (vars, "sender")))
- p->p_value = getcpy (sender);
- if ((p = lookup (vars, "address")))
- p->p_value = getcpy (addr);
- if ((p = lookup (vars, "size"))) {
- snprintf (buffer, sizeof(buffer), "%d",
- fstat (fd, &st) != -1 ? (int) st.st_size : 0);
- p->p_value = getcpy (buffer);
+ if ((p = lookup(vars, "sender")))
+ p->p_value = getcpy(sender);
+ if ((p = lookup(vars, "address")))
+ p->p_value = getcpy(addr);
+ if ((p = lookup(vars, "size"))) {
+ snprintf(buffer, sizeof(buffer), "%d",
+ fstat(fd, &st) != -1 ? (int) st.st_size : 0);
+ p->p_value = getcpy(buffer);
}
- if ((p = lookup (vars, "info")))
- p->p_value = getcpy (info);
+ if ((p = lookup(vars, "info")))
+ p->p_value = getcpy(info);
if (debug) {
for (p = vars; p->p_name; p++)
- debug_printf ("vars[%d]: name=\"%s\" value=\"%s\"\n",
+ debug_printf("vars[%d]: name=\"%s\" value=\"%s\"\n",
p - vars, p->p_name, trim(p->p_value));
}
}
*/
static struct pair *
-lookup (struct pair *pairs, char *key)
+lookup(struct pair *pairs, char *key)
{
for (; pairs->p_name; pairs++)
- if (!mh_strcasecmp (pairs->p_name, key))
+ if (!mh_strcasecmp(pairs->p_name, key))
return pairs;
return NULL;
#ifdef HAVE_GETUTENT
static int
-logged_in (void)
+logged_in(void)
{
struct utmp * utp;
utp->ut_type == USER_PROCESS &&
#endif
utp->ut_name[0] != 0 &&
- strncmp (user, utp->ut_name,
+ strncmp(user, utp->ut_name,
sizeof(utp->ut_name)) == 0) {
if (debug)
continue;
}
#else
static int
-logged_in (void)
+logged_in(void)
{
struct utmp ut;
FILE *uf;
if (utmped)
return utmped;
- if ((uf = fopen (UTMP_FILE, "r")) == NULL)
+ if ((uf = fopen(UTMP_FILE, "r")) == NULL)
return NOTOK;
- while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1) {
+ while (fread((char *) &ut, sizeof(ut), 1, uf) == 1) {
if (ut.ut_name[0] != 0 &&
- strncmp (user, ut.ut_name, sizeof(ut.ut_name))
+ strncmp(user, ut.ut_name, sizeof(ut.ut_name))
== 0) {
if (debug)
continue;
- fclose (uf);
+ fclose(uf);
return (utmped = DONE);
}
}
- fclose (uf);
+ fclose(uf);
return (utmped = NOTOK);
}
#endif
#define cmpar(h1,m1,h2,m2) if (h1 < h2 || (h1 == h2 && m1 < m2)) return 0
static int
-timely (char *t1, char *t2)
+timely(char *t1, char *t2)
{
int t1hours, t1mins, t2hours, t2mins;
- if (sscanf (t1, "%d:%d", &t1hours, &t1mins) != 2)
+ if (sscanf(t1, "%d:%d", &t1hours, &t1mins) != 2)
return -1;
- check (t1hours, 0, 23);
- check (t1mins, 0, 59);
+ check(t1hours, 0, 23);
+ check(t1mins, 0, 59);
- if (sscanf (t2, "%d:%d", &t2hours, &t2mins) != 2)
+ if (sscanf(t2, "%d:%d", &t2hours, &t2mins) != 2)
return -1;
- check (t2hours, 0, 23);
- check (t2mins, 0, 59);
+ check(t2hours, 0, 23);
+ check(t2mins, 0, 59);
- cmpar (now->tw_hour, now->tw_min, t1hours, t1mins);
- cmpar (t2hours, t2mins, now->tw_hour, now->tw_min);
+ cmpar(now->tw_hour, now->tw_min, t1hours, t1mins);
+ cmpar(t2hours, t2mins, now->tw_hour, now->tw_min);
return -1;
}
*/
static int
-usr_file (int fd, char *mailbox, int mbx_style)
+usr_file(int fd, char *mailbox, int mbx_style)
{
int md, mapping;
if (verbose)
- verbose_printf ("delivering to file \"%s\"", mailbox);
+ verbose_printf("delivering to file \"%s\"", mailbox);
if (mbx_style == MBOX_FORMAT) {
if (verbose)
- verbose_printf (" (mbox style)");
+ verbose_printf(" (mbox style)");
mapping = 0;
} else {
if (verbose)
- verbose_printf (" (mmdf style)");
+ verbose_printf(" (mmdf style)");
mapping = 1;
}
/* open and lock the file */
- if ((md = mbx_open (mailbox, mbx_style, pw->pw_uid, pw->pw_gid,
+ if ((md = mbx_open(mailbox, mbx_style, pw->pw_uid, pw->pw_gid,
m_gmprot())) == -1) {
if (verbose)
- adorn ("", "unable to open:");
+ adorn("", "unable to open:");
return -1;
}
- lseek (fd, (off_t) 0, SEEK_SET);
+ lseek(fd, (off_t) 0, SEEK_SET);
/* append message to file */
- if (mbx_copy (mailbox, mbx_style, md, fd, mapping, NULL, verbose)
+ if (mbx_copy(mailbox, mbx_style, md, fd, mapping, NULL, verbose)
== -1) {
if (verbose)
- adorn ("", "error writing to:");
+ adorn("", "error writing to:");
return -1;
}
/* close and unlock file */
- if (mbx_close (mailbox, md) == NOTOK) {
+ if (mbx_close(mailbox, md) == NOTOK) {
if (verbose)
- adorn ("", "error closing:");
+ adorn("", "error closing:");
return -1;
}
if (verbose)
- verbose_printf (", success.\n");
+ verbose_printf(", success.\n");
return 0;
}
*/
static int
-usr_folder (int fd, char *string)
+usr_folder(int fd, char *string)
{
int status;
char folder[BUFSIZ], *vec[3];
snprintf(folder, sizeof(folder), "+%s", string);
if (verbose)
- verbose_printf ("delivering to folder \"%s\"", folder + 1);
+ verbose_printf("delivering to folder \"%s\"", folder + 1);
vec[0] = "rcvstore";
vec[1] = folder;
vec[2] = NULL;
/* use rcvstore to put message in folder */
- status = usr_pipe (fd, "rcvstore", rcvstoreproc, vec, 1);
+ status = usr_pipe(fd, "rcvstore", rcvstoreproc, vec, 1);
#if 0
/*
*/
if (verbose) {
if (status == 0)
- verbose_printf (", success.\n");
+ verbose_printf(", success.\n");
else
- verbose_printf (", failed.\n");
+ verbose_printf(", failed.\n");
}
#endif
*/
static int
-usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
+usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
{
pid_t child_id;
int i, bytes, seconds, status;
struct stat st;
if (verbose && !suppress)
- verbose_printf ("delivering to pipe \"%s\"", cmd);
+ verbose_printf("delivering to pipe \"%s\"", cmd);
- lseek (fd, (off_t) 0, SEEK_SET);
+ lseek(fd, (off_t) 0, SEEK_SET);
for (i = 0; (child_id = fork()) == -1 && i < 5; i++)
- sleep (5);
+ sleep(5);
switch (child_id) {
- case -1:
- /* fork error */
- if (verbose)
- adorn ("fork", "unable to");
- return -1;
+ case -1:
+ /* fork error */
+ if (verbose)
+ adorn("fork", "unable to");
+ return -1;
- case 0:
- /* child process */
- if (fd != 0)
- dup2 (fd, 0);
- freopen ("/dev/null", "w", stdout);
- freopen ("/dev/null", "w", stderr);
- if (fd != 3)
- dup2 (fd, 3);
- closefds (4);
+ case 0:
+ /* child process */
+ if (fd != 0)
+ dup2(fd, 0);
+ freopen("/dev/null", "w", stdout);
+ freopen("/dev/null", "w", stderr);
+ if (fd != 3)
+ dup2(fd, 3);
+ closefds(4);
#ifdef TIOCNOTTY
- if ((fd = open ("/dev/tty", O_RDWR)) != -1) {
- ioctl (fd, TIOCNOTTY, NULL);
- close (fd);
- }
+ if ((fd = open("/dev/tty", O_RDWR)) != -1) {
+ ioctl(fd, TIOCNOTTY, NULL);
+ close(fd);
+ }
#endif /* TIOCNOTTY */
- /* put in own process group */
- setpgid ((pid_t) 0, getpid ());
+ /* put in own process group */
+ setpgid((pid_t) 0, getpid());
- *environ = NULL;
- m_putenv ("USER", pw->pw_name);
- m_putenv ("HOME", pw->pw_dir);
- m_putenv ("SHELL", pw->pw_shell);
+ *environ = NULL;
+ m_putenv("USER", pw->pw_name);
+ m_putenv("HOME", pw->pw_dir);
+ m_putenv("SHELL", pw->pw_shell);
- execvp (pgm, vec);
- _exit (-1);
+ execvp(pgm, vec);
+ _exit(-1);
- default:
- /* parent process */
- if (!setjmp (myctx)) {
- SIGNAL (SIGALRM, alrmser);
- bytes = fstat (fd, &st) != -1 ?
- (int) st.st_size : 100;
-
- /*
- ** amount of time to wait depends on
- ** message size
- */
- if (bytes <= 100) {
- /* give at least 5 minutes */
- seconds = 300;
- } else if (bytes >= 90000) {
- /* a half hour is long enough */
- seconds = 1800;
- } else {
- seconds = (bytes / 60) + 300;
- }
- alarm ((unsigned int) seconds);
- status = pidwait (child_id, 0);
- alarm (0);
+ default:
+ /* parent process */
+ if (!setjmp(myctx)) {
+ SIGNAL(SIGALRM, alrmser);
+ bytes = fstat(fd, &st) != -1 ?
+ (int) st.st_size : 100;
- if (verbose) {
- if (status == 0)
- verbose_printf (", success.\n");
- else
- if ((status & 0xff00) == 0xff00)
- verbose_printf (", system error\n");
- else
- pidstatus (status, stdout, ", failed");
- }
- return (status == 0 ? 0 : -1);
+ /*
+ ** amount of time to wait depends on
+ ** message size
+ */
+ if (bytes <= 100) {
+ /* give at least 5 minutes */
+ seconds = 300;
+ } else if (bytes >= 90000) {
+ /* a half hour is long enough */
+ seconds = 1800;
} else {
- /*
- ** Ruthlessly kill the child and anything
- ** else in its process group.
- */
- KILLPG(child_id, SIGKILL);
- if (verbose)
- verbose_printf (", timed-out; terminated\n");
- return -1;
+ seconds = (bytes / 60) + 300;
}
+ alarm((unsigned int) seconds);
+ status = pidwait(child_id, 0);
+ alarm(0);
+
+ if (verbose) {
+ if (status == 0)
+ verbose_printf(", success.\n");
+ else
+ if ((status & 0xff00) == 0xff00)
+ verbose_printf(", system error\n");
+ else
+ pidstatus(status, stdout, ", failed");
+ }
+ return (status == 0 ? 0 : -1);
+ } else {
+ /*
+ ** Ruthlessly kill the child and anything
+ ** else in its process group.
+ */
+ KILLPG(child_id, SIGKILL);
+ if (verbose)
+ verbose_printf(", timed-out; terminated\n");
+ return -1;
+ }
}
}
static RETSIGTYPE
-alrmser (int i)
+alrmser(int i)
{
#ifndef RELIABLE_SIGNALS
- SIGNAL (SIGALRM, alrmser);
+ SIGNAL(SIGALRM, alrmser);
#endif
- longjmp (myctx, DONE);
+ longjmp(myctx, DONE);
}
*/
static void
-get_sender (char *envelope, char **sender)
+get_sender(char *envelope, char **sender)
{
int i;
unsigned char *cp;
unsigned char buffer[BUFSIZ];
if (envelope == NULL) {
- *sender = getcpy ("");
+ *sender = getcpy("");
return;
}
- i = strlen ("From ");
- strncpy (buffer, envelope + i, sizeof(buffer));
+ i = strlen("From ");
+ strncpy(buffer, envelope + i, sizeof(buffer));
if ((cp = strchr(buffer, '\n'))) {
*cp = 0;
cp -= 24;
}
*cp = 0;
- for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--)
- if (isspace (*cp))
+ for (cp = buffer + strlen(buffer) - 1; cp >= buffer; cp--)
+ if (isspace(*cp))
*cp = 0;
else
break;
- *sender = getcpy (buffer);
+ *sender = getcpy(buffer);
}
*/
static int
-copy_message (int qd, char *tmpfil, int fold)
+copy_message(int qd, char *tmpfil, int fold)
{
int i, first = 1, fd1, fd2;
char buffer[BUFSIZ];
tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
if (tfile == NULL) return -1;
fchmod(fd1, 0600);
- strncpy (tmpfil, tfile, BUFSIZ);
+ strncpy(tmpfil, tfile, BUFSIZ);
if (!fold) {
- while ((i = read (qd, buffer, sizeof(buffer))) > 0)
- if (write (fd1, buffer, i) != i) {
+ while ((i = read(qd, buffer, sizeof(buffer))) > 0)
+ if (write(fd1, buffer, i) != i) {
you_lose:
- close (fd1);
- unlink (tmpfil);
+ close(fd1);
+ unlink(tmpfil);
return -1;
}
if (i == -1)
goto you_lose;
- lseek (fd1, (off_t) 0, SEEK_SET);
+ lseek(fd1, (off_t) 0, SEEK_SET);
return fd1;
}
/* dup the fd for incoming message */
- if ((fd2 = dup (qd)) == -1) {
- close (fd1);
+ if ((fd2 = dup(qd)) == -1) {
+ close(fd1);
return -1;
}
/* now create a FILE pointer for it */
- if ((qfp = fdopen (fd2, "r")) == NULL) {
- close (fd1);
- close (fd2);
+ if ((qfp = fdopen(fd2, "r")) == NULL) {
+ close(fd1);
+ close(fd2);
return -1;
}
/* dup the fd for temporary file */
- if ((fd2 = dup (fd1)) == -1) {
- close (fd1);
- fclose (qfp);
+ if ((fd2 = dup(fd1)) == -1) {
+ close(fd1);
+ fclose(qfp);
return -1;
}
/* now create a FILE pointer for it */
- if ((ffp = fdopen (fd2, "r+")) == NULL) {
- close (fd1);
- close (fd2);
- fclose (qfp);
+ if ((ffp = fdopen(fd2, "r+")) == NULL) {
+ close(fd1);
+ close(fd2);
+ fclose(qfp);
return -1;
}
** and massage the headers. Save
** a copy of the "From " line for later.
*/
- i = strlen ("From ");
- while (fgets (buffer, sizeof(buffer), qfp)) {
+ i = strlen("From ");
+ while (fgets(buffer, sizeof(buffer), qfp)) {
if (first) {
first = 0;
- if (!strncmp (buffer, "From ", i)) {
+ if (strncmp(buffer, "From ", i)==0) {
#ifdef RPATHS
char *fp, *cp, *hp, *ep;
#endif
** get copy of envelope information
** ("From " line)
*/
- envelope = getcpy (buffer);
+ envelope = getcpy(buffer);
#if 0
/*
** First go ahead and put "From " line
** in message
*/
- fputs (buffer, ffp);
- if (ferror (ffp))
+ fputs(buffer, ffp);
+ if (ferror(ffp))
goto fputs_error;
#endif
*/
hp = cp = strchr(fp = envelope + i, ' ');
while ((hp = strchr(++hp, 'r')))
- if (uprf (hp, "remote from")) {
+ if (uprf(hp, "remote from")) {
hp = strrchr(hp, ' ');
break;
}
** addressing
*/
ep = strchr(++hp, '\n');
- snprintf (buffer, sizeof(buffer), "Return-Path: %.*s!%.*s\n", (int)(ep - hp), hp, (int)(cp - fp), fp);
+ snprintf(buffer, sizeof(buffer), "Return-Path: %.*s!%.*s\n", (int)(ep - hp), hp, (int)(cp - fp), fp);
} else {
/*
** return path for standard domain
** addressing
*/
- snprintf (buffer, sizeof(buffer), "Return-Path: %.*s\n", (int)(cp - fp), fp);
+ snprintf(buffer, sizeof(buffer), "Return-Path: %.*s\n", (int)(cp - fp), fp);
}
/* Add Return-Path header to message */
- fputs (buffer, ffp);
- if (ferror (ffp))
+ fputs(buffer, ffp);
+ if (ferror(ffp))
goto fputs_error;
#endif
/* Put the delivery date in message */
- fputs (ddate, ffp);
- if (ferror (ffp))
+ fputs(ddate, ffp);
+ if (ferror(ffp))
goto fputs_error;
continue;
}
}
- fputs (buffer, ffp);
- if (ferror (ffp))
+ fputs(buffer, ffp);
+ if (ferror(ffp))
goto fputs_error;
}
- fclose (ffp);
- if (ferror (qfp)) {
- close (fd1);
- fclose (qfp);
+ fclose(ffp);
+ if (ferror(qfp)) {
+ close(fd1);
+ fclose(qfp);
return -1;
}
- fclose (qfp);
- lseek (fd1, (off_t) 0, SEEK_SET);
+ fclose(qfp);
+ lseek(fd1, (off_t) 0, SEEK_SET);
return fd1;
fputs_error:
- close (fd1);
- fclose (ffp);
- fclose (qfp);
+ close(fd1);
+ fclose(ffp);
+ fclose(qfp);
return -1;
}
*/
static char *
-trim (char *cp)
+trim(char *cp)
{
char buffer[BUFSIZ*4];
unsigned char *bp, *sp;
return NULL;
/* copy string into temp buffer */
- strncpy (buffer, cp, sizeof(buffer));
+ strncpy(buffer, cp, sizeof(buffer));
bp = buffer;
/* skip over leading whitespace */
*/
static void
-verbose_printf (char *fmt, ...)
+verbose_printf(char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- vfprintf (stdout, fmt, ap);
+ vfprintf(stdout, fmt, ap);
va_end(ap);
- fflush (stdout); /* now flush output */
+ fflush(stdout); /* now flush output */
}
*/
static void
-adorn (char *what, char *fmt, ...)
+adorn(char *what, char *fmt, ...)
{
va_list ap;
int eindex;
char *s;
eindex = errno; /* save the errno */
- fprintf (stdout, ", ");
+ fprintf(stdout, ", ");
va_start(ap, fmt);
- vfprintf (stdout, fmt, ap);
+ vfprintf(stdout, fmt, ap);
va_end(ap);
if (what) {
if (*what)
- fprintf (stdout, " %s: ", what);
- if ((s = strerror (eindex)))
- fprintf (stdout, "%s", s);
+ fprintf(stdout, " %s: ", what);
+ if ((s = strerror(eindex)))
+ fprintf(stdout, "%s", s);
else
- fprintf (stdout, "Error %d", eindex);
+ fprintf(stdout, "Error %d", eindex);
}
- fputc ('\n', stdout);
- fflush (stdout);
+ fputc('\n', stdout);
+ fflush(stdout);
}
*/
static void
-debug_printf (char *fmt, ...)
+debug_printf(char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
- vfprintf (stderr, fmt, ap);
+ vfprintf(stderr, fmt, ap);
va_end(ap);
}
** Message-Id of this message to the ndbm/db file.
*/
static int
-suppress_duplicates (int fd, char *file)
+suppress_duplicates(int fd, char *file)
{
int fd1, lockfd, state, result;
char *cp, buf[BUFSIZ], name[NAMESZ];
DBM *db;
FILE *in;
- if ((fd1 = dup (fd)) == -1)
+ if ((fd1 = dup(fd)) == -1)
return -1;
- if (!(in = fdopen (fd1, "r"))) {
- close (fd1);
+ if (!(in = fdopen(fd1, "r"))) {
+ close(fd1);
return -1;
}
- rewind (in);
+ rewind(in);
for (state = FLD;;) {
- state = m_getfld (state, name, buf, sizeof(buf), in);
+ state = m_getfld(state, name, buf, sizeof(buf), in);
switch (state) {
- case FLD:
- case FLDPLUS:
- case FLDEOF:
- /* Search for the message ID */
- if (mh_strcasecmp (name, "Message-ID")) {
- while (state == FLDPLUS)
- state = m_getfld (state, name, buf, sizeof(buf), in);
- continue;
- }
+ case FLD:
+ case FLDPLUS:
+ case FLDEOF:
+ /* Search for the message ID */
+ if (mh_strcasecmp(name, "Message-ID")) {
+ while (state == FLDPLUS)
+ state = m_getfld(state, name, buf,
+ sizeof(buf), in);
+ continue;
+ }
- cp = add (buf, NULL);
- while (state == FLDPLUS) {
- state = m_getfld (state, name, buf, sizeof(buf), in);
- cp = add (buf, cp);
- }
- key.dptr = trimcpy (cp);
- key.dsize = strlen (key.dptr) + 1;
- free (cp);
- cp = key.dptr;
-
- if (!(db = dbm_open (file, O_RDWR | O_CREAT, 0600))) {
- advise (file, "unable to perform dbm_open on");
- free (cp);
- fclose (in);
- return -1;
- }
- /*
- ** Since it is difficult to portable
- ** lock a ndbm file, we will open and
- ** lock the Maildelivery file instead.
- ** This will fail if your Maildelivery
- ** file doesn't exist.
- */
- if ((lockfd = lkopen(file, O_RDWR, 0)) == -1) {
- advise (file, "unable to perform file locking on");
- free (cp);
- fclose (in);
- return -1;
- }
- value = dbm_fetch (db, key);
- if (value.dptr) {
- if (verbose)
- verbose_printf ("Message-ID: %s\n already received on %s", cp, value.dptr);
- result = DONE;
- } else {
- value.dptr = ddate + sizeof("Delivery-Date:");
- value.dsize = strlen(value.dptr) + 1;
- if (dbm_store (db, key, value, DBM_INSERT))
- advise (file, "possibly corrupt file");
- result = 0;
- }
+ cp = getcpy(buf);
+ while (state == FLDPLUS) {
+ state = m_getfld(state, name, buf,
+ sizeof(buf), in);
+ cp = add(buf, cp);
+ }
+ key.dptr = trimcpy(cp);
+ key.dsize = strlen(key.dptr) + 1;
+ free(cp);
+ cp = key.dptr;
+
+ if (!(db = dbm_open(file, O_RDWR | O_CREAT, 0600))) {
+ advise(file, "unable to perform dbm_open on");
+ free(cp);
+ fclose(in);
+ return -1;
+ }
+ /*
+ ** Since it is difficult to portable lock a ndbm
+ ** file, we will open and lock the Maildelivery
+ ** file instead. This will fail if your Maildelivery
+ ** file doesn't exist.
+ */
+ if ((lockfd = lkopen(file, O_RDWR, 0)) == -1) {
+ advise(file, "unable to perform file locking on");
+ free(cp);
+ fclose(in);
+ return -1;
+ }
+ value = dbm_fetch(db, key);
+ if (value.dptr) {
+ if (verbose)
+ verbose_printf("Message-ID: %s\n already received on %s", cp, value.dptr);
+ result = DONE;
+ } else {
+ value.dptr = ddate + sizeof("Delivery-Date:");
+ value.dsize = strlen(value.dptr) + 1;
+ if (dbm_store(db, key, value, DBM_INSERT))
+ advise(file, "possibly corrupt file");
+ result = 0;
+ }
- dbm_close (db);
- lkclose(lockfd, file);
- free (cp);
- fclose (in);
- return result;
- break;
+ dbm_close(db);
+ lkclose(lockfd, file);
+ free(cp);
+ fclose(in);
+ return result;
+ break;
- case BODY:
- case BODYEOF:
- case FILEEOF:
- break;
+ case BODY:
+ case BODYEOF:
+ case FILEEOF:
+ break;
- case LENERR:
- case FMTERR:
- default:
- break;
+ case LENERR:
+ case FMTERR:
+ default:
+ break;
}
break;
}
- fclose (in);
+ fclose(in);
return 0;
}