One final fix to test-attach-detach.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 85b9a4845a9a7ca5573537971105a45c1b0748f8..356234adf3062a5f68ffb603412a76e233ecc9d2 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -69,7 +69,9 @@ char *getusername(void);
 static void alrmser (int);
 static int message_fd (char **);
 static int header_fd (void);
 static void alrmser (int);
 static int message_fd (char **);
 static int header_fd (void);

+#if HAVE_GETUTXENT

 static void alert (char *, int);
 static void alert (char *, int);

+#endif /* HAVE_GETUTXENT */

 
 
 int
 
 
 int


@@ -164,6 +166,9 @@ main (int argc, char **argv)
         }
     }
     endutxent();
         }
     }
     endutxent();

+#else
+    NMH_UNUSED (tty);
+    NMH_UNUSED (utp);

 #endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);
 #endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);


@@ -183,72 +188,50 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
 message_fd (char **vec)
 {
     pid_t child_id;

-    int bytes, fd, seconds, bailout;
+    int bytes, seconds;
+    /* volatile to prevent "might be clobbered" warning from gcc: */
+    volatile int fd;

     char tmpfil[BUFSIZ];
     struct stat st;
 
     char tmpfil[BUFSIZ];
     struct stat st;
 

-    bailout = 0;

     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
     unlink (tmpfil);
 
     if ((child_id = fork()) == NOTOK) {
     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
     unlink (tmpfil);
 
     if ((child_id = fork()) == NOTOK) {

-

        /* fork error */
        close (fd);
        return header_fd ();
        /* fork error */
        close (fd);
        return header_fd ();

-

     } else if (child_id) {
     } else if (child_id) {

-

        /* parent process */
        if (!setjmp (myctx)) {
        /* parent process */
        if (!setjmp (myctx)) {

-

            SIGNAL (SIGALRM, alrmser);
            bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
 
            /* amount of time to wait depends on message size */
            if (bytes <= 100) {
            SIGNAL (SIGALRM, alrmser);
            bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
 
            /* amount of time to wait depends on message size */
            if (bytes <= 100) {

-

                /* give at least 5 minutes */
                seconds = 300;
                /* give at least 5 minutes */
                seconds = 300;

-

            } else if (bytes >= 90000) {
            } else if (bytes >= 90000) {

-

                /* but 30 minutes should be long enough */
                seconds = 1800;
                /* but 30 minutes should be long enough */
                seconds = 1800;

-

            } else {
            } else {

-

                seconds = (bytes / 60) + 300;
                seconds = (bytes / 60) + 300;

-

            }
            }

-

            alarm ((unsigned int) seconds);
            pidwait(child_id, OK);
            alarm (0);
 
            alarm ((unsigned int) seconds);
            pidwait(child_id, OK);
            alarm (0);
 

+           if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0)
+               return fd;

        } else {
        } else {

-

            /*
             * Ruthlessly kill the child and anything
             * else in its process group.
             */
            killpg(child_id, SIGKILL);
            /*
             * Ruthlessly kill the child and anything
             * else in its process group.
             */
            killpg(child_id, SIGKILL);

-           bailout = 1;
-
-       }
-
-       if (bailout) {
-
-            if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0) {
-               return fd;
-           }
-
-       } else {
-
-           close (fd);
-           return header_fd ();
-

        }
        }

+       close (fd);
+       return header_fd ();

     }
 
     /* child process */
     }
 
     /* child process */


@@ -257,8 +240,11 @@ message_fd (char **vec)
        _exit (-1);
     closefds (3);
     setpgid ((pid_t) 0, getpid ());    /* put in own process group */
        _exit (-1);
     closefds (3);
     setpgid ((pid_t) 0, getpid ());    /* put in own process group */

-    execvp (vec[0], vec);
-    _exit (-1);
+    if (execvp (vec[0], vec) == NOTOK) {
+        _exit (-1);
+    }
+
+    return NOTOK;

 }
 
 
 }
 
 


@@ -289,6 +275,7 @@ header_fd (void)
 }
 
 
 }
 
 

+#if HAVE_GETUTXENT

 static void
 alert (char *tty, int md)
 {
 static void
 alert (char *tty, int md)
 {


@@ -326,4 +313,4 @@ alert (char *tty, int md)
 
     close (td);
 }
 
     close (td);
 }

-
+#endif /* HAVE_GETUTXENT */