pending-release-notes: add mhshow's "-prefer", and mh-format's %(kibi/kilo)

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 760d22dc839ed25b06e59b0ad44a5be2c7f0c066..24a931b7243181692882850d51da93c57d60bf4a 100644 (file)
--- 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;
 
@@ -81,13 +81,8 @@ 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], 1)) { return 1; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -96,14 +91,14 @@ main (int argc, char **argv)
     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);
@@ -115,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;
@@ -189,13 +184,15 @@ message_fd (char **vec)
 {
     pid_t child_id;
     int bytes, seconds;
-    /* volatile to prevent "might be clobbered" warning from gcc: */
-    volatile int fd;
-    char tmpfil[BUFSIZ];
+    int fd;
+    char *tfile;
     struct stat st;
 
-    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 */
@@ -254,24 +251,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());
         return NOTOK;
     }
-    unlink (tfile);
+    (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;
 }