fdcompare.c: Move interface to own file.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 60d9a69b62ee63393487ea238492844006ff4996..e8e74243580cbb5a21d7c80197c1db61b5c3e821 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -10,15 +10,21 @@
  * Ruud de Rooij <ruud@ruud.org>  Sun, 28 May 2000 17:28:55 +0200
  */
 
  * 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 <setjmp.h>

-#include <h/rcvmail.h>
-#include <h/scansbr.h>
-#include <h/tws.h>
-#include <h/mts.h>
-#include <h/utils.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
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT


@@ -51,9 +57,9 @@ DEFINE_SWITCH_ARRAY(RCVTTY, switches);
 #undef X
 
 static jmp_buf myctx;
 #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;
 static int width = -1;
 static char *form = NULL;
 static char *format = NULL;


@@ -77,7 +83,7 @@ main (int argc, char **argv)
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
 
     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);
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);


@@ -102,36 +108,36 @@ main (int argc, char **argv)
                    done (0);
 
                case BIFFSW:
                    done (0);
 
                case BIFFSW:

-                   biff = 1;
+                   biff = true;

                    continue;
 
                case FORMSW:
                    if (!(form = *argp++) || *form == '-')
                    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 == '-')
                    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 == '-')
                    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:
                    width = atoi(cp);
                    continue;
                 case NLSW:

-                    newline = 1;
+                    newline = true;

                     continue;
                 case NNLSW:
                     continue;
                 case NNLSW:

-                    newline = 0;
+                    newline = false;

                     continue;
                 case BELSW:
                     continue;
                 case BELSW:

-                    bell = 1;
+                    bell = true;

                     continue;
                 case NBELSW:
                     continue;
                 case NBELSW:

-                    bell = 0;
+                    bell = false;

                     continue;
 
            }
                     continue;
 
            }


@@ -230,11 +236,11 @@ message_fd (char **vec)
     /* child process */
     rewind (stdin);
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
     /* child process */
     rewind (stdin);
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)

-       _exit (-1);
+       _exit(1);

     closefds (3);
     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) {
     if (execvp (vec[0], vec) == NOTOK) {

-        _exit (-1);
+        _exit(1);

     }
 
     return NOTOK;
     }
 
     return NOTOK;