X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dbdbd49d59ae5c14e66b1c148a63b8abc9d076ab..5bc2777230cdc4cea23ff87df356af3fb0cfadf9:/uip/rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 693cd814..4098d709 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -10,15 +10,23 @@
  * 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/closefds.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/fmt_scan.h"
+#include "h/tws.h"
+#include "h/mts.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
@@ -52,9 +60,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;
@@ -103,7 +111,7 @@ main (int argc, char **argv)
 		    done (0);
 
 		case BIFFSW:
-		    biff = 1;
+		    biff = true;
 		    continue;
 
 		case FORMSW:
@@ -123,16 +131,16 @@ main (int argc, char **argv)
 		    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;
 
 	    }
@@ -142,7 +150,7 @@ main (int argc, char **argv)
     vec[vecp] = 0;
 
     if ((md = vecp ? message_fd (vec) : header_fd ()) == NOTOK)
-	exit (RCV_MBX);
+	exit(1);
 
     user = getusername();
 
@@ -162,7 +170,7 @@ main (int argc, char **argv)
     NMH_UNUSED (utp);
 #endif /* HAVE_GETUTXENT */
 
-    exit (RCV_MOK);
+    exit(0);
 }