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 cb194dd56fc161df55c6b952af24404654222172..101aa5ab9f422be7d19b9f86e4371dec3632c041 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -1,76 +1,72 @@
-
-/*
- * rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys
+/* rcvtty.c -- a rcvmail program (a lot like rcvalert) handling IPC ttys

  *
  *

- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
+ */
+
+/* Changed to use getutent() and friends.  Assumes that when getutent() exists,
+ * a number of other things also exist.  Please check.
+ * 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 <h/signals.h>

+#include <setjmp.h>

 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/rcvmail.h>
 #include <h/scansbr.h>

-#include <zotnet/tws/tws.h>
-#include <signal.h>
+#include <h/tws.h>
+#include <h/mts.h>
+#include <h/utils.h>
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 
 #include <fcntl.h>
 

-#include <utmp.h>
-#ifndef UTMP_FILE
-# ifdef _PATH_UTMP
-#  define UTMP_FILE _PATH_UTMP
-# else
-#  define UTMP_FILE "/etc/utmp"
-# endif
-#endif
+#ifdef HAVE_GETUTXENT
+#include <utmpx.h>
+#endif /* HAVE_GETUTXENT */

 
 #define        SCANFMT \
 "%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
 %<(mymbox{from})%<{to}To:%14(friendly{to})%>%>%<(zero)%17(friendly{from})%>  \
 %{subject}%<{body}<<%{body}>>%>"
 
 
 #define        SCANFMT \
 "%2(hour{dtimenow}):%02(min{dtimenow}): %<(size)%5(size) %>%<{encrypted}E%>\
 %<(mymbox{from})%<{to}To:%14(friendly{to})%>%>%<(zero)%17(friendly{from})%>  \
 %{subject}%<{body}<<%{body}>>%>"
 

-static struct swit switches[] = {
-#define        BIFFSW  0
-    { "biff", 0 },
-#define        FORMSW  1
-    { "form formatfile", 0 },
-#define        FMTSW   2
-    { "format string", 5 },
-#define WIDTHSW 3
-    { "width columns", 0 },
-#define NLSW    4
-    { "newline", 0 },
-#define NNLSW   5
-    { "nonewline", 0 },
-#define BELSW  6
-    { "bell", 0 },
-#define        NBELSW  7
-    { "nobell", 0 },
-#define VERSIONSW 8
-    { "version", 0 },
-#define        HELPSW  9
-    { "help", 4 },
-    { NULL, 0 }
-};
+#define RCVTTY_SWITCHES \
+    X("biff", 0, BIFFSW) \
+    X("form formatfile", 0, FORMSW) \
+    X("format string", 5, FMTSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("newline", 0, NLSW) \
+    X("nonewline", 0, NNLSW) \
+    X("bell", 0, BELSW) \
+    X("nobell", 0, NBELSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(RCVTTY);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(RCVTTY, switches);
+#undef X

 
 static jmp_buf myctx;
 static int bell = 1;
 static int newline = 1;
 static int biff = 0;
 
 static jmp_buf myctx;
 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
  */

-static RETSIGTYPE alrmser (int);
+static void alrmser (int);

 static int message_fd (char **);
 static int header_fd (void);
 static int message_fd (char **);
 static int header_fd (void);

+#if HAVE_GETUTXENT

 static void alert (char *, int);
 static void alert (char *, int);

+#endif /* HAVE_GETUTXENT */

 
 
 int
 
 
 int


@@ -79,49 +75,42 @@ main (int argc, char **argv)
     int md, vecp = 0;
     char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
     char **argp, **arguments, *vec[MAXARGS];
     int md, vecp = 0;
     char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
     char **argp, **arguments, *vec[MAXARGS];

-    struct utmp ut;
-    register FILE *uf;
+    struct utmpx *utp;

 
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 2)) { return 1; }

 
 

