Changed a variable to unsigned and noted an argument as unused to silence compile...

[mmh] / uip / post.c

diff --git a/uip/post.c b/uip/post.c
index cd96ed7..2449d5f 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -20,19 +20,12 @@
 #include <h/mts.h>
 
 #include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 #ifdef SMTPMTS
 # include <mts/smtp/smtp.h>
@@ -146,6 +139,10 @@ static struct swit switches[] = {
     { "port server port name/number", 4 },
 #define TLSSW                   41
     { "tls", TLSminc(-3) },
+#define FILEPROCSW              42
+    { "fileproc", -4 },
+#define MHLPROCSW               43
+    { "mhlproc", -3 },
     { NULL, 0 }
 };
 
@@ -268,10 +265,10 @@ static char *fccfold[FCCS];       /* foldernames for FCC'ing       */
 
 static struct headers  *hdrtab;        /* table for the message we're doing */
 
-static struct mailname localaddrs={NULL};      /* local addrs     */
-static struct mailname netaddrs={NULL};                /* network addrs   */
-static struct mailname uuaddrs={NULL};         /* uucp addrs      */
-static struct mailname tmpaddrs={NULL};                /* temporary queue */
+static struct mailname localaddrs;             /* local addrs     */
+static struct mailname netaddrs;               /* network addrs   */
+static struct mailname uuaddrs;                        /* uucp addrs      */
+static struct mailname tmpaddrs;               /* temporary queue */
 
 #ifdef SMTPMTS
 static int snoop      = 0;
@@ -537,6 +534,18 @@ main (int argc, char **argv)
                case TLSSW:
                    tls++;
                    continue;
+
+               case FILEPROCSW:
+                   if (!(cp = *argp++) || *cp == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);
+                   fileproc = cp;
+                   continue;
+
+               case MHLPROCSW:
+                   if (!(cp = *argp++) || *cp == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);
+                   mhlproc = cp;
+                   continue;
            }
        }
        if (msg)
@@ -1595,12 +1604,10 @@ do_text (char *file, int fd)
  * SIGNAL HANDLING
  */
 
-static RETSIGTYPE
+static void
 sigser (int i)
 {
-#ifndef RELIABLE_SIGNALS
-    SIGNAL (i, SIG_IGN);
-#endif
+    NMH_UNUSED (i);
 
     unlink (tmpfil);
     if (msgflags & MINV)