Try using -man instead of -mandoc in test-manpages on OpenBSD

[nmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 4409e628323bfab20b8536e61fdc97ee6ee1b407..23e0726382094e5603db0b41af451910e2386ff1 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -856,6 +856,24 @@ fmt_free(struct format *fmt, int reset_comptable)
        free_comptable();
 }
 
        free_comptable();
 }
 

+/*
+ * Free just the text strings from all of the component hash table entries
+ */
+
+void
+fmt_freecomptext(void)
+{
+    unsigned int i;
+    struct comp *cm;
+
+    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
+       for (cm = wantcomp[i]; cm; cm = cm->c_next)
+           if (cm->c_text) {
+               free(cm->c_text);
+               cm->c_text = NULL;
+           }
+}
+

 /*
  * Find a component in our hash table.  This is just a public interface to
  * the FINDCOMP macro, so we don't have to expose our hash table.
 /*
  * Find a component in our hash table.  This is just a public interface to
  * the FINDCOMP macro, so we don't have to expose our hash table.


@@ -881,7 +899,7 @@ fmt_findcasecomp(char *component)
     struct comp *cm;
 
     for (cm = wantcomp[CHASH(component)]; cm; cm = cm->c_next)
     struct comp *cm;
 
     for (cm = wantcomp[CHASH(component)]; cm; cm = cm->c_next)

-       if (mh_strcasecmp(component, cm->c_name) == 0)
+       if (strcasecmp(component, cm->c_name ? cm->c_name : "") == 0)

            break;
 
     return cm;
            break;
 
     return cm;


@@ -933,18 +951,18 @@ fmt_addcomptext(char *component, char *text)
     char *cp;
 
     while (cptr) {
     char *cp;
 
     while (cptr) {

-       if (mh_strcasecmp(component, cptr->c_name) == 0) {
+       if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0) {

            found++;
            if (! cptr->c_text) {
            found++;
            if (! cptr->c_text) {

-               cptr->c_text = getcpy(text);
+               cptr->c_text = getcpy(text);

            } else {
            } else {

-               i = strlen(cp = cptr->c_text) - 1;
+               i = strlen(cp = cptr->c_text) - 1;

                if (cp[i] == '\n') {
                    if (cptr->c_type & CT_ADDR) {
                if (cp[i] == '\n') {
                    if (cptr->c_type & CT_ADDR) {

-                       cp[i] = '\0';
+                       cp[i] = '\0';

                        cp = add(",\n\t", cp);
                    } else {
                        cp = add(",\n\t", cp);
                    } else {

-                       cp = add("\t", cp);
+                       cp = add("\t", cp);

                    }
                }
                cptr->c_text = add(text, cp);
                    }
                }
                cptr->c_text = add(text, cp);


@@ -968,7 +986,7 @@ fmt_appendcomp(int bucket, char *component, char *text)
 
     if (bucket != -1) {
        for (cptr = wantcomp[bucket]; cptr; cptr = cptr->c_next)
 
     if (bucket != -1) {
        for (cptr = wantcomp[bucket]; cptr; cptr = cptr->c_next)

-           if (mh_strcasecmp(component, cptr->c_name) == 0)
+           if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0)

                cptr->c_text = add(text, cptr->c_text);
     }
 }
                cptr->c_text = add(text, cptr->c_text);
     }
 }