X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a3a6236ccbaf3c979785e624726a42ddd7a2141c..a3724ed3:/uip/slocal.c?ds=inline diff --git a/uip/slocal.c b/uip/slocal.c index 55e2f7fc..97897ad1 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -1,6 +1,4 @@ - -/* - * slocal.c -- asynchronously filter and deliver new mail +/* slocal.c -- asynchronously filter and deliver new mail * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -29,6 +27,8 @@ #include #include #include +#include "../sbr/lock_file.h" +#include "../sbr/m_mktemp.h" #include #include @@ -452,7 +452,7 @@ usr_delivery (int fd, char *delivery, int su) if (*buffer == '#' || *buffer == '\n') continue; - TrimSuffixC(buffer, '\n'); + trim_suffix_c(buffer, '\n'); /* split buffer into fields */ vecp = split (buffer, vec); @@ -484,7 +484,8 @@ usr_delivery (int fd, char *delivery, int su) * do this - else fall through */ if (!next) - continue; /* else fall */ + continue; + /* FALLTHRU */ case '?': /* @@ -492,7 +493,8 @@ usr_delivery (int fd, char *delivery, int su) * consider delivered if action is successful. */ if (won) - continue; /* else fall */ + continue; + /* FALLTHRU */ case 'A': case 'a': @@ -538,7 +540,8 @@ usr_delivery (int fd, char *delivery, int su) if (won) continue; break; - } /* else fall */ + } + /* FALLTHRU */ default: /* parse message and build lookup table */ @@ -565,7 +568,8 @@ usr_delivery (int fd, char *delivery, int su) case 'q': /* deliver to quoted pipe */ if (strcasecmp (action, "qpipe")) - continue; /* else fall */ + continue; + /* FALLTHRU */ case '^': expand (tmpbuf, string, fd); if (split (tmpbuf, vec) < 1) @@ -576,7 +580,8 @@ usr_delivery (int fd, char *delivery, int su) case 'p': /* deliver to pipe */ if (strcasecmp (action, "pipe")) - continue; /* else fall */ + continue; + /* FALLTHRU */ case '|': vec[2] = "sh"; vec[3] = "-c"; @@ -594,7 +599,8 @@ usr_delivery (int fd, char *delivery, int su) } /* deliver to nmh folder */ else if (strcasecmp (action, "folder")) - continue; /* else fall */ + continue; + /* FALLTHRU */ case '+': status = usr_folder (fd, string); break; @@ -607,7 +613,8 @@ usr_delivery (int fd, char *delivery, int su) } /* mbox format */ else if (strcasecmp (action, "mbox")) - continue; /* else fall */ + continue; + /* FALLTHRU */ case '>': /* mbox format */ @@ -703,7 +710,7 @@ parse (int fd) int i, state; int fd1; char *cp, *dp, *lp; - char name[NAMESZ], field[BUFSIZ]; + char name[NAMESZ], field[NMH_BUFSIZ]; struct pair *p, *q; FILE *in; m_getfld_state_t gstate = 0; @@ -735,7 +742,7 @@ parse (int fd) switch (state = m_getfld (&gstate, name, field, &fieldsz, in)) { case FLD: case FLDPLUS: - lp = add (field, NULL); + lp = mh_xstrdup(field); while (state == FLDPLUS) { fieldsz = sizeof field; state = m_getfld (&gstate, name, field, &fieldsz, in); @@ -775,11 +782,11 @@ parse (int fd) case LENERR: case FMTERR: - advise (NULL, "format error in message"); + inform("format error in message"); break; default: - advise (NULL, "internal error in m_getfld"); + inform("internal error in m_getfld"); fclose (in); return -1; } @@ -964,19 +971,11 @@ timely (char *t1, char *t2) static int usr_file (int fd, char *mailbox, int mbx_style) { - int md, mapping; - - if (verbose) - verbose_printf ("delivering to file \"%s\"", mailbox); + int md; - if (mbx_style == MBOX_FORMAT) { - if (verbose) - verbose_printf (" (mbox style)"); - mapping = 0; - } else { - if (verbose) - verbose_printf (" (mmdf style)"); - mapping = 1; + if (verbose) { + verbose_printf("delivering to file \"%s\" (%s style)", mailbox, + mbx_style == MBOX_FORMAT ? "mbox" : "mmdf"); } /* open and lock the file */ @@ -986,10 +985,10 @@ usr_file (int fd, char *mailbox, int mbx_style) return -1; } - lseek (fd, (off_t) 0, SEEK_SET); + lseek(fd, 0, SEEK_SET); /* append message to file */ - if (mbx_copy (mailbox, mbx_style, md, fd, mapping, NULL, verbose) == -1) { + if (mbx_copy (mailbox, mbx_style, md, fd, NULL) == -1) { if (verbose) adorn ("", "error writing to:"); return -1; @@ -1052,7 +1051,7 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress) if (verbose && !suppress) verbose_printf ("delivering to pipe \"%s\"", cmd); - lseek (fd, (off_t) 0, SEEK_SET); + lseek(fd, 0, SEEK_SET); for (i = 0; (child_id = fork()) == -1 && i < 5; i++) sleep (5); @@ -1088,9 +1087,9 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress) setpgid ((pid_t) 0, getpid ()); /* put in own process group */ *environ = NULL; - m_putenv ("USER", pw->pw_name); - m_putenv ("HOME", pw->pw_dir); - m_putenv ("SHELL", pw->pw_shell); + setenv("USER", pw->pw_name, 1); + setenv("HOME", pw->pw_dir, 1); + setenv("SHELL", pw->pw_shell, 1); execvp (pgm, vec); _exit (-1); @@ -1213,7 +1212,7 @@ you_lose: } if (i == -1) goto you_lose; - lseek (fd1, (off_t) 0, SEEK_SET); + lseek(fd1, 0, SEEK_SET); return fd1; } @@ -1253,7 +1252,7 @@ you_lose: while (fgets (buffer, sizeof(buffer), qfp)) { if (first) { first = 0; - if (HasPrefix(buffer, "From ")) { + if (has_prefix(buffer, "From ")) { /* get copy of envelope information ("From " line) */ envelope = mh_xstrdup(buffer); @@ -1278,7 +1277,7 @@ you_lose: return -1; } fclose (qfp); - lseek (fd1, (off_t) 0, SEEK_SET); + lseek(fd1, 0, SEEK_SET); return fd1; @@ -1337,7 +1336,7 @@ verbose_printf (char *fmt, ...) va_list ap; va_start(ap, fmt); - vfprintf (stdout, fmt, ap); + vprintf(fmt, ap); va_end(ap); fflush (stdout); /* now flush output */ @@ -1357,22 +1356,22 @@ adorn (char *what, char *fmt, ...) char *s; eindex = errno; /* save the errno */ - fprintf (stdout, ", "); + printf(", "); va_start(ap, fmt); - vfprintf (stdout, fmt, ap); + vprintf(fmt, ap); va_end(ap); if (what) { if (*what) - fprintf (stdout, " %s: ", what); + printf(" %s: ", what); if ((s = strerror (eindex))) - fprintf (stdout, "%s", s); + fputs(s, stdout); else - fprintf (stdout, "Error %d", eindex); + printf("Error %d", eindex); } - fputc ('\n', stdout); + putchar('\n'); fflush (stdout); } @@ -1402,7 +1401,7 @@ static int suppress_duplicates (int fd, char *file) { int fd1, lockfd, state, result; - char *cp, buf[BUFSIZ], name[NAMESZ]; + char *cp, buf[NMH_BUFSIZ], name[NAMESZ]; datum key, value; DBM *db; FILE *in; @@ -1432,7 +1431,7 @@ suppress_duplicates (int fd, char *file) continue; } - cp = add (buf, NULL); + cp = mh_xstrdup(buf); while (state == FLDPLUS) { bufsz = sizeof buf; state = m_getfld (&gstate, name, buf, &bufsz, in);