Whoever originally added the -help switch to all the commands got too cute and

[mmh] / uip / rcvtty.c

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index cb194dd..69a9031 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -10,6 +10,7 @@
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <zotnet/tws/tws.h>
+#include <zotnet/mts/mts.h>
 #include <signal.h>
 #include <fcntl.h>
 
@@ -47,7 +48,7 @@ static struct swit switches[] = {
 #define VERSIONSW 8
     { "version", 0 },
 #define        HELPSW  9
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -167,6 +168,7 @@ main (int argc, char **argv)
 
     fclose (uf);
     exit (RCV_MOK);
+    return 0;  /* dead code to satisfy the compiler */
 }
 
 
@@ -190,13 +192,13 @@ message_fd (char **vec)
     struct stat st;
 
 #ifdef HAVE_MKSTEMP
-    unlink (mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
+    fd = mkstemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil)));
 #else
     unlink (mktemp (strncpy (tmpfil, "/tmp/rcvttyXXXXX", sizeof(tmpfil))));
-#endif
     if ((fd = open (tmpfil, O_RDWR | O_CREAT | O_TRUNC, 0600)) == NOTOK)
        return header_fd ();
     unlink (tmpfil);
+#endif
 
     if ((child_id = vfork()) == NOTOK) {
        /* fork error */
@@ -243,6 +245,7 @@ message_fd (char **vec)
     setpgid ((pid_t) 0, getpid ());    /* put in own process group */
     execvp (vec[0], vec);
     _exit (-1);
+    return 1;  /* dead code to satisfy compiler */
 }