X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bd2b8bee74ecbc7d94b950790762913d3fcd9a64..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/rcvtty.c?ds=inline

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 85b9a484..291cb69c 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -54,7 +54,7 @@ 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;
 
@@ -69,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
@@ -79,29 +81,24 @@ main (int argc, char **argv)
     char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
 
-    /* read user profile/context */
-    context_read();
+    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);
@@ -113,12 +110,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;
@@ -164,6 +161,9 @@ main (int argc, char **argv)
         }
     }
     endutxent();
+#else
+    NMH_UNUSED (tty);
+    NMH_UNUSED (utp);
 #endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);
@@ -183,72 +183,53 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
-    int bytes, fd, seconds, bailout;
-    char tmpfil[BUFSIZ];
+    int bytes, seconds;
+    int fd;
+    char *tfile;
     struct stat st;
 
-    bailout = 0;
-    fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
-    unlink (tmpfil);
+    if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
+	advise(NULL, "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);
 	    bytes = fstat(fileno (stdin), &st) != NOTOK ? (int) st.st_size : 100;
 
 	    /* amount of time to wait depends on message size */
 	    if (bytes <= 100) {
-
 		/* give at least 5 minutes */
 		seconds = 300;
-
 	    } else if (bytes >= 90000) {
-
 		/* but 30 minutes should be long enough */
 		seconds = 1800;
-
 	    } else {
-
 		seconds = (bytes / 60) + 300;
-
 	    }
-
 	    alarm ((unsigned int) seconds);
 	    pidwait(child_id, OK);
 	    alarm (0);
 
+	    if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0)
+		return fd;
 	} else {
-
 	    /*
 	     * Ruthlessly kill the child and anything
 	     * else in its process group.
 	     */
 	    killpg(child_id, SIGKILL);
-	    bailout = 1;
-
-	}
-
-	if (bailout) {
-
-            if (fstat (fd, &st) != NOTOK && st.st_size > (off_t) 0) {
-	        return fd;
-	    }
-
-	} else {
-
-	    close (fd);
-	    return header_fd ();
-
 	}
+	close (fd);
+	return header_fd ();
     }
 
     /* child process */
@@ -257,8 +238,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);
+    if (execvp (vec[0], vec) == NOTOK) {
+        _exit (-1);
+    }
+
+    return NOTOK;
 }
 
 
@@ -268,27 +252,40 @@ header_fd (void)
     int fd;
     char *nfs;
     char *tfile = NULL;
+    charstring_t scanl = NULL;
 
-    tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
-    if (tfile == NULL) return NOTOK;
-    unlink (tfile);
+    if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) {
+	advise(NULL, "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;
 }
 
 
+#if HAVE_GETUTXENT
 static void
 alert (char *tty, int md)
 {
@@ -326,4 +323,4 @@ alert (char *tty, int md)
 
     close (td);
 }
-
+#endif /* HAVE_GETUTXENT */