X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/cb2601116a7c03983ba02eec823096ed0a78283a..0b0d96e4d473ab8706d0a7246aee28bf31f5edb2:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 53b61f98..fc0a1a10 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -44,55 +44,38 @@
 
 #define	QUOTE	'\\'
 
-static struct swit mhlswitches[] = {
-#define	BELLSW         0
-    { "bell", 0 },
-#define	NBELLSW        1
-    { "nobell", 0 },
-#define	CLRSW          2
-    { "clear", 0 },
-#define	NCLRSW         3
-    { "noclear", 0 },
-#define	FOLDSW         4
-    { "folder +folder", 0 },
-#define	FORMSW         5
-    { "form formfile", 0 },
-#define	PROGSW         6
-    { "moreproc program", 0 },
-#define	NPROGSW        7
-    { "nomoreproc", 0 },
-#define	LENSW          8
-    { "length lines", 0 },
-#define	WIDTHSW        9
-    { "width columns", 0 },
-#define	SLEEPSW       10
-    { "sleep seconds",  0 },
-#define	BITSTUFFSW    11
-    { "dashstuffing", -12 },	/* interface from forw */
-#define	NBITSTUFFSW   12
-    { "nodashstuffing", -14 },	/* interface from forw */
-#define VERSIONSW     13
-    { "version", 0 },
-#define	HELPSW        14
-    { "help", 0 },
-#define	FORW1SW       15
-    { "forward", -7 },		/* interface from forw */
-#define	FORW2SW       16
-    { "forwall", -7 },		/* interface from forw */
-#define	DGSTSW        17
-    { "digest list", -6 },
-#define VOLUMSW       18
-    { "volume number", -6 },
-#define ISSUESW       19
-    { "issue number", -5 },
-#define NBODYSW       20
-    { "nobody", -6 },
-#define FMTPROCSW     21
-    { "fmtproc program", 0 },
-#define NFMTPROCSW    22
-    { "nofmtproc", 0 },
-    { NULL, 0 }
-};
+#define MHL_SWITCHES \
+    X("bell", 0, BELLSW) \
+    X("nobell", 0, NBELLSW) \
+    X("clear", 0, CLRSW) \
+    X("noclear", 0, NCLRSW) \
+    X("folder +folder", 0, FOLDSW) \
+    X("form formfile", 0, FORMSW) \
+    X("moreproc program", 0, PROGSW) \
+    X("nomoreproc", 0, NPROGSW) \
+    X("length lines", 0, LENSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("sleep seconds", 0, SLEEPSW) \
+    X("dashstuffing", -12, BITSTUFFSW)    /* interface from forw */ \
+    X("nodashstuffing", -14, NBITSTUFFSW) /* interface from forw */ \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("forward", -7, FORW1SW)             /* interface from forw */ \
+    X("forwall", -7, FORW2SW)             /* interface from forw */ \
+    X("digest list", -6, DGSTSW) \
+    X("volume number", -6, VOLUMSW) \
+    X("issue number", -5, ISSUESW) \
+    X("nobody", -6, NBODYSW) \
+    X("fmtproc program", 0, FMTPROCSW) \
+    X("nofmtproc", 0, NFMTPROCSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MHL);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MHL, mhlswitches);
+#undef X
 
 #define NOCOMPONENT 0x000001	/* don't show component name         */
 #define UPPERCASE   0x000002	/* display in all upper case         */
@@ -1018,7 +1001,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 	switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
 	    case FLD: 
 	    case FLDPLUS: 
-	        bucket = fmt_addcomp(name, buf);
+	        bucket = fmt_addcomptext(name, buf);
 		for (ip = ignores; *ip; ip++)
 		    if (!mh_strcasecmp (name, *ip)) {
 			while (state == FLDPLUS) {
@@ -1168,16 +1151,17 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 
     if (!(c1->c_flags & ADDRFMT)) {
 	if (c1->c_c_text)
-	    c1->c_c_text->c_text = getcpy (ap);
+	    c1->c_c_text->c_text = ap;
 	if ((cp = strrchr(ap, '\n')))	/* drop ending newline */
 	    if (!cp[1])
 		*cp = 0;
 
-	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);
+	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
+		  dat, NULL);
 	/* Don't need to append a newline, dctime() already did */
 	c2->c_text = getcpy (buffer);
 
-	free (ap);
+	/* ap is now owned by the component struct, so do NOT free it here */
 	return;
     }
 
@@ -1206,7 +1190,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	    p->pq_error = NULL;
 	}
 
-	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);
+	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
+		  dat, NULL);
 	if (*buffer) {
 	    if (c2->c_text)
 		c2->c_text = add (",\n", c2->c_text);
@@ -1888,7 +1873,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp)
 
 	for (a = arglist_head, i = 1; a != NULL; a = a->a_next, i++) {
 	    args[i] = mh_xmalloc(BUFSIZ);
-	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat);
+	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
 	    /*
 	     * fmt_scan likes to put a trailing newline at the end of the
 	     * format string.  If we have one, get rid of it.