X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f2753d64be0a74a22018e03ec9c04cc9ca45d3ab..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 3b837081..e8e74243 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -10,14 +10,21 @@
  * Ruud de Rooij <ruud@ruud.org>  Sun, 28 May 2000 17:28:55 +0200
  */
 
-#include <h/mh.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/signals.h"
 #include <setjmp.h>
-#include <h/rcvmail.h>
-#include <h/scansbr.h>
-#include <h/tws.h>
-#include <h/mts.h>
-#include "../sbr/m_mktemp.h"
+#include "h/rcvmail.h"
+#include "h/scansbr.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT
@@ -50,18 +57,13 @@ DEFINE_SWITCH_ARRAY(RCVTTY, switches);
 #undef X
 
 static jmp_buf myctx;
-static int bell = 1;
-static int newline = 1;
-static int biff = 0;
+static bool bell = true;
+static bool newline = true;
+static bool biff;
 static int width = -1;
 static char *form = NULL;
 static char *format = NULL;
 
-/*
- * external prototypes
- */
-char *getusername(void);
-
 /*
  * static prototypes
  */
@@ -81,7 +83,7 @@ main (int argc, char **argv)
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
 
-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -106,36 +108,36 @@ main (int argc, char **argv)
 		    done (0);
 
 		case BIFFSW:
-		    biff = 1;
+		    biff = true;
 		    continue;
 
 		case FORMSW:
 		    if (!(form = *argp++) || *form == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			die("missing argument to %s", argp[-2]);
 		    format = NULL;
 		    continue;
 		case FMTSW:
 		    if (!(format = *argp++) || *format == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			die("missing argument to %s", argp[-2]);
 		    form = NULL;
 		    continue;
 
 		case WIDTHSW:
 		    if (!(cp = *argp++) || *cp == '-')
-			adios(NULL, "missing argument to %s", argp[-2]);
+			die("missing argument to %s", argp[-2]);
 		    width = atoi(cp);
 		    continue;
                 case NLSW:
-                    newline = 1;
+                    newline = true;
                     continue;
                 case NNLSW:
-                    newline = 0;
+                    newline = false;
                     continue;
                 case BELSW:
-                    bell = 1;
+                    bell = true;
                     continue;
                 case NBELSW:
-                    bell = 0;
+                    bell = false;
                     continue;
 
 	    }
@@ -218,7 +220,7 @@ message_fd (char **vec)
 	    pidwait(child_id, OK);
 	    alarm (0);
 
-	    if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0)
+	    if (fstat (fd, &st) != NOTOK && st.st_size > 0)
 		return fd;
 	} else {
 	    /*
@@ -234,11 +236,11 @@ message_fd (char **vec)
     /* child process */
     rewind (stdin);
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
-	_exit (-1);
+	_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);
+        _exit(1);
     }
 
     return NOTOK;
@@ -302,19 +304,18 @@ 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;
     }
-
-    lseek (md, (off_t) 0, SEEK_SET);
+    SIGNAL (SIGALRM, alrmser);
+    alarm (2);
+    td = open (ttyspec, O_WRONLY);
+    alarm (0);
+    if (td == NOTOK)
+        return;
+
+    lseek(md, 0, SEEK_SET);
 
     while ((i = read (md, buffer, sizeof(buffer))) > 0)
 	if (write (td, buffer, i) != i)