Fixed mhical(1) exit status to reflect return status of icalparse().

[nmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 6f8ded3586caa928402876eff810ccf8f0a65f41..3563ae5fe70e1e5e8e1b87720e959622b093fbdc 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -11,17 +11,16 @@
  */
 
 #include "h/mh.h"
+#include "sbr/fmt_new.h"
 #include "scansbr.h"
 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
-#include "sbr/closefds.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
 #include "h/signals.h"
 #include <setjmp.h>
-#include "h/rcvmail.h"
 #include "h/fmt_scan.h"
 #include "h/tws.h"
 #include "h/mts.h"
@@ -82,7 +81,7 @@ int
 main (int argc, char **argv)
 {
     int md, vecp = 0;
-    char *cp, *user, buf[BUFSIZ], tty[BUFSIZ];
+    char *cp, *user, buf[BUFSIZ];
     char **argp, **arguments, *vec[MAXARGS];
     struct utmpx *utp;
 
@@ -150,27 +149,25 @@ main (int argc, char **argv)
     vec[vecp] = 0;
 
     if ((md = vecp ? message_fd (vec) : header_fd ()) == NOTOK)
-       exit (RCV_MBX);
-
-    user = getusername();
+       exit(1);
 
 #if HAVE_GETUTXENT
+    user = getusername(1);
+
     setutxent();
     while ((utp = getutxent()) != NULL) {
         if (utp->ut_type == USER_PROCESS && utp->ut_user[0] != 0
                && utp->ut_line[0] != 0
                && strncmp (user, utp->ut_user, sizeof(utp->ut_user)) == 0) {
-            strncpy (tty, utp->ut_line, sizeof(utp->ut_line));
-           alert (tty, md);
+           alert(utp->ut_line, md);
         }
     }
     endutxent();
 #else
-    NMH_UNUSED (tty);
     NMH_UNUSED (utp);
 #endif /* HAVE_GETUTXENT */
 
-    exit (RCV_MOK);
+    exit(0);
 }
 
 
@@ -240,7 +237,6 @@ message_fd (char **vec)
     rewind (stdin);
     if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK)
        _exit(1);
-    closefds (3);
     setpgid(0, getpid());      /* put in own process group */
     if (execvp (vec[0], vec) == NOTOK) {
         _exit(1);