X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a5b2adde414330e1661db05d1ee5b1daeaa2476d..085bca07c0b505f095a50666a3752e5fcb69bc70:/uip/rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 2c66fa6f..3563ae5f 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -10,14 +10,22 @@
  * 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/fmt_new.h"
+#include "scansbr.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.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 <h/utils.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>
 
@@ -51,9 +59,9 @@ 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;
@@ -73,11 +81,11 @@ int
 main (int argc, char **argv)
 {
     int md, vecp = 0;
-    char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
+    char *cp, *user, buf[BUFSIZ];
     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);
@@ -102,36 +110,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;
 
 	    }
@@ -141,27 +149,25 @@ main (int argc, char **argv)
     vec[vecp] = 0;
 
     if ((md = vecp ? message_fd (vec) : header_fd ()) == NOTOK)
-	exit (RCV_MBX);
-
-    user = getusername();
+	exit(1);
 
 #if HAVE_GETUTXENT
+    user = getusername(1);
+
     setutxent();
     while ((utp = getutxent()) != NULL) {
         if (utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
                && utp->ut_line[0] != 0
                && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
-            strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
-	    alert (tty, md);
+	    alert(utp->ut_line, md);
         }
     }
     endutxent();
 #else
-    NMH_UNUSED (tty);
     NMH_UNUSED (utp);
 #endif /* HAVE_GETUTXENT */
 
-    exit (RCV_MOK);
+    exit(0);
 }
 
 
@@ -231,7 +237,6 @@ message_fd (char **vec)
     rewind (stdin);
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
 	_exit(1);
-    closefds (3);
     setpgid(0, getpid());	/* put in own process group */
     if (execvp (vec[0], vec) == NOTOK) {
         _exit(1);