From: Lyndon Nerenberg <lyndon@orthanc.ca>
Date: Mon, 1 Jul 2013 01:11:13 +0000 (-0700)
Subject: Revert "Move a variable manipulation outside the context of setjmp() to quell a compi... 
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/1863e69308bcdbe24fb3fdea1e7af95a4b266cf4?ds=inline;hp=-c

Revert "Move a variable manipulation outside the context of setjmp() to quell a compiler warning."

Turns out it didn't fix it after all.

This reverts commit 0152658e840581077e5cd575b5195faf18b9df8b.
---

1863e69308bcdbe24fb3fdea1e7af95a4b266cf4
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index e94e8d3e..82e65d77 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -870,10 +870,9 @@ parse (void)
  */
 
 static void
-process (char *folder, char *filename, int ofilen, int ofilec)
+process (char *folder, char *fname, int ofilen, int ofilec)
 {
     char *cp = NULL;
-    char *fname = filename;
     FILE *fp = NULL;
     struct mcomp *c1;
     struct stat st;
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 85b9a484..6282d522 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -183,72 +183,48 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
-    int bytes, fd, seconds, bailout;
+    int bytes, fd, seconds;
     char tmpfil[BUFSIZ];
     struct stat st;
 
-    bailout = 0;
     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
     unlink (tmpfil);
 
     if ((child_id = fork()) == NOTOK) {
-
 	/* fork error */
 	close (fd);
 	return header_fd ();
-
     } else if (child_id) {
-
 	/* 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) {
-
 		/* give at least 5 minutes */
 		seconds = 300;
-
 	    } else if (bytes >= 90000) {
-
 		/* but 30 minutes should be long enough */
 		seconds = 1800;
-
 	    } else {
-
 		seconds = (bytes / 60) + 300;
-
 	    }
-
 	    alarm ((unsigned int) seconds);
 	    pidwait(child_id, OK);
 	    alarm (0);
 
+	    if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0)
+		return fd;
 	} else {
-
 	    /*
 	     * 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 */