inc/test-eom-align: Fix MMDF-mbox `B' size calculation.

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index da879acf7027d479c5579623e7e2064ca42d289c..df02d0d15902275d7ad079f8de4c5064a9491bb4 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -26,9 +26,10 @@
 #include <setjmp.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <setjmp.h>
 #include <h/tws.h>
 #include <h/mts.h>

+#include "h/done.h"

 #include <h/utils.h>
 #include <h/utils.h>

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

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


@@ -163,7 +164,7 @@ static int split (char *, char **);
 static int parse (int);
 static void expand (char *, char *, int);
 static void glob (int);
 static int parse (int);
 static void expand (char *, char *, int);
 static void glob (int);

-static struct pair *lookup (struct pair *, char *);
+static struct pair *lookup (struct pair *, char *) PURE;

 static int logged_in (void);
 static int timely (char *, char *);
 static int usr_file (int, char *, int);
 static int logged_in (void);
 static int timely (char *, char *);
 static int usr_file (int, char *, int);


@@ -172,9 +173,9 @@ static int usr_folder (int, char *);
 static void alrmser (int);
 static void get_sender (char *, char **);
 static int copy_message (int, char *, int);
 static void 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 void verbose_printf (char *fmt, ...) CHECK_PRINTF(1, 2);
+static void adorn (char *, char *, ...) CHECK_PRINTF(2, 3);
+static void debug_printf (char *fmt, ...) CHECK_PRINTF(1, 2);

 static int suppress_duplicates (int, char *);
 static char *trim (char *);
 
 static int suppress_duplicates (int, char *);
 static char *trim (char *);
 


@@ -636,7 +637,7 @@ usr_delivery (int fd, char *delivery, int su)
     }
 
     fclose (fp);
     }
 
     fclose (fp);

-    return (won ? 0 : -1);
+    return won ? 0 : -1;

 }
 
 
 }
 
 


@@ -713,7 +714,7 @@ parse (int fd)
     char name[NAMESZ], field[NMH_BUFSIZ];
     struct pair *p, *q;
     FILE  *in;
     char name[NAMESZ], field[NMH_BUFSIZ];
     struct pair *p, *q;
     FILE  *in;

-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;

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


@@ -737,15 +738,16 @@ 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.
      */

+    gstate = m_getfld_state_init(in);

     for (i = 0;;) {
        int fieldsz = sizeof field;
     for (i = 0;;) {
        int fieldsz = sizeof field;

-       switch (state = m_getfld (&gstate, name, field, &fieldsz, in)) {
+       switch (state = m_getfld2(&gstate, name, field, &fieldsz)) {

            case FLD: 
            case FLDPLUS: 
                lp = mh_xstrdup(field);
                while (state == FLDPLUS) {
                    fieldsz = sizeof field;
            case FLD: 
            case FLDPLUS: 
                lp = mh_xstrdup(field);
                while (state == FLDPLUS) {
                    fieldsz = sizeof field;

-                   state = m_getfld (&gstate, name, field, &fieldsz, in);
+                   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++) {


@@ -786,7 +788,7 @@ parse (int fd)
                break;
 
            default: 
                break;
 
            default: 

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

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


@@ -801,12 +803,12 @@ parse (int fd)
        p->p_value = getcpy (q ? q->p_value : "");
        p->p_flags &= ~P_CHK;
        if (debug)
        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[%ld]: name=\"%s\" value=\"%s\"\n",

                    p - vars, p->p_name, trim(p->p_value));
     }
     if (debug) {
        for (p = hdrs; p->p_name; p++)
                    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",
+           debug_printf ("hdrs[%ld]: name=\"%s\" value=\"%s\"\n",

                p - hdrs, p->p_name, p->p_value ? trim(p->p_value) : "");
     }
 
                p - hdrs, p->p_name, p->p_value ? trim(p->p_value) : "");
     }
 


@@ -886,7 +888,7 @@ glob (int fd)
 
     if (debug) {
        for (p = vars; p->p_name; p++)
 
     if (debug) {
        for (p = vars; p->p_name; p++)

-           debug_printf ("vars[%d]: name=\"%s\" value=\"%s\"\n",
+           debug_printf ("vars[%ld]: name=\"%s\" value=\"%s\"\n",

                    p - vars, p->p_name, trim(p->p_value));
     }
 }
                    p - vars, p->p_name, trim(p->p_value));
     }
 }


@@ -930,13 +932,13 @@ logged_in (void)
             if (debug)
                 continue;
             endutxent();
             if (debug)
                 continue;
             endutxent();

-            return (utmped = DONE);
+            return utmped = DONE;

         }
     }
 
     endutxent();
 #endif /* HAVE_GETUTXENT */
         }
     }
 
     endutxent();
 #endif /* HAVE_GETUTXENT */

-    return (utmped = NOTOK);
+    return utmped = NOTOK;

 }
 
 #define        check(t,a,b)            if (t < a || t > b) return -1
 }
 
 #define        check(t,a,b)            if (t < a || t > b) return -1


@@ -985,7 +987,7 @@ 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 */
     if (mbx_copy (mailbox, mbx_style, md, fd, NULL) == -1) {
 
     /* append message to file */
     if (mbx_copy (mailbox, mbx_style, md, fd, NULL) == -1) {


@@ -1045,17 +1047,15 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)
 {
     volatile int fd = fd_arg;
     pid_t child_id;
 {
     volatile int fd = fd_arg;
     pid_t child_id;

-    int i, bytes, seconds, status;
+    int bytes, seconds, status;

     struct stat st;
 
     if (verbose && !suppress)
        verbose_printf ("delivering to pipe \"%s\"", cmd);
 
     struct stat st;
 
     if (verbose && !suppress)
        verbose_printf ("delivering to pipe \"%s\"", cmd);
 

-    lseek (fd, (off_t) 0, SEEK_SET);
-
-    for (i = 0; (child_id = fork()) == -1 && i < 5; i++)
-       sleep (5);
+    lseek(fd, 0, SEEK_SET);

 
 

+    child_id = fork();

     switch (child_id) {
        case -1: 
            /* fork error */
     switch (child_id) {
        case -1: 
            /* fork error */


@@ -1084,7 +1084,7 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)
            }
 #endif /* TIOCNOTTY */
 
            }
 #endif /* TIOCNOTTY */
 

-           setpgid ((pid_t) 0, getpid ());     /* put in own process group */
+            setpgid(0, getpid());      /* put in own process group */

 
            *environ = NULL;
            setenv("USER", pw->pw_name, 1);
 
            *environ = NULL;
            setenv("USER", pw->pw_name, 1);


@@ -1092,7 +1092,7 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)
            setenv("SHELL", pw->pw_shell, 1);
 
            execvp (pgm, vec);
            setenv("SHELL", pw->pw_shell, 1);
 
            execvp (pgm, vec);

-           _exit (-1);
+           _exit(1);

 
        default: 
            /* parent process */
 
        default: 
            /* parent process */


@@ -1117,13 +1117,12 @@ usr_pipe (int fd_arg, 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;

            }
             /*
              * Ruthlessly kill the child and anything
            }
             /*
              * Ruthlessly kill the child and anything


@@ -1212,7 +1211,7 @@ you_lose:
            }
        if (i == -1)
            goto you_lose;
            }
        if (i == -1)
            goto you_lose;

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

        return fd1;
     }
 
        return fd1;
     }
 


@@ -1277,7 +1276,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;
 
 


@@ -1295,7 +1294,7 @@ fputs_error:
 static char *
 trim (char *cp)
 {
 static char *
 trim (char *cp)
 {

-    char buffer[BUFSIZ*4];
+    static char buffer[BUFSIZ * 4];

     char *bp, *sp;
 
     if (cp == NULL)
     char *bp, *sp;
 
     if (cp == NULL)


@@ -1322,8 +1321,7 @@ trim (char *cp)
        if (isspace((unsigned char) *sp))
            *sp = ' ';
 
        if (isspace((unsigned char) *sp))
            *sp = ' ';
 

-    /* now return a copy */
-    return mh_xstrdup(bp);
+    return bp;

 }
 
 /*
 }
 
 /*


@@ -1405,7 +1403,7 @@ suppress_duplicates (int fd, char *file)
     datum key, value;
     DBM *db;
     FILE *in;
     datum key, value;
     DBM *db;
     FILE *in;

-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;

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


@@ -1415,10 +1413,11 @@ suppress_duplicates (int fd, char *file)
     }
     rewind (in);
 
     }
     rewind (in);
 

+    gstate = m_getfld_state_init(in);

     for (;;) {
         int failed_to_lock = 0;
        int bufsz = sizeof buf;
     for (;;) {
         int failed_to_lock = 0;
        int bufsz = sizeof buf;

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

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


@@ -1426,7 +1425,7 @@ suppress_duplicates (int fd, char *file)
                if (strcasecmp (name, "Message-ID")) {
                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;
                if (strcasecmp (name, "Message-ID")) {
                    while (state == FLDPLUS) {
                        bufsz = sizeof buf;

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

                    }
                    continue;
                }
                    }
                    continue;
                }


@@ -1434,7 +1433,7 @@ suppress_duplicates (int fd, char *file)
                cp = mh_xstrdup(buf);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                cp = mh_xstrdup(buf);
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;

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

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