X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/93cf33c07eed0e56b4f3a0d1c07ff183ac1510ef..a8bb0c0d8fcfa7f5b43dee30ccfdf799bbbf8520:/uip/rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 74d19d5d..356234ad 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -14,53 +14,41 @@
 
 #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/mts.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}>>%>"
 
-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;
@@ -81,7 +69,9 @@ char *getusername(void);
 static void alrmser (int);
 static int message_fd (char **);
 static int header_fd (void);
+#if HAVE_GETUTXENT
 static void alert (char *, int);
+#endif /* HAVE_GETUTXENT */
 
 
 int
@@ -90,13 +80,7 @@ main (int argc, char **argv)
     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
@@ -122,10 +106,10 @@ main (int argc, char **argv)
 		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);
-		    done (1);
+		    done (0);
 
 		case BIFFSW:
 		    biff = 1;
@@ -171,36 +155,23 @@ main (int argc, char **argv)
 
     user = getusername();
 
-#ifdef HAVE_GETUTENT
-    setutent();
-    while ((utp = getutent()) != NULL) {
-        if (
-#ifdef HAVE_STRUCT_UTMP_UT_TYPE
-	       utp->ut_type == USER_PROCESS 
-	       &&
-#endif
-               utp->ut_name[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_name, sizeof(utp->ut_name)) == 0) {
+               && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
             strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
 	    alert (tty, md);
         }
     }
-    endutent();
+    endutxent();
 #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
+    NMH_UNUSED (tty);
+    NMH_UNUSED (utp);
+#endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);
-    return 0;  /* dead code to satisfy the compiler */
 }
 
 
@@ -217,14 +188,16 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
-    int bytes, fd, seconds;
+    int bytes, seconds;
+    /* volatile to prevent "might be clobbered" warning from gcc: */
+    volatile int fd;
     char tmpfil[BUFSIZ];
     struct stat st;
 
     fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
     unlink (tmpfil);
 
-    if ((child_id = vfork()) == NOTOK) {
+    if ((child_id = fork()) == NOTOK) {
 	/* fork error */
 	close (fd);
 	return header_fd ();
@@ -267,9 +240,11 @@ message_fd (char **vec)
 	_exit (-1);
     closefds (3);
     setpgid ((pid_t) 0, getpid ());	/* put in own process group */
-    execvp (vec[0], vec);
-    _exit (-1);
-    return 1;  /* dead code to satisfy compiler */
+    if (execvp (vec[0], vec) == NOTOK) {
+        _exit (-1);
+    }
+
+    return NOTOK;
 }
 
 
@@ -289,6 +264,7 @@ header_fd (void)
     /* 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));
@@ -299,6 +275,7 @@ header_fd (void)
 }
 
 
+#if HAVE_GETUTXENT
 static void
 alert (char *tty, int md)
 {
@@ -336,4 +313,4 @@ alert (char *tty, int md)
 
     close (td);
 }
-
+#endif /* HAVE_GETUTXENT */