Make sure to mark the sequence file as closed in the msgs struct.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index d769b40a6e3e8a095bdbea74510e9d7a24915457..5443748c99b56674318ad67f5814e3d1630fc181 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -2,7 +2,9 @@
 /*
  * 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,
  */
 
 /* Changed to use getutent() and friends.  Assumes that when getutent() exists,


@@ -12,53 +14,42 @@
 
 #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/tws.h>
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/tws.h>

-#include <zotnet/mts/mts.h>
+#include <h/mts.h>

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

-#include <utmp.h>
-
-#ifndef HAVE_GETUTENT
-# ifndef UTMP_FILE
-#  ifdef _PATH_UTMP
-#   define UTMP_FILE _PATH_UTMP
-#  else
-#   define UTMP_FILE "/etc/utmp"
-#  endif
-# 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", 0 },
-    { 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 jmp_buf myctx;
 static int bell = 1;


@@ -76,7 +67,7 @@ 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 void alert (char *, int);
 static int message_fd (char **);
 static int header_fd (void);
 static void alert (char *, int);


@@ -88,13 +79,7 @@ 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];

-#ifdef HAVE_GETUTENT
-    struct utmp * utp;
-#else
-    struct utmp ut;
-    register FILE *uf;
-#endif
-
+    struct utmpx *utp;

 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif


@@ -120,10 +105,10 @@ main (int argc, char **argv)
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
                    print_help (buf, switches, 1);
                case HELPSW: 
                    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;
 
                case BIFFSW:
                    biff = 1;


@@ -169,41 +154,28 @@ main (int argc, char **argv)
 
     user = getusername();
 
 
     user = getusername();
 

-#ifdef HAVE_GETUTENT
-    setutent();
-    while ((utp = getutent()) != NULL) {
-        if (utp->ut_type == USER_PROCESS 
-               && utp->ut_user[0] != 0
+#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);
         }
     }
                && 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);
         }
     }

-    endutent();
-#else
-    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));
-           alert (tty, md);
-       }
-    fclose (uf);
-#endif
+    endutxent();
+#endif /* HAVE_GETUTXENT */

 
     exit (RCV_MOK);
     return 0;  /* dead code to satisfy the compiler */
 }
 
 
 
     exit (RCV_MOK);
     return 0;  /* dead code to satisfy the compiler */
 }
 
 

-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);
 }


@@ -217,16 +189,10 @@ message_fd (char **vec)
     char tmpfil[BUFSIZ];
     struct stat st;
 
     char tmpfil[BUFSIZ];
     struct stat st;
 

-#ifdef HAVE_MKSTEMP

     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));

-#else
-    unlink (mktemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
-    if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
-       return header_fd ();
-#endif

     unlink (tmpfil);
 
     unlink (tmpfil);
 

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

        /* fork error */
        close (fd);
        return header_fd ();
        /* fork error */
        close (fd);
        return header_fd ();


@@ -257,7 +223,7 @@ message_fd (char **vec)
             * Ruthlessly kill the child and anything
             * else in its process group.
             */
             * 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 ();


@@ -279,18 +245,19 @@ static int
 header_fd (void)
 {
     int fd;
 header_fd (void)
 {
     int fd;

-    char *nfs, tmpfil[BUFSIZ];
+    char *nfs;
+    char *tfile = 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);
+    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
+    if (tfile == NULL) return NOTOK;
+    unlink (tfile);

 
     rewind (stdin);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);
     scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
 
     rewind (stdin);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);
     scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);

+    scan_finished ();

     if (newline)
         write (fd, "\n\r", 2);
     write (fd, scanl, strlen (scanl));
     if (newline)
         write (fd, "\n\r", 2);
     write (fd, scanl, strlen (scanl));