Delete mh_xfree(), changing callers to call free(3) instead.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 6991829ea5ef220573207cef8d1b5df2e8a4b22c..101aa5ab9f422be7d19b9f86e4371dec3632c041 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -18,7 +18,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT
@@ -58,11 +58,6 @@ static int width = -1;
 static char *form = NULL;
 static char *format = NULL;
 
-/*
- * external prototypes
- */
-char *getusername(void);
-
 /*
  * static prototypes
  */
@@ -237,7 +232,7 @@ message_fd (char **vec)
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
        _exit (-1);
     closefds (3);
-    setpgid ((pid_t) 0, getpid ());    /* put in own process group */
+    setpgid(0, getpid());      /* put in own process group */
     if (execvp (vec[0], vec) == NOTOK) {
         _exit (-1);
     }
@@ -303,17 +298,16 @@ alert (char *tty, int md)
     if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
        return;
 
-    if (!setjmp (myctx)) {
-       SIGNAL (SIGALRM, alrmser);
-       alarm (2);
-       td = open (ttyspec, O_WRONLY);
-       alarm (0);
-       if (td == NOTOK)
-           return;
-    } else {
+    if (setjmp (myctx)) {
        alarm (0);
        return;
     }
+    SIGNAL (SIGALRM, alrmser);
+    alarm (2);
+    td = open (ttyspec, O_WRONLY);
+    alarm (0);
+    if (td == NOTOK)
+        return;
 
     lseek(md, 0, SEEK_SET);