lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index d91b6a4ea02cf63f8a6f75b60adc2756230c44fc..101aa5ab9f422be7d19b9f86e4371dec3632c041 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


@@ -54,15 +54,10 @@ static jmp_buf myctx;
 static int bell = 1;
 static int newline = 1;
 static int biff = 0;
 static int bell = 1;
 static int newline = 1;
 static int biff = 0;

-static int width = 0;
+static int width = -1;

 static char *form = NULL;
 static char *format = NULL;
 
 static char *form = NULL;
 static char *format = NULL;
 

-/*
- * external prototypes
- */
-char *getusername(void);
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -82,9 +77,9 @@ 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 (invo_name);
+    mts_init ();

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


@@ -189,7 +184,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 +193,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);


@@ -218,7 +214,7 @@ message_fd (char **vec)
            pidwait(child_id, OK);
            alarm (0);
 
            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 {
            /*
                return fd;
        } else {
            /*


@@ -236,7 +232,7 @@ message_fd (char **vec)
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
        _exit (-1);
     closefds (3);
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
        _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);
     }
     if (execvp (vec[0], vec) == NOTOK) {
         _exit (-1);
     }


@@ -254,7 +250,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. */


@@ -265,12 +261,20 @@ header_fd (void)
     nfs = new_fs (form, format, SCANFMT);
     scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0, &scanl);
     scan_finished ();
     nfs = new_fs (form, format, SCANFMT);
     scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0, &scanl);
     scan_finished ();

-    if (newline)
-        write (fd, "\n\r", 2);
-    write (fd, charstring_buffer (scanl), charstring_bytes (scanl));
+    if (newline) {
+       if (write (fd, "\n\r", 2) < 0) {
+           advise (tfile, "write LF/CR");
+       }
+    }
+    if (write (fd, charstring_buffer (scanl), charstring_bytes (scanl)) < 0) {
+       advise (tfile, "write");
+    }

     charstring_free (scanl);
     charstring_free (scanl);

-    if (bell)
-        write (fd, "\007", 1);
+    if (bell) {
+        if (write (fd, "\007", 1) < 0) {
+           advise (tfile, "write BEL");
+        }
+    }

 
     return fd;
 }
 
     return fd;
 }


@@ -294,19 +298,18 @@ alert (char *tty, int md)
     if (stat (ttyspec, &st) == NOTOK || (st.st_mode & mask) == 0)
        return;
 
     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;
     }
        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)
 
     while ((i = read (md, buffer, sizeof(buffer))) > 0)
        if (write (td, buffer, i) != i)