X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/164be8e5e8b40ce4572281be26d423a9c9d595f3..c4c53777458bfcfd288d45b7708e52eb47c56405:/uip/viamail.c?ds=sidebyside

diff --git a/uip/viamail.c b/uip/viamail.c
index 2e1c51c9..82c7db58 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -18,46 +18,32 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 
-static struct swit switches[] = {
-#define	TOSW                    0
-    { "to mailpath", 0 },
-#define	FROMSW                  1
-    { "from mailpath", 0 },
-#define	SUBJECTSW               2
-    { "subject subject", 0 },
-#define	PARAMSW                 3
-    { "parameters arguments", 0 },
-#define	DESCRIPTSW              4
-    { "description text", 0 },
-#define	COMMENTSW               5
-    { "comment text", 0 },
-#define	DELAYSW                 6
-    { "delay seconds", 0 },
-#define	VERBSW                  7
-    { "verbose", 0 },
-#define	NVERBSW                 8
-    { "noverbose", 0 },
-#define VERSIONSW               9
-    { "version", 0 },
-#define	HELPSW                 10
-    { "help", 0 },
-#define DEBUGSW                11
-    { "debug", -5 },
-    { NULL, 0 }
-};
+#define VIAMAIL_SWITCHES \
+    X("to mailpath", 0, TOSW) \
+    X("from mailpath", 0, FROMSW) \
+    X("subject subject", 0, SUBJECTSW) \
+    X("parameters arguments", 0, PARAMSW) \
+    X("description text", 0, DESCRIPTSW) \
+    X("comment text", 0, COMMENTSW) \
+    X("delay seconds", 0, DELAYSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("debug", -5, DEBUGSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(VIAMAIL);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(VIAMAIL, switches);
+#undef X
 
 extern int debugsw;
 extern int splitsw;
 extern int verbsw;
 
-int ebcdicsw = 0;	/* hack for linking purposes */
-
-/* mhmisc.c */
-void set_endian (void);
-
-/* mhoutsbr.c */
-int writeBase64aux (FILE *, FILE *);
-
 /*
  * static prototypes
  */
@@ -70,6 +56,7 @@ main (int argc, char **argv)
     int delay = 0;
     char *f1 = NULL, *f2 = NULL, *f3 = NULL;
     char *f4 = NULL, *f5 = NULL, *f7 = NULL;
+    static char postpath[PATH_MAX];
     char *cp, buf[BUFSIZ];
     char **argp, **arguments;
 
@@ -97,10 +84,10 @@ main (int argc, char **argv)
 	    case HELPSW: 
 		snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
 		print_help (buf, switches, 1);
-		done (1);
+		done (0);
 	    case VERSIONSW:
 		print_version(invo_name);
-		done (1);
+		done (0);
     
 	    case TOSW:
 		if (!(f1 = *argp++))
@@ -152,11 +139,37 @@ main (int argc, char **argv)
 	}
     }
 
-    set_endian ();
-
     if (!f1)
 	adios (NULL, "missing -viamail \"mailpath\" switch");
 
+    /* viamail doesn't read the context and postproc isn't always what
+       we want, such as when running make distcheck.  If we have the
+       absolute path, set postproc to point to post in the same
+       directory as this executable.
+       This could be generalized to handle relative paths (by
+       converting to absolute), to find the full path from PATH given
+       just the basename, and to squash out ../ but it's only needed
+       here.  viamail is typically called from sendfiles, which
+       provides the absolute path.
+     */
+    if (argv[0]  &&  argv[0][0] == '/'  &&
+	    strlen(argv[0]) - 3 < sizeof postpath) {
+	strncpy (postpath, argv[0], sizeof postpath - 1);
+	postpath[sizeof postpath - 1] = '\0';
+	if ((cp = strrchr (postpath, '/'))) {
+	    struct stat st;
+
+	    *(cp + 1) = '\0';
+	    /* strlen ("post") <= sizeof postpath - (cp - postpath) - 2
+	       but use strncat just in case the code above changes. */
+	    strncat (postpath, "post", sizeof postpath - (cp - postpath) - 2);
+
+	    if (stat (postpath, &st) == OK) {
+		postproc = postpath;
+	    }
+	}
+    }
+
     via_mail (f1, f2, f3, f4, f5, delay, f7);
     return 0;  /* dead code to satisfy the compiler */
 }
@@ -185,7 +198,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     strncpy (tmpfil, tfile, sizeof(tmpfil));
 
     if (!strchr(mailsw, '@'))
-	mailsw = concat (mailsw, "@", LocalName (), NULL);
+	mailsw = concat (mailsw, "@", LocalName (0), NULL);
     fprintf (fp, "To: %s\n", mailsw);
 
     if (subjsw)
@@ -193,7 +206,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
 
     if (fromsw) {
 	if (!strchr(fromsw, '@'))
-	    fromsw = concat (fromsw, "@", LocalName (), NULL);
+	    fromsw = concat (fromsw, "@", LocalName (0), NULL);
 	fprintf (fp, "From: %s\n", fromsw);
     }