X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b56c88e2847c582f9b18ae5bbda44f033cd49c42..8699f1cc:/uip/rcvtty.c?ds=sidebyside

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index bf140ddd..f1368f71 100644
--- 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
@@ -19,6 +17,9 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include "h/done.h"
+#include <h/utils.h>
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT
@@ -54,15 +55,10 @@ 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;
 
-/*
- * external prototypes
- */
-char *getusername(void);
-
 /*
  * static prototypes
  */
@@ -82,23 +78,23 @@ main (int argc, char **argv)
     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;
 
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
-		case AMBIGSW: 
+		case AMBIGSW:
 		    ambigsw (cp, switches);
 		    done (1);
-		case UNKWNSW: 
+		case UNKWNSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
-		case HELPSW: 
+		case HELPSW:
 		    snprintf (buf, sizeof(buf), "%s [command ...]", invo_name);
 		    print_help (buf, switches, 1);
 		    done (0);
@@ -110,12 +106,12 @@ main (int argc, char **argv)
 		    biff = 1;
 		    continue;
 
-		case FORMSW: 
+		case FORMSW:
 		    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;
@@ -189,15 +185,17 @@ message_fd (char **vec)
     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. */
 
     if ((child_id = fork()) == NOTOK) {
 	/* fork error */
 	close (fd);
 	return header_fd ();
-    } else if (child_id) {
+    }
+    if (child_id) {
 	/* parent process */
 	if (!setjmp (myctx)) {
 	    SIGNAL (SIGALRM, alrmser);
@@ -217,7 +215,7 @@ message_fd (char **vec)
 	    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 {
 	    /*
@@ -233,11 +231,11 @@ message_fd (char **vec)
     /* child process */
     rewind (stdin);
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
-	_exit (-1);
+	_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);
+        _exit(1);
     }
 
     return NOTOK;
@@ -250,23 +248,34 @@ header_fd (void)
     int fd;
     char *nfs;
     char *tfile = 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. */
 
     rewind (stdin);
 
     /* get new format string */
     nfs = new_fs (form, format, SCANFMT);
-    scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0);
+    scan (stdin, 0, 0, nfs, width, 0, 0, NULL, 0L, 0, &scanl);
     scan_finished ();
-    if (newline)
-        write (fd, "\n\r", 2);
-    write (fd, scanl, strlen (scanl));
-    if (bell)
-        write (fd, "\007", 1);
+    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;
 }
@@ -290,19 +299,18 @@ alert (char *tty, int md)
     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;
     }
-
-    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)