Changed failure exit status of mkstemp(1) from 255 to 1.

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 1c30dfc528a48697acf29318aa04dc1c6efe5cba..b249dc4b7ede3819bda2a99dd2c813003c40a206 100644 (file)
--- 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
  *
  * 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,9 +27,10 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>

+#include "../sbr/lock_file.h"
+#include "../sbr/m_mktemp.h"

 
 #include <pwd.h>
 
 #include <pwd.h>

-#include <signal.h>

 #include <sys/ioctl.h>
 #include <fcntl.h>
 
 #include <sys/ioctl.h>
 #include <fcntl.h>
 


@@ -184,21 +183,14 @@ int
 main (int argc, char **argv)
 {
     int fd, status;
 main (int argc, char **argv)
 {
     int fd, status;

-    FILE *fp = stdin;
+    FILE *fp;

     char *cp, *mdlvr = NULL, buf[BUFSIZ];
     char mailbox[BUFSIZ], tmpfil[BUFSIZ];
     char **argp, **arguments;
 
     char *cp, *mdlvr = NULL, buf[BUFSIZ];
     char mailbox[BUFSIZ], tmpfil[BUFSIZ];
     char **argp, **arguments;
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (*argv, '/');
-
-    /* foil search of user profile/context */
-    if (context_foil (NULL) == -1)
-       done (1);
+    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }

 
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
 


@@ -281,21 +273,28 @@ main (int argc, char **argv)
 
     if (addr == NULL)
        addr = getusername ();
 
     if (addr == NULL)
        addr = getusername ();

-    if (user == NULL)
-       user = (cp = strchr(addr, '.')) ? ++cp : addr;
+    if (user == NULL) {
+       user = getusername ();
+    }

     if ((pw = getpwnam (user)) == NULL)
        adios (NULL, "no such local user as %s", user);
 
     if (chdir (pw->pw_dir) == -1)
     if ((pw = getpwnam (user)) == NULL)
        adios (NULL, "no such local user as %s", user);
 
     if (chdir (pw->pw_dir) == -1)

-       chdir ("/");
+       if (chdir ("/") < 0) {
+           advise ("/", "chdir");
+       }

     umask (0077);
 
     if (geteuid() == 0) {
     umask (0077);
 
     if (geteuid() == 0) {

-       setgid (pw->pw_gid);
+       if (setgid (pw->pw_gid) != 0) {
+           adios ("setgid", "unable to set group to %ld", (long) pw->pw_gid);
+       }

        initgroups (pw->pw_name, pw->pw_gid);
        initgroups (pw->pw_name, pw->pw_gid);

-       setuid (pw->pw_uid);
+       if (setuid (pw->pw_uid) != 0) {
+           adios ("setuid", "unable to set user to %ld", (long) pw->pw_uid);
+       }

     }
     }

-    
+

     if (info == NULL)
        info = "";
 
     if (info == NULL)
        info = "";
 


@@ -318,14 +317,16 @@ main (int argc, char **argv)
        if (debug)
            debug_printf ("retrieving message from file \"%s\"\n", file);
        if ((fd = copy_message (tempfd, tmpfil, 1)) == -1)
        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");
+           adios(NULL, "unable to create temporary file in %s",
+                  get_temp_dir());

        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)
        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");
+           adios(NULL, "unable to create temporary file in %s",
+                  get_temp_dir());

     }
 
     if (debug)
     }
 
     if (debug)


@@ -342,7 +343,7 @@ main (int argc, char **argv)
        thing would be to delay this unlink() until later if debug == 1, but I'll
        leave that for someone who cares about the temp-file-accessing
        functionality (they'll have to watch out for cases where we adios()). */
        thing would be to delay this unlink() until later if debug == 1, but I'll
        leave that for someone who cares about the temp-file-accessing
        functionality (they'll have to watch out for cases where we adios()). */

-    unlink (tmpfil);
+    (void) m_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");


@@ -422,7 +423,7 @@ usr_delivery (int fd, char *delivery, int su)
     int i, accept, status=1, won, vecp, next;
     char *field, *pattern, *action, *result, *string;
     char buffer[BUFSIZ], tmpbuf[BUFSIZ];
     int i, accept, status=1, won, vecp, next;
     char *field, *pattern, *action, *result, *string;
     char buffer[BUFSIZ], tmpbuf[BUFSIZ];

-    char *cp, *vec[NVEC];
+    char *vec[NVEC];

     struct stat st;
     struct pair *p;
     FILE *fp;
     struct stat st;
     struct pair *p;
     FILE *fp;


@@ -451,9 +452,7 @@ usr_delivery (int fd, char *delivery, int su)
        if (*buffer == '#' || *buffer == '\n')
            continue;
 
        if (*buffer == '#' || *buffer == '\n')
            continue;
 

-       /* zap trailing newline */
-       if ((cp = strchr(buffer, '\n')))
-           *cp = 0;
+        trim_suffix_c(buffer, '\n');

 
        /* split buffer into fields */
        vecp = split (buffer, vec);
 
        /* split buffer into fields */
        vecp = split (buffer, vec);


@@ -485,7 +484,8 @@ usr_delivery (int fd, char *delivery, int su)
                 * do this - else fall through
                 */
                if (!next)
                 * do this - else fall through
                 */
                if (!next)

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

 
            case '?': 
                /*
 
            case '?': 
                /*


@@ -493,7 +493,8 @@ usr_delivery (int fd, char *delivery, int su)
                 * consider delivered if action is successful.
                 */
                if (won)
                 * consider delivered if action is successful.
                 */
                if (won)

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

 
            case 'A': 
            case 'a': 
 
            case 'A': 
            case 'a': 


@@ -516,7 +517,7 @@ usr_delivery (int fd, char *delivery, int su)
        }
 
        if (vecp > 5) {
        }
 
        if (vecp > 5) {

-           if (!mh_strcasecmp (vec[5], "select")) {
+           if (!strcasecmp (vec[5], "select")) {

                if (logged_in () != -1)
                    continue;
                if (vecp > 7 && timely (vec[6], vec[7]) == -1)
                if (logged_in () != -1)
                    continue;
                if (vecp > 7 && timely (vec[6], vec[7]) == -1)


@@ -535,11 +536,12 @@ usr_delivery (int fd, char *delivery, int su)
             * "default" matches only if the message hasn't
             * been delivered yet.
             */
             * "default" matches only if the message hasn't
             * been delivered yet.
             */

-               if (!mh_strcasecmp (field, "default")) {
+               if (!strcasecmp (field, "default")) {

                    if (won)
                        continue;
                    break;
                    if (won)
                        continue;
                    break;

-               }               /* else fall */
+               }
+               /* FALLTHRU */

 
            default: 
                /* parse message and build lookup table */
 
            default: 
                /* parse message and build lookup table */


@@ -565,8 +567,9 @@ usr_delivery (int fd, char *delivery, int su)
        switch (*action) {
            case 'q':
                /* deliver to quoted pipe */
        switch (*action) {
            case 'q':
                /* deliver to quoted pipe */

-               if (mh_strcasecmp (action, "qpipe"))
-                   continue;   /* else fall */
+               if (strcasecmp (action, "qpipe"))
+                   continue;
+               /* FALLTHRU */

            case '^':
                expand (tmpbuf, string, fd);
                if (split (tmpbuf, vec) < 1)
            case '^':
                expand (tmpbuf, string, fd);
                if (split (tmpbuf, vec) < 1)


@@ -576,8 +579,9 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'p': 
                /* deliver to pipe */
 
            case 'p': 
                /* deliver to pipe */

-               if (mh_strcasecmp (action, "pipe"))
-                   continue;   /* else fall */
+               if (strcasecmp (action, "pipe"))
+                   continue;
+               /* FALLTHRU */

            case '|': 
                vec[2] = "sh";
                vec[3] = "-c";
            case '|': 
                vec[2] = "sh";
                vec[3] = "-c";


@@ -589,26 +593,28 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'f': 
                /* mbox format */
 
            case 'f': 
                /* mbox format */

-               if (!mh_strcasecmp (action, "file")) {
+               if (!strcasecmp (action, "file")) {

                    status = usr_file (fd, string, MBOX_FORMAT);
                    break;
                }
                /* deliver to nmh folder */
                    status = usr_file (fd, string, MBOX_FORMAT);
                    break;
                }
                /* deliver to nmh folder */

-               else if (mh_strcasecmp (action, "folder"))
-                   continue;   /* else fall */
+               else if (strcasecmp (action, "folder"))
+                   continue;
+               /* FALLTHRU */

            case '+':
                status = usr_folder (fd, string);
                break;
 
            case 'm':
                /* mmdf format */
            case '+':
                status = usr_folder (fd, string);
                break;
 
            case 'm':
                /* mmdf format */

-               if (!mh_strcasecmp (action, "mmdf")) {
+               if (!strcasecmp (action, "mmdf")) {

                    status = usr_file (fd, string, MMDF_FORMAT);
                    break;
                }
                /* mbox format */
                    status = usr_file (fd, string, MMDF_FORMAT);
                    break;
                }
                /* mbox format */

-               else if (mh_strcasecmp (action, "mbox"))
-                   continue;   /* else fall */
+               else if (strcasecmp (action, "mbox"))
+                   continue;
+               /* FALLTHRU */

 
            case '>': 
                /* mbox format */
 
            case '>': 
                /* mbox format */


@@ -617,7 +623,7 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'd': 
                /* ignore message */
 
            case 'd': 
                /* ignore message */

-               if (mh_strcasecmp (action, "destroy"))
+               if (strcasecmp (action, "destroy"))

                    continue;
                status = 0;
                break;
                    continue;
                status = 0;
                break;


@@ -645,7 +651,7 @@ static int
 split (char *cp, char **vec)
 {
     int i;
 split (char *cp, char **vec)
 {
     int i;

-    unsigned char *s;
+    char *s;

 
     s = cp;
 
 
     s = cp;
 


@@ -654,7 +660,7 @@ split (char *cp, char **vec)
        vec[i] = NULL;
 
        /* zap any whitespace and comma's */
        vec[i] = NULL;
 
        /* zap any whitespace and comma's */

-       while (isspace (*s) || *s == ',')
+       while (isspace ((unsigned char) *s) || *s == ',')

            *s++ = 0;
 
        /* end of buffer, time to leave */
            *s++ = 0;
 
        /* end of buffer, time to leave */


@@ -684,7 +690,7 @@ split (char *cp, char **vec)
        vec[i++] = s++;
 
        /* move forward to next field delimiter */
        vec[i++] = s++;
 
        /* move forward to next field delimiter */

-       while (*s && !isspace (*s) && *s != ',')
+       while (*s && !isspace ((unsigned char) *s) && *s != ',')

            s++;
     }
     vec[i] = NULL;
            s++;
     }
     vec[i] = NULL;


@@ -704,9 +710,10 @@ parse (int fd)
     int i, state;
     int fd1;
     char *cp, *dp, *lp;
     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;
     struct pair *p, *q;
     FILE  *in;

+    m_getfld_state_t gstate;

 
     if (parsed++)
        return 0;
 
     if (parsed++)
        return 0;


@@ -730,18 +737,20 @@ parse (int fd)
      * Scan the headers of the message and build
      * a lookup table.
      */
      * 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), in)) {
+    gstate = m_getfld_state_init(in);
+    for (i = 0;;) {
+       int fieldsz = sizeof field;
+       switch (state = m_getfld2(&gstate, name, field, &fieldsz)) {

            case FLD: 
            case FLD: 

-           case FLDEOF: 

            case FLDPLUS: 
            case FLDPLUS: 

-               lp = add (field, NULL);
+               lp = mh_xstrdup(field);

                while (state == FLDPLUS) {
                while (state == FLDPLUS) {

-                   state = m_getfld (state, name, field, sizeof(field), in);
+                   fieldsz = sizeof field;
+                   state = m_getfld2(&gstate, name, field, &fieldsz);

                    lp = add (field, lp);
                }
                for (p = hdrs; p->p_name; p++) {
                    lp = add (field, lp);
                }
                for (p = hdrs; p->p_name; p++) {

-                   if (!mh_strcasecmp (p->p_name, name)) {
+                   if (!strcasecmp (p->p_name, name)) {

                        if (!(p->p_flags & P_HID)) {
                            if ((cp = p->p_value)) {
                                if (p->p_flags & P_ADR) {
                        if (!(p->p_flags & P_HID)) {
                            if ((cp = p->p_value)) {
                                if (p->p_flags & P_ADR) {


@@ -760,33 +769,31 @@ parse (int fd)
                    }
                }
                if (p->p_name == NULL && i < NVEC) {
                    }
                }
                if (p->p_name == NULL && i < NVEC) {

-                   p->p_name = getcpy (name);
+                   p->p_name = mh_xstrdup(name);

                    p->p_value = lp;
                    p->p_flags = P_NIL;
                    p++, i++;
                    p->p_name = NULL;
                }
                    p->p_value = lp;
                    p->p_flags = P_NIL;
                    p++, i++;
                    p->p_name = NULL;
                }

-               if (state != FLDEOF)
-                   continue;
-               break;
+               continue;

 
            case BODY: 
 
            case BODY: 

-           case BODYEOF: 

            case FILEEOF: 
                break;
 
            case LENERR: 
            case FMTERR: 
            case FILEEOF: 
                break;
 
            case LENERR: 
            case FMTERR: 

-               advise (NULL, "format error in message");
+               inform("format error in message");

                break;
 
            default: 
                break;
 
            default: 

-               advise (NULL, "internal error in m_getfld");
+               inform("internal error in m_getfld2");

                fclose (in);
                return -1;
        }
        break;
     }
                fclose (in);
                return -1;
        }
        break;
     }

+    m_getfld_state_destroy (&gstate);

     fclose (in);
 
     if ((p = lookup (vars, "reply-to"))) {
     fclose (in);
 
     if ((p = lookup (vars, "reply-to"))) {


@@ -873,7 +880,7 @@ glob (int fd)
     if ((p = lookup (vars, "size"))) {
        snprintf (buffer, sizeof(buffer), "%d",
                fstat (fd, &st) != -1 ? (int) st.st_size : 0);
     if ((p = lookup (vars, "size"))) {
        snprintf (buffer, sizeof(buffer), "%d",
                fstat (fd, &st) != -1 ? (int) st.st_size : 0);

-       p->p_value = getcpy (buffer);
+       p->p_value = mh_xstrdup(buffer);

     }
     if ((p = lookup (vars, "info")))
        p->p_value = getcpy (info);
     }
     if ((p = lookup (vars, "info")))
        p->p_value = getcpy (info);


@@ -895,7 +902,7 @@ static struct pair *
 lookup (struct pair *pairs, char *key)
 {
     for (; pairs->p_name; pairs++)
 lookup (struct pair *pairs, char *key)
 {
     for (; pairs->p_name; pairs++)

-       if (!mh_strcasecmp (pairs->p_name, key))
+       if (!strcasecmp (pairs->p_name, key))

            return pairs;
 
     return NULL;
            return pairs;
 
     return NULL;


@@ -965,19 +972,11 @@ timely (char *t1, char *t2)
 static int
 usr_file (int fd, char *mailbox, int mbx_style)
 {
 static int
 usr_file (int fd, char *mailbox, int mbx_style)
 {

-    int        md, mapping;
+    int        md;

 
 

-    if (verbose)
-       verbose_printf ("delivering to file \"%s\"", mailbox);
-
-    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 */
     }
 
     /* open and lock the file */


@@ -987,10 +986,10 @@ usr_file (int fd, char *mailbox, int mbx_style)
        return -1;
     }
 
        return -1;
     }
 

-    lseek (fd, (off_t) 0, SEEK_SET);
+    lseek(fd, 0, SEEK_SET);

 
     /* append message to file */
 
     /* 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;
        if (verbose)
            adorn ("", "error writing to:");
        return -1;


@@ -1043,8 +1042,9 @@ usr_folder (int fd, char *string)
  */
 
 static int
  */
 
 static int

-usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
+usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)

 {
 {

+    volatile int fd = fd_arg;

     pid_t child_id;
     int i, bytes, seconds, status;
     struct stat st;
     pid_t child_id;
     int i, bytes, seconds, status;
     struct stat st;


@@ -1052,7 +1052,7 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
     if (verbose && !suppress)
        verbose_printf ("delivering to pipe \"%s\"", cmd);
 
     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);
 
     for (i = 0; (child_id = fork()) == -1 && i < 5; i++)
        sleep (5);


@@ -1068,8 +1068,12 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
            /* child process */
            if (fd != 0)
                dup2 (fd, 0);
            /* child process */
            if (fd != 0)
                dup2 (fd, 0);

-           freopen ("/dev/null", "w", stdout);
-           freopen ("/dev/null", "w", stderr);
+           if (freopen ("/dev/null", "w", stdout) == NULL) {
+               advise ("stdout", "freopen");
+           }
+           if (freopen ("/dev/null", "w", stderr) == NULL) {
+               advise ("stderr", "freopen");
+           }

            if (fd != 3)
                dup2 (fd, 3);
            closefds (4);
            if (fd != 3)
                dup2 (fd, 3);
            closefds (4);


@@ -1084,9 +1088,9 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
            setpgid ((pid_t) 0, getpid ());     /* put in own process group */
 
            *environ = NULL;
            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);
 
            execvp (pgm, vec);
            _exit (-1);


@@ -1114,23 +1118,21 @@ usr_pipe (int fd, char *cmd, char *pgm, char **vec, int suppress)
                if (verbose) {
                    if (status == 0)
                        verbose_printf (", success.\n");
                if (verbose) {
                    if (status == 0)
                        verbose_printf (", success.\n");

-                   else
-                       if ((status & 0xff00) == 0xff00)
-                           verbose_printf (", system error\n");
-                       else
-                           pidstatus (status, stdout, ", failed");
+                   else if ((status & 0xff00) == 0xff00)
+                        verbose_printf (", system error\n");
+                    else
+                        pidstatus (status, stdout, ", failed");

                }
                return (status == 0 ? 0 : -1);
                }
                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;

            }
            }

+            /*
+             * 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;

     }
 }
 
     }
 }
 


@@ -1153,15 +1155,15 @@ static void
 get_sender (char *envelope, char **sender)
 {
     int i;
 get_sender (char *envelope, char **sender)
 {
     int i;

-    unsigned char *cp;
-    unsigned char buffer[BUFSIZ];
+    char *cp;
+    char buffer[BUFSIZ];

 
     if (envelope == NULL) {
 
     if (envelope == NULL) {

-       *sender = getcpy ("");
+       *sender = mh_xstrdup("");

        return;
     }
 
        return;
     }
 

-    i = strlen ("From ");
+    i = LEN("From ");

     strncpy (buffer, envelope + i, sizeof(buffer));
     if ((cp = strchr(buffer, '\n'))) {
        *cp = 0;
     strncpy (buffer, envelope + i, sizeof(buffer));
     if ((cp = strchr(buffer, '\n'))) {
        *cp = 0;


@@ -1174,11 +1176,11 @@ get_sender (char *envelope, char **sender)
     *cp = 0;
 
     for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--)
     *cp = 0;
 
     for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--)

-       if (isspace (*cp))
+       if (isspace ((unsigned char) *cp))

            *cp = 0;
        else
            break;
            *cp = 0;
        else
            break;

-    *sender = getcpy (buffer);
+    *sender = mh_xstrdup(buffer);

 }
 
 
 }
 
 


@@ -1198,7 +1200,6 @@ copy_message (int qd, char *tmpfil, int fold)
 
     tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
     if (tfile == NULL) return -1;
 
     tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
     if (tfile == NULL) return -1;

-    fchmod(fd1, 0600);

     strncpy (tmpfil, tfile, BUFSIZ);
 
     if (!fold) {
     strncpy (tmpfil, tfile, BUFSIZ);
 
     if (!fold) {


@@ -1206,12 +1207,12 @@ copy_message (int qd, char *tmpfil, int fold)
            if (write (fd1, buffer, i) != i) {
 you_lose:
                close (fd1);
            if (write (fd1, buffer, i) != i) {
 you_lose:
                close (fd1);

-               unlink (tmpfil);
+               (void) m_unlink (tmpfil);

                return -1;
            }
        if (i == -1)
            goto you_lose;
                return -1;
            }
        if (i == -1)
            goto you_lose;

-       lseek (fd1, (off_t) 0, SEEK_SET);
+       lseek(fd1, 0, SEEK_SET);

        return fd1;
     }
 
        return fd1;
     }
 


@@ -1248,13 +1249,12 @@ you_lose:
      * and massage the headers.  Save
      * a copy of the "From " line for later.
      */
      * and massage the headers.  Save
      * a copy of the "From " line for later.
      */

-    i = strlen ("From ");

     while (fgets (buffer, sizeof(buffer), qfp)) {
        if (first) {
            first = 0;
     while (fgets (buffer, sizeof(buffer), qfp)) {
        if (first) {
            first = 0;

-           if (!strncmp (buffer, "From ", i)) {
+           if (has_prefix(buffer, "From ")) {

                /* get copy of envelope information ("From " line) */
                /* get copy of envelope information ("From " line) */

-               envelope = getcpy (buffer);
+               envelope = mh_xstrdup(buffer);

 
                /* Put the delivery date in message */
                fputs (ddate, ffp);
 
                /* Put the delivery date in message */
                fputs (ddate, ffp);


@@ -1277,7 +1277,7 @@ you_lose:
        return -1;
     }
     fclose (qfp);
        return -1;
     }
     fclose (qfp);

-    lseek (fd1, (off_t) 0, SEEK_SET);
+    lseek(fd1, 0, SEEK_SET);

     return fd1;
 
 
     return fd1;
 
 


@@ -1296,7 +1296,7 @@ static char *
 trim (char *cp)
 {
     char buffer[BUFSIZ*4];
 trim (char *cp)
 {
     char buffer[BUFSIZ*4];

-    unsigned char *bp, *sp;
+    char *bp, *sp;

 
     if (cp == NULL)
        return NULL;
 
     if (cp == NULL)
        return NULL;


@@ -1306,12 +1306,12 @@ trim (char *cp)
     bp = buffer;
 
     /* skip over leading whitespace */
     bp = buffer;
 
     /* skip over leading whitespace */

-    while (isspace(*bp))
+    while (isspace((unsigned char) *bp))

        bp++;
 
     /* start at the end and zap trailing whitespace */
     for (sp = bp + strlen(bp) - 1; sp >= bp; sp--) {
        bp++;
 
     /* start at the end and zap trailing whitespace */
     for (sp = bp + strlen(bp) - 1; sp >= bp; sp--) {

-       if (isspace(*sp))
+       if (isspace((unsigned char) *sp))

            *sp = 0;
        else
            break;
            *sp = 0;
        else
            break;


@@ -1319,11 +1319,11 @@ trim (char *cp)
 
     /* replace remaining whitespace with spaces */
     for (sp = bp; *sp; sp++)
 
     /* replace remaining whitespace with spaces */
     for (sp = bp; *sp; sp++)

-       if (isspace(*sp))
+       if (isspace((unsigned char) *sp))

            *sp = ' ';
 
     /* now return a copy */
            *sp = ' ';
 
     /* now return a copy */

-    return getcpy(bp);
+    return mh_xstrdup(bp);

 }
 
 /*
 }
 
 /*


@@ -1336,7 +1336,7 @@ verbose_printf (char *fmt, ...)
     va_list ap;
 
     va_start(ap, fmt);
     va_list ap;
 
     va_start(ap, fmt);

-    vfprintf (stdout, fmt, ap);
+    vprintf(fmt, ap);

     va_end(ap);
 
     fflush (stdout);   /* now flush output */
     va_end(ap);
 
     fflush (stdout);   /* now flush output */


@@ -1356,22 +1356,22 @@ adorn (char *what, char *fmt, ...)
     char *s;
 
     eindex = errno;    /* save the errno */
     char *s;
 
     eindex = errno;    /* save the errno */

-    fprintf (stdout, ", ");
+    printf(", ");

 
     va_start(ap, fmt);
 
     va_start(ap, fmt);

-    vfprintf (stdout, fmt, ap);
+    vprintf(fmt, ap);

     va_end(ap);
 
     if (what) {
        if (*what)
     va_end(ap);
 
     if (what) {
        if (*what)

-           fprintf (stdout, " %s: ", what);
+           printf(" %s: ", what);

        if ((s = strerror (eindex)))
        if ((s = strerror (eindex)))

-           fprintf (stdout, "%s", s);
+           fputs(s, stdout);

        else
        else

-           fprintf (stdout, "Error %d", eindex);
+           printf("Error %d", eindex);

     }
 
     }
 

-    fputc ('\n', stdout);
+    putchar('\n');

     fflush (stdout);
 }
 
     fflush (stdout);
 }
 


@@ -1401,10 +1401,11 @@ static int
 suppress_duplicates (int fd, char *file)
 {
     int        fd1, lockfd, state, result;
 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;
     datum key, value;
     DBM *db;
     FILE *in;

+    m_getfld_state_t gstate;

 
     if ((fd1 = dup (fd)) == -1)
        return -1;
 
     if ((fd1 = dup (fd)) == -1)
        return -1;


@@ -1414,22 +1415,27 @@ suppress_duplicates (int fd, char *file)
     }
     rewind (in);
 
     }
     rewind (in);
 

-    for (state = FLD;;) {
-       state = m_getfld (state, name, buf, sizeof(buf), in);
+    gstate = m_getfld_state_init(in);
+    for (;;) {
+        int failed_to_lock = 0;
+       int bufsz = sizeof buf;
+       state = m_getfld2(&gstate, name, buf, &bufsz);

        switch (state) {
            case FLD:
            case FLDPLUS:
        switch (state) {
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                /* Search for the message ID */
                /* Search for the message ID */

-               if (mh_strcasecmp (name, "Message-ID")) {
-                   while (state == FLDPLUS)
-                       state = m_getfld (state, name, buf, sizeof(buf), in);
+               if (strcasecmp (name, "Message-ID")) {
+                   while (state == FLDPLUS) {
+                       bufsz = sizeof buf;
+                       state = m_getfld2(&gstate, name, buf, &bufsz);
+                   }

                    continue;
                }
 
                    continue;
                }
 

-               cp = add (buf, NULL);
+               cp = mh_xstrdup(buf);

                while (state == FLDPLUS) {
                while (state == FLDPLUS) {

-                   state = m_getfld (state, name, buf, sizeof(buf), in);
+                   bufsz = sizeof buf;
+                   state = m_getfld2(&gstate, name, buf, &bufsz);

                    cp = add (buf, cp);
                }
                key.dptr = trimcpy (cp);
                    cp = add (buf, cp);
                }
                key.dptr = trimcpy (cp);


@@ -1449,7 +1455,8 @@ suppress_duplicates (int fd, char *file)
                 * This will fail if your Maildelivery file doesn't
                 * exist.
                 */
                 * This will fail if your Maildelivery file doesn't
                 * exist.
                 */

-               if ((lockfd = lkopen(file, O_RDWR, 0)) == -1) {
+               if ((lockfd = lkopendata(file, O_RDWR, 0, &failed_to_lock))
+                   == -1) {

                    advise (file, "unable to perform file locking on");
                    free (cp);
                    fclose (in);
                    advise (file, "unable to perform file locking on");
                    free (cp);
                    fclose (in);


@@ -1470,14 +1477,12 @@ suppress_duplicates (int fd, char *file)
                }
 
                dbm_close (db);
                }
 
                dbm_close (db);

-               lkclose(lockfd, file);
+               lkclosedata(lockfd, file);

                free (cp);
                fclose (in);
                return result;
                free (cp);
                fclose (in);
                return result;

-               break;

 
           case BODY:
 
           case BODY:

-          case BODYEOF:

           case FILEEOF:
                break;
 
           case FILEEOF:
                break;
 


@@ -1489,6 +1494,7 @@ suppress_duplicates (int fd, char *file)
 
        break;
     }
 
        break;
     }

+    m_getfld_state_destroy (&gstate);

 
     fclose (in);
     return 0;
 
     fclose (in);
     return 0;