Merge branch 'tmpfiles'

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 6282d52233fdf54bd62be8ec153d0ce659cc3214..3bee075e038e6165f50593c1cb11a952154e60ef 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -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,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);
@@ -164,6 +161,9 @@ main (int argc, char **argv)
         }
     }
     endutxent();
+#else
+    NMH_UNUSED (tty);
+    NMH_UNUSED (utp);
 #endif /* HAVE_GETUTXENT */
 
     exit (RCV_MOK);
@@ -183,12 +183,16 @@ static int
 message_fd (char **vec)
 {
     pid_t child_id;
-    int bytes, fd, seconds;
-    char tmpfil[BUFSIZ];
+    int bytes, seconds;
+    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 */
@@ -233,8 +237,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;
 }
 
 
@@ -245,9 +252,11 @@ header_fd (void)
     char *nfs;
     char *tfile = 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);
 
@@ -265,6 +274,7 @@ header_fd (void)
 }
 
 
+#if HAVE_GETUTXENT
 static void
 alert (char *tty, int md)
 {
@@ -302,4 +312,4 @@ alert (char *tty, int md)
 
     close (td);
 }
-
+#endif /* HAVE_GETUTXENT */