Removed msh relics from scansbr.c, including a global.

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 9dd862c7bc6da2e14ec3d00f671bd9c9043c6430..d91b6a4ea02cf63f8a6f75b60adc2756230c44fc 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -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;
@@ -197,6 +192,7 @@ message_fd (char **vec)
        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 */
@@ -255,21 +251,24 @@ 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;
     }
+    (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));
+    write (fd, charstring_buffer (scanl), charstring_bytes (scanl));
+    charstring_free (scanl);
     if (bell)
         write (fd, "\007", 1);