X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Frcvtty.c;h=29f2dd9d639845cbdfaef1d1ece030ede7e43299;hb=7946a8c713bd43a52229345ad0289aaa461acfb3;hp=8e659ffe0c05854af36a8633914c04e8c01e4954;hpb=7ba29497ff3f164e2a507eda35e81f1cb0658c74;p=mmh

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 8e659ff..29f2dd9 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -14,7 +14,7 @@
 
 #include <h/mh.h>
 #include <h/signals.h>
-#include <h/m_setjmp.h>
+#include <setjmp.h>
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
@@ -22,7 +22,9 @@
 #include <signal.h>
 #include <fcntl.h>
 
+#ifdef HAVE_GETUTXENT
 #include <utmpx.h>
+#endif /* HAVE_GETUTXENT */
 
 #define	SCANFMT	\
 "%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
@@ -107,10 +109,10 @@ main (int argc, char **argv)
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case BIFFSW:
 		    biff = 1;
@@ -156,6 +158,7 @@ main (int argc, char **argv)
 
     user = getusername();
 
+#if HAVE_GETUTXENT
     setutxent();
     while ((utp = getutxent()) != NULL) {
         if (utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
@@ -166,6 +169,7 @@ main (int argc, char **argv)
         }
     }
     endutxent();
+#endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);
     return 0;  /* dead code to satisfy the compiler */
@@ -192,13 +196,13 @@ message_fd (char **vec)
     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
     unlink (tmpfil);
 
-    if ((child_id = m_vfork()) == NOTOK) {
+    if ((child_id = vfork()) == NOTOK) {
 	/* fork error */
 	close (fd);
 	return header_fd ();
     } else if (child_id) {
 	/* parent process */
-	if (!m_setjmp (myctx)) {
+	if (!setjmp (myctx)) {
 	    SIGNAL (SIGALRM, alrmser);
 	    bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
 
@@ -284,7 +288,7 @@ alert (char *tty, int md)
     if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
 	return;
 
-    if (!m_setjmp (myctx)) {
+    if (!setjmp (myctx)) {
 	SIGNAL (SIGALRM, alrmser);
 	alarm (2);
 	td = open (ttyspec, O_WRONLY);