-    /* read user profile/context */
-    context_read();
-
-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {

-               case AMBIGSW: 
+               case AMBIGSW:

                    ambigsw (cp, switches);
                    done (1);
                    ambigsw (cp, switches);
                    done (1);

-               case UNKWNSW: 
+               case UNKWNSW:

                    vec[vecp++] = --cp;
                    continue;
 
                    vec[vecp++] = --cp;
                    continue;
 

-               case HELPSW: 
+               case HELPSW:

                    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
                    print_help (buf, switches, 1);
                    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case BIFFSW:
                    biff = 1;
                    continue;
 
 
                case BIFFSW:
                    biff = 1;
                    continue;
 

-               case FORMSW: 
+               case FORMSW:

                    if (!(form = *argp++) || *form == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    format = NULL;
                    continue;
                    if (!(form = *argp++) || *form == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    format = NULL;
                    continue;

-               case FMTSW: 
+               case FMTSW:

                    if (!(format = *argp++) || *format == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    form = NULL;
                    if (!(format = *argp++) || *format == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    form = NULL;


@@ -155,27 +144,31 @@ main (int argc, char **argv)
        exit (RCV_MBX);
 
     user = getusername();
        exit (RCV_MBX);
 
     user = getusername();

-    if ((uf = fopen (UTMP_FILE, "r")) == NULL)
-       exit (RCV_MBX);

 
 

-    while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1)
-       if (ut.ut_name[0] != 0
-               && strncmp (user, ut.ut_name, sizeof(ut.ut_name)) == 0) {
-           strncpy (tty, ut.ut_line, sizeof(ut.ut_line));
+#if HAVE_GETUTXENT
+    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 (tty, md);

-       }
+        }
+    }
+    endutxent();
+#else
+    NMH_UNUSED (tty);
+    NMH_UNUSED (utp);
+#endif /* HAVE_GETUTXENT */

 
 

-    fclose (uf);

     exit (RCV_MOK);
 }
 
 
     exit (RCV_MOK);
 }
 
 

-static RETSIGTYPE
+static void

 alrmser (int i)
 {
 alrmser (int i)
 {

-#ifndef RELIABLE_SIGNALS
-    SIGNAL (SIGALRM, alrmser);
-#endif
+    NMH_UNUSED (i);

 
     longjmp (myctx, 1);
 }
 
     longjmp (myctx, 1);
 }


@@ -185,24 +178,23 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
 message_fd (char **vec)
 {
     pid_t child_id;

-    int bytes, fd, seconds;
-    char tmpfil[BUFSIZ];
+    int bytes, seconds;
+    int fd;
+    char *tfile;

     struct stat st;
 
     struct stat st;
 

-#ifdef HAVE_MKSTEMP
-    unlink (mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
-#else
-    unlink (mktemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
-#endif
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-       return header_fd ();
-    unlink (tmpfil);
+    if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
+       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. */

 
 

-    if ((child_id = vfork()) == NOTOK) {
+    if ((child_id = fork()) == NOTOK) {

        /* 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);


@@ -222,14 +214,14 @@ 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 {
            /*
             * Ruthlessly kill the child and anything
             * else in its process group.
             */
                return fd;
        } else {
            /*
             * Ruthlessly kill the child and anything
             * else in its process group.
             */

-           KILLPG(child_id, SIGKILL);
+           killpg(child_id, SIGKILL);

        }
        close (fd);
        return header_fd ();
        }
        close (fd);
        return header_fd ();


@@ -240,9 +232,12 @@ 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 */
-    execvp (vec[0], vec);
-    _exit (-1);
+    setpgid(0, getpid());      /* put in own process group */
+    if (execvp (vec[0], vec) == NOTOK) {
+        _exit (-1);
+    }
+
+    return NOTOK;

 }
 
 
 }
 
 


@@ -250,28 +245,42 @@ static int
 header_fd (void)
 {
     int fd;
 header_fd (void)
 {
     int fd;

-    char *nfs, tmpfil[BUFSIZ];
+    char *nfs;
+    char *tfile = NULL;
+    charstring_t scanl = NULL;

 
 

-    strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil));
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-       return NOTOK;
-    unlink (tmpfil);
+    if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
+       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. */

 
     rewind (stdin);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);
 
     rewind (stdin);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);

-    scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
-    if (newline)
-        write (fd, "\n\r", 2);
-    write (fd, scanl, strlen (scanl));
-    if (bell)
-        write (fd, "\007", 1);
+    scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0, &scanl);
+    scan_finished ();
+    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);
+    if (bell) {
+        if (write (fd, "\007", 1) < 0) {
+           advise (tfile, "write BEL");
+        }
+    }

 
     return fd;
 }
 
 
 
     return fd;
 }
 
 

+#if HAVE_GETUTXENT

 static void
 alert (char *tty, int md)
 {
 static void
 alert (char *tty, int md)
 {


@@ -289,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;
     }

+    SIGNAL (SIGALRM, alrmser);
+    alarm (2);
+    td = open (ttyspec, O_WRONLY);
+    alarm (0);
+    if (td == NOTOK)
+        return;

 
 

-    lseek (md, (off_t) 0, SEEK_SET);
+    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)


@@ -309,4 +317,4 @@ alert (char *tty, int md)
 
     close (td);
 }
 
     close (td);
 }

-
+#endif /* HAVE_GETUTXENT */