Merge branch 'tmpfiles'

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 9dd862c7bc6da2e14ec3d00f671bd9c9043c6430..3bee075e038e6165f50593c1cb11a952154e60ef 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);
@@ -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 */
@@ -260,6 +256,7 @@ header_fd (void)
        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);