X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/halibut/blobdiff_plain/d7482997dd1ca71b70df43c15dd5956f435a1a7e..eb4d33e66b85887e34536237e2500075fcd48e5b:/main.c

diff --git a/main.c b/main.c
index 64f1869..b509928 100644
--- a/main.c
+++ b/main.c
@@ -2,6 +2,7 @@
  * main.c: command line parsing and top level
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "halibut.h"
@@ -10,24 +11,42 @@ static void dbg_prtsource(paragraph *sourceform);
 static void dbg_prtwordlist(int level, word *w);
 static void dbg_prtkws(keywordlist *kws);
 
+static const struct backend {
+    char *name;
+    void (*func)(paragraph *, keywordlist *, indexdata *);
+    paragraph *(*filename)(char *filename);
+    int bitfield;
+} backends[] = {
+    {"text", text_backend, text_config_filename, 0x0001},
+    {"xhtml", xhtml_backend, xhtml_config_filename, 0x0002},
+    {"html", xhtml_backend, xhtml_config_filename, 0x0002},
+    {"hlp", whlp_backend, whlp_config_filename, 0x0004},
+    {"whlp", whlp_backend, whlp_config_filename, 0x0004},
+    {"winhelp", whlp_backend, whlp_config_filename, 0x0004},
+    {"man", man_backend, man_config_filename, 0x0008},
+};
+
 int main(int argc, char **argv) {
     char **infiles;
-    char *outfile;
     int nfiles;
     int nogo;
     int errs;
     int reportcols;
     int debug;
+    int backendbits;
+    int k, b;
+    paragraph *cfg, *cfg_tail;
 
     /*
      * Set up initial (default) parameters.
      */
     infiles = mknewa(char *, argc);
-    outfile = NULL;
     nfiles = 0;
     nogo = errs = FALSE;
     reportcols = 0;
     debug = 0;
+    backendbits = 0;
+    cfg = cfg_tail = NULL;
 
     if (argc == 1) {
 	usage();
@@ -60,7 +79,27 @@ int main(int argc, char **argv) {
 			    val = p;
 			} else
 			    val = NULL;
-			if (!strcmp(opt, "-help")) {
+
+			assert(opt[0] == '-');
+			for (k = 0; k < (int)lenof(backends); k++)
+			    if (!strcmp(opt+1, backends[k].name)) {
+				backendbits |= backends[k].bitfield;
+				if (val) {
+				    paragraph *p = backends[k].filename(val);
+				    assert(p);
+				    if (cfg_tail)
+					cfg_tail->next = p;
+				    else
+					cfg = p;
+				    while (p->next)
+					p = p->next;
+				    cfg_tail = p;
+				}
+				break;
+			    }
+			if (k < (int)lenof(backends)) {
+			    /* do nothing */;
+			} else if (!strcmp(opt, "-help")) {
 			    help();
 			    nogo = TRUE;
 			} else if (!strcmp(opt, "-version")) {
@@ -70,11 +109,6 @@ int main(int argc, char **argv) {
 				   !strcmp(opt, "-license")) {
 			    licence();
 			    nogo = TRUE;
-			} else if (!strcmp(opt, "-output")) {
-			    if (!val)
-				errs = TRUE, error(err_optnoarg, opt);
-			    else
-				outfile = val;
 			} else if (!strcmp(opt, "-precise")) {
 			    reportcols = 1;
 			} else {
@@ -112,7 +146,7 @@ int main(int argc, char **argv) {
 			break;
 		    }
 		    break;
-		  case 'o':
+		  case 'C':
 		    /*
 		     * Option requiring parameter.
 		     */
@@ -129,8 +163,50 @@ int main(int argc, char **argv) {
 		     * Now c is the option and p is the parameter.
 		     */
 		    switch (c) {
-		      case 'o':
-			outfile = p;
+		      case 'C':
+			/*
+			 * -C means we split our argument up into
+			 * colon-separated chunks and assemble them
+			 * into a config paragraph.
+			 */
+			{
+			    wchar_t *keywords;
+			    char *q;
+			    wchar_t *u;
+			    paragraph *para;
+
+			    keywords = mknewa(wchar_t, 2+strlen(p));
+
+			    u = keywords;
+			    q = p;
+
+			    while (*q) {
+				if (*q == ':') {
+				    *u++ = L'\0';
+				} else {
+				    if (*q == '\\' && q[1])
+					q++;
+				    /* FIXME: lacks charset flexibility */
+				    *u++ = *q;
+				}
+				q++;
+			    }
+			    *u = L'\0';
+
+			    para = mknew(paragraph);
+			    memset(para, 0, sizeof(*para));
+			    para->type = para_Config;
+			    para->keyword = keywords;
+			    para->next = NULL;
+			    para->fpos.filename = "<command line>";
+			    para->fpos.line = para->fpos.col = -1;
+
+			    if (cfg_tail)
+				cfg_tail->next = para;
+			    else
+				cfg = para;
+			    cfg_tail = para;
+			}
 			break;
 		    }
 		    p = NULL;	       /* prevent continued processing */
@@ -190,6 +266,21 @@ int main(int argc, char **argv) {
 	if (!sourceform)
 	    exit(EXIT_FAILURE);
 
+	/*
+	 * Append the config directives acquired from the command
+	 * line.
+	 */
+	{
+	    paragraph *end;
+
+	    end = sourceform;
+	    while (end && end->next)
+		end = end->next;
+	    assert(end);
+
+	    end->next = cfg;
+	}
+
 	sfree(in.pushback);
 
 	mark_attr_ends(sourceform);
@@ -214,9 +305,15 @@ int main(int argc, char **argv) {
 	    dbg_prtsource(sourceform);
 	}
 
-	text_backend(sourceform, keywords, idx);
-	xhtml_backend(sourceform, keywords, idx);
-	whlp_backend(sourceform, keywords, idx);
+	/*
+	 * Run the selected set of backends.
+	 */
+	for (k = b = 0; k < (int)lenof(backends); k++)
+	    if (b != backends[k].bitfield) {
+		b = backends[k].bitfield;
+		if (backendbits == 0 || (backendbits & b))
+		    backends[k].func(sourceform, keywords, idx);
+	    }
 
 	free_para_list(sourceform);
 	free_keywords(keywords);