Added tests of MMDF mailbox format to test-eom-align.

[nmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index e136f101df4b5cff24b6e90c454b015abe0922c7..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);


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

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

 }
 
 
 }
 
 


@@ -931,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


@@ -1046,7 +1047,7 @@ 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)
     struct stat st;
 
     if (verbose && !suppress)


@@ -1054,9 +1055,7 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)
 
     lseek(fd, 0, SEEK_SET);
 
 
     lseek(fd, 0, SEEK_SET);
 

-    for (i = 0; (child_id = fork()) == -1 && i < 5; i++)
-       sleep (5);
-
+    child_id = fork();

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


@@ -1085,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);


@@ -1093,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 */


@@ -1123,7 +1122,7 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)
                     else
                         pidstatus (status, stdout, ", failed");
                }
                     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


@@ -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;

 }
 
 /*
 }
 
 /*