X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_compile.c;h=014733427dcd6261cded324b744e0cac125cdc7b;hb=492101aee1185135f239b3aabd5b2494f748c931;hp=27f1a1ed3003088383daf741201a33a3c293bb20;hpb=de3c9caebeaf5551e931f8875dd9cd222c63f020;p=mmh

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 27f1a1e..0147334 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -47,6 +47,7 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -239,6 +240,7 @@ static struct ftable functable[] = {
 #define NEWCOMP(cm,name) do { \
 	cm = ((struct comp *) calloc(1, sizeof (struct comp)));\
 	cm->c_name = getcpy(name);\
+	cm->c_refcount++;\
 	ncomp++;\
 	i = CHASH(name);\
 	cm->c_next = wantcomp[i];\
@@ -262,10 +264,10 @@ static struct ftable functable[] = {
 	} while (0)
 
 #define LV(type, value)		do { NEW(type,0,0); fp->f_value = (value); } while (0)
-#define LS(type, str)		do { NEW(type,0,0); fp->f_text = (str); fp->f_flags |= FF_STRALLOC; } while (0)
+#define LS(type, str)		do { NEW(type,0,0); fp->f_text = getcpy(str); fp->f_flags |= FF_STRALLOC; } while (0)
 
 #define PUTCOMP(comp)		do { NEW(FT_COMP,0,0); ADDC(comp); } while (0)
-#define PUTLIT(str)		do { NEW(FT_LIT,0,0); fp->f_text = getcpy(str); } while (0)
+#define PUTLIT(str)		do { NEW(FT_LIT,0,0); fp->f_text = getcpy(str); fp->f_flags |= FF_STRALLOC; } while (0)
 #define PUTC(c)			do { NEW(FT_CHAR,0,0); fp->f_char = (c); } while (0)
 
 static char *format_string;
@@ -353,10 +355,6 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 	comptable_initialized = 1;
     }
 
-    /* init the component hash table. */
-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
-	wantcomp[i] = 0;
-
     memset((char *) &fmt_mnull, 0, sizeof(fmt_mnull));
 
     /* it takes at least 4 char to generate one format so we
@@ -372,7 +370,6 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
     if (next_fp == NULL)
 	adios (NULL, "unable to allocate format storage");
 
-    ncomp = 0;
     infunction = 0;
 
     cp = compile(format_string);
@@ -851,6 +848,7 @@ fmt_free(struct format *fmt, int reset_comptable)
 	    	free(fp->f_text);
 	    if (fp->f_flags & FF_COMPREF)
 	    	free_component(fp->f_comp);
+	    fp++;
 	}
 	free(fmt);
     }
@@ -875,13 +873,115 @@ fmt_findcomp(char *component)
 }
 
 /*
+ * Like fmt_findcomp, but case-insensitive.
+ */
+
+struct comp *
+fmt_findcasecomp(char *component)
+{
+    struct comp *cm;
+
+    for (cm = wantcomp[CHASH(component)]; cm; cm = cm->c_next)
+    	if (mh_strcasecmp(component, cm->c_name) == 0)
+	    break;
+
+    return cm;
+}
+
+/*
+ * Add an entry to the component hash table
+ *
+ * Returns true if the component was added, 0 if it already existed.
+ *
+ */
+
+int
+fmt_addcompentry(char *component)
+{
+    struct comp *cm;
+    int i;
+
+    FINDCOMP(cm, component);
+
+    if (cm)
+    	return 0;
+
+    NEWCOMP(cm, component);
+
+    /*
+     * ncomp is really meant for fmt_compile() and this function is
+     * meant to be used outside of it.  So decrement it just to be safe
+     * (internal callers should be using NEWCOMP()).
+     */
+
+    ncomp--;
+
+    return 1;
+}
+
+/*
+ * Add a string to a component hash table entry.
+ *
+ * Note the special handling for components marked with CT_ADDR.  The comments
+ * in fmt_scan.h explain this in more detail.
+ */
+
+int
+fmt_addcomptext(char *component, char *text)
+{
+    int i, found = 0, bucket = CHASH(component);
+    struct comp *cptr = wantcomp[bucket];
+    char *cp;
+
+    while (cptr) {
+    	if (mh_strcasecmp(component, cptr->c_name) == 0) {
+	    found++;
+	    if (! cptr->c_text) {
+	    	cptr->c_text = getcpy(text);
+	    } else {
+	    	i = strlen(cp = cptr->c_text) - 1;
+		if (cp[i] == '\n') {
+		    if (cptr->c_type & CT_ADDR) {
+		    	cp[i] = '\0';
+			cp = add(",\n\t", cp);
+		    } else {
+		    	cp = add("\t", cp);
+		    }
+		}
+		cptr->c_text = add(text, cp);
+	    }
+	}
+	cptr = cptr->c_next;
+    }
+
+    return found ? bucket : -1;
+}
+
+/*
+ * Append text to a component we've already found.  See notes in fmt_scan.h
+ * for more information.
+ */
+
+void
+fmt_appendcomp(int bucket, char *component, char *text)
+{
+    struct comp *cptr;
+
+    if (bucket != -1) {
+    	for (cptr = wantcomp[bucket]; cptr; cptr = cptr->c_next)
+	    if (mh_strcasecmp(component, cptr->c_name) == 0)
+	    	cptr->c_text = add(text, cptr->c_text);
+    }
+}
+
+/*
  * Free and reset our component hash table
  */
 
 static void
 free_comptable(void)
 {
-    int i;
+    unsigned int i;
     struct comp *cm, *cm2;
 
     for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) {
@@ -893,6 +993,8 @@ free_comptable(void)
 	}
 	wantcomp[i] = 0;
     }
+
+    ncomp = 0;
 }
 
 /*