sbr/m_maildir.c: Move prototypes from h/prototypes.h to new header.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index ab674f0ddc56ed95d566b683a900af7be6d01f64..0c717b457eb54346c1b009d07a686a69f2191fcd 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -1,6 +1,4 @@
-
-/*
- * rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys
+/* rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -19,6 +17,8 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>

+#include <h/utils.h>
+#include "../sbr/m_mktemp.h"

 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT


@@ -82,7 +82,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], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }

 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
 
     mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);


@@ -189,7 +189,7 @@ message_fd (char **vec)
     struct stat st;
 
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
     struct stat st;
 
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {

-       advise(NULL, "unable to create temporary file in %s", get_temp_dir());
+       inform("unable to create temporary file in %s", get_temp_dir());

        return NOTOK;
     }
     (void) m_unlink(tfile);  /* Use fd, no longer need the file name. */
        return NOTOK;
     }
     (void) m_unlink(tfile);  /* Use fd, no longer need the file name. */


@@ -198,7 +198,8 @@ message_fd (char **vec)
        /* fork error */
        close (fd);
        return header_fd ();
        /* fork error */
        close (fd);
        return header_fd ();

-    } else if (child_id) {
+    }
+    if (child_id) {

        /* parent process */
        if (!setjmp (myctx)) {
            SIGNAL (SIGALRM, alrmser);
        /* parent process */
        if (!setjmp (myctx)) {
            SIGNAL (SIGALRM, alrmser);


@@ -254,7 +255,7 @@ header_fd (void)
     charstring_t scanl = NULL;
 
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
     charstring_t scanl = NULL;
 
     if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {

-       advise(NULL, "unable to create temporary file in %s", get_temp_dir());
+       inform("unable to create temporary file in %s", get_temp_dir());

         return NOTOK;
     }
     (void) m_unlink(tfile);  /* Use fd, no longer need the file name. */
         return NOTOK;
     }
     (void) m_unlink(tfile);  /* Use fd, no longer need the file name. */