Convert whatnow over to using the new Attach header.

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index f570aaaff2a0082373283e8c4b84eeb76f16f132..8daf6081ac9ccf2c3dd1f2a8c00e3b91e598ef22 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -31,7 +31,6 @@
 #include <h/utils.h>
 
 #include <pwd.h>
-#include <signal.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 
@@ -516,7 +515,7 @@ usr_delivery (int fd, char *delivery, int su)
        }
 
        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)
@@ -535,7 +534,7 @@ usr_delivery (int fd, char *delivery, int su)
             * "default" matches only if the message hasn't
             * been delivered yet.
             */
-               if (!mh_strcasecmp (field, "default")) {
+               if (!strcasecmp (field, "default")) {
                    if (won)
                        continue;
                    break;
@@ -565,7 +564,7 @@ usr_delivery (int fd, char *delivery, int su)
        switch (*action) {
            case 'q':
                /* deliver to quoted pipe */
-               if (mh_strcasecmp (action, "qpipe"))
+               if (strcasecmp (action, "qpipe"))
                    continue;   /* else fall */
            case '^':
                expand (tmpbuf, string, fd);
@@ -576,7 +575,7 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'p': 
                /* deliver to pipe */
-               if (mh_strcasecmp (action, "pipe"))
+               if (strcasecmp (action, "pipe"))
                    continue;   /* else fall */
            case '|': 
                vec[2] = "sh";
@@ -589,12 +588,12 @@ usr_delivery (int fd, char *delivery, int su)
 
            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 */
-               else if (mh_strcasecmp (action, "folder"))
+               else if (strcasecmp (action, "folder"))
                    continue;   /* else fall */
            case '+':
                status = usr_folder (fd, string);
@@ -602,12 +601,12 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'm':
                /* mmdf format */
-               if (!mh_strcasecmp (action, "mmdf")) {
+               if (!strcasecmp (action, "mmdf")) {
                    status = usr_file (fd, string, MMDF_FORMAT);
                    break;
                }
                /* mbox format */
-               else if (mh_strcasecmp (action, "mbox"))
+               else if (strcasecmp (action, "mbox"))
                    continue;   /* else fall */
 
            case '>': 
@@ -617,7 +616,7 @@ usr_delivery (int fd, char *delivery, int su)
 
            case 'd': 
                /* ignore message */
-               if (mh_strcasecmp (action, "destroy"))
+               if (strcasecmp (action, "destroy"))
                    continue;
                status = 0;
                break;
@@ -743,7 +742,7 @@ parse (int fd)
                    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) {
@@ -895,7 +894,7 @@ static struct pair *
 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;
@@ -1043,8 +1042,9 @@ usr_folder (int fd, char *string)
  */
 
 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;
@@ -1422,7 +1422,7 @@ suppress_duplicates (int fd, char *file)
            case FLD:
            case FLDPLUS:
                /* Search for the message ID */
-               if (mh_strcasecmp (name, "Message-ID")) {
+               if (strcasecmp (name, "Message-ID")) {
                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;
                        state = m_getfld (&gstate, name, buf, &bufsz, in);
@@ -1453,7 +1453,7 @@ suppress_duplicates (int fd, char *file)
                 * 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)) == -1) {
                    advise (file, "unable to perform file locking on");
                    free (cp);
                    fclose (in);
@@ -1474,11 +1474,10 @@ suppress_duplicates (int fd, char *file)
                }
 
                dbm_close (db);
-               lkclose(lockfd, file);
+               lkclosedata(lockfd, file);
                free (cp);
                fclose (in);
                return result;
-               break;
 
           case BODY:
           case FILEEOF: