* uip/mhlistsbr.c, uip/mhlsbr.c, uip/picksbr.c: cast

[mmh] / uip / viamail.c

diff --git a/uip/viamail.c b/uip/viamail.c
index bb5b12c..04a76d2 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -3,6 +3,10 @@
  * viamail.c -- send multiple files in a MIME message
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -11,8 +15,8 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
@@ -42,13 +46,12 @@ static struct swit switches[] = {
 #define VERSIONSW               9
     { "version", 0 },
 #define        HELPSW                 10
-    { "help", 4 },
+    { "help", 0 },
 #define DEBUGSW                11
     { "debug", -5 },
     { NULL, 0 }
 };
 
-extern int errno;
 extern int debugsw;
 extern int splitsw;
 extern int verbsw;
@@ -161,7 +164,7 @@ main (int argc, char **argv)
        adios (NULL, "missing -viamail \"mailpath\" switch");
 
     via_mail (f1, f2, f3, f4, f5, delay, f7);
-    /* NOTREACHED */
+    return 0;  /* dead code to satisfy the compiler */
 }
 
 
@@ -233,7 +236,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     if (verbsw)
        vec[vecp++] = "-verbose";
 
-    switch (sendsbr (vec, vecp, tmpfil, &st, 0)) {
+    switch (sendsbr (vec, vecp, tmpfil, &st, 0, (char *)0, 0)) {
        case DONE:
        case NOTOK:
            status++;
@@ -246,4 +249,5 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     if (unlink (tmpfil) == -1)
        advise (NULL, "unable to remove temp file %s", tmpfil);
     done (status);
+    return 1;
 }