Fix invalid pointer arithmetic.

[nmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index dbd09645827203b7d446468ec7ba7e33e5c14bf3..2ad46cf57e9d7efe13c8b4d1ba6d06359e5641fa 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -1,6 +1,4 @@
-
-/*
- * fmt_compile.c -- "compile" format strings for fmt_scan
+/* fmt_compile.c -- "compile" format strings for fmt_scan
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -37,7 +35,7 @@
  *
  * - Add code to fmttest.c to display your new function.
  *
- * - Document the new function in the mh-format(5) man page.
+ * - Document the new function in mh-format(5).
  *
  */
 
@@ -48,6 +46,7 @@
 #include <h/fmt_compile.h>
 #include <h/mts.h>
 #include <h/utils.h>
+#include "terminal.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -281,11 +280,12 @@ static struct colormap colortable[] = {
 /*
  * Find a component in the hash table.
  */
-#define FINDCOMP(comp,name) \
-               for (comp = wantcomp[CHASH(name)]; \
-                    comp && strcmp(comp->c_name,name); \
-                    comp = comp->c_next) \
-               ;
+#define FINDCOMP(comp,name) do { \
+        for (comp = wantcomp[CHASH(name)]; \
+            comp && strcmp(comp->c_name,name); \
+            comp = comp->c_next) \
+        ; \
+    } while (0)
 
 /* Add new component to the hash table */
 #define NEWCOMP(cm,name) do { \
@@ -298,9 +298,8 @@ static struct colormap colortable[] = {
        wantcomp[i] = cm; \
        } while (0)
 
-#define NEWFMT (next_fp++)
 #define NEW_FP(type,fill,wid) do {\
-       fp=NEWFMT; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \
+       fp=next_fp++; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \
        } while (0)
 
 /* Add (possibly new) component to the hash table */
@@ -353,11 +352,11 @@ lookup(char *name)
 
     while ((nm = t->name)) {
        if (*nm == c && strcmp (nm, name) == 0)
-           return (ftbl = t);
+           return ftbl = t;
 
        t++;
     }
-    return (struct ftable *) 0;
+    return NULL;
 }
 
 
@@ -367,7 +366,7 @@ compile_error(char *str, char *cp)
     int i, errpos, errctx;
 
     errpos = cp - format_string;
-    errctx = errpos > 20 ? 20 : errpos;
+    errctx = min(errpos, 20);
     usr_fstring[errpos] = '\0';
 
     for (i = errpos-errctx; i < errpos; i++) {
@@ -420,7 +419,7 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
     *fmt = formatvec;
 
     free(format_string);
-    return (ncomp);
+    return ncomp;
 }
 
 static char *
@@ -445,7 +444,7 @@ compile (char *sp)
            break;
        }
        if (c == 0)
-           return (cp);
+           return cp;
 
        switch (c = *++cp) {
        case '%':
@@ -457,7 +456,7 @@ compile (char *sp)
        case '>':
        case '?':
        case ']':
-           return (cp);
+           return cp;
 
        case '<':
            cp = do_if(++cp);
@@ -489,9 +488,7 @@ do_spec(char *sp)
 {
     char *cp = sp;
     int c;
-#ifndef        lint
     int ljust = 0;
-#endif /* not lint */
     int wid = 0;
     char fill = ' ';
 
@@ -532,7 +529,7 @@ do_spec(char *sp)
     fp->f_width = wid;
     fp->f_fill = fill;
 
-    return (cp);
+    return cp;
 }
 
 /*
@@ -562,7 +559,7 @@ do_name(char *sp, int preprocess)
            CERROR("component used as both date and address");
        }
        if (cm->c_tws) {
-           memset (cm->c_tws, 0, sizeof *cm->c_tws);
+           ZERO(cm->c_tws);
        } else {
            NEW0(cm->c_tws);
        }
@@ -575,7 +572,7 @@ do_name(char *sp, int preprocess)
     case FT_GETMYMBOX:
     case FT_GETMYADDR:
        if (!primed) {
-           ismymbox ((struct mailname *) 0);
+           ismymbox(NULL);
            primed++;
        }
        /* FALLTHRU */
@@ -596,7 +593,7 @@ do_name(char *sp, int preprocess)
        cm->c_type |= CT_ADDR;
        break;
     }
-    return (cp);
+    return cp;
 }
 
 /*
@@ -735,7 +732,7 @@ do_func(char *sp)
     }
 
     case TF_NOW:
-       LV(t->f_type, time((time_t *) 0));
+       LV(t->f_type, time(NULL));
        break;
 
     case TF_EXPR_SV:
@@ -760,7 +757,7 @@ do_func(char *sp)
        CERROR("')' expected");
     }
     --infunction;
-    return (cp);
+    return cp;
 }
 
 /*
@@ -779,13 +776,13 @@ do_expr (char *sp, int preprocess)
     } else if (c == '(') {
        cp = do_func (cp);
     } else if (c == ')') {
-       return (--cp);
+       return --cp;
     } else if (c == '%' && *cp == '<') {
        cp = do_if (cp+1);
     } else {
        CERROR ("'(', '{', '%<' or ')' expected");
     }
-    return (cp);
+    return cp;
 }
 
 /*
@@ -799,7 +796,7 @@ do_expr (char *sp, int preprocess)
  *
  * Okay, got some more information on this from John L. Romine!  From an
  * email he sent to the nmh-workers mailing list on December 2, 2010, he
- * explains it thusly:
+ * explains it so:
  *
  *    In this case (scan, formatsbr) it has to do with an extension to
  *    the mh-format syntax to allow for looping.
@@ -857,7 +854,7 @@ do_if(char *sp)
 {
     char *cp = sp;
     struct format *fexpr,
-                          *fif = (struct format *)NULL;
+        *fif = NULL;
     int c = '<';
 
     for (;;) {
@@ -898,7 +895,7 @@ do_if(char *sp)
            fif = fp;                   /* loc of GOTO */
            fexpr->f_skip = next_fp - fexpr;
 
-           fexpr = (struct format *)NULL;/* no extra ENDIF */
+           fexpr = NULL;               /* no extra ENDIF */
 
            cp = compile (cp);          /* compile ELSE stmts */
            fif->f_skip = next_fp - fif;
@@ -922,7 +919,7 @@ do_if(char *sp)
     if (fexpr)                         /* IF ... [ELSIF ...] ENDIF */
        fexpr->f_skip = next_fp - fexpr;
 
-    return (cp);
+    return cp;
 }
 
 /*
@@ -968,9 +965,9 @@ fmt_freecomptext(void)
     unsigned int i;
     struct comp *cm;
 
-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
+    for (i = 0; i < DIM(wantcomp); i++)
         for (cm = wantcomp[i]; cm; cm = cm->c_next) {
-            mh_xfree(cm->c_text);
+            free(cm->c_text);
             cm->c_text = NULL;
         }
 }
@@ -1000,7 +997,7 @@ fmt_findcasecomp(char *component)
     struct comp *cm;
 
     for (cm = wantcomp[CHASH(component)]; cm; cm = cm->c_next)
-       if (strcasecmp(component, cm->c_name ? cm->c_name : "") == 0)
+       if (strcasecmp(component, FENDNULL(cm->c_name)) == 0)
            break;
 
     return cm;
@@ -1052,7 +1049,7 @@ fmt_addcomptext(char *component, char *text)
     char *cp;
 
     while (cptr) {
-       if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0) {
+       if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0) {
            found++;
            if (! cptr->c_text) {
                cptr->c_text = getcpy(text);
@@ -1087,7 +1084,7 @@ fmt_appendcomp(int bucket, char *component, char *text)
 
     if (bucket != -1) {
        for (cptr = wantcomp[bucket]; cptr; cptr = cptr->c_next)
-           if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0)
+           if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0)
                cptr->c_text = add(text, cptr->c_text);
     }
 }
@@ -1104,7 +1101,7 @@ fmt_nextcomp(struct comp *comp, unsigned int *bucket)
     else
        comp = comp->c_next;
 
-    while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) {
+    while (comp == NULL && *bucket < DIM(wantcomp)) {
        comp = wantcomp[(*bucket)++];
     }
 
@@ -1121,7 +1118,7 @@ free_comptable(void)
     unsigned int i;
     struct comp *cm, *cm2;
 
-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) {
+    for (i = 0; i < DIM(wantcomp); i++) {
        cm = wantcomp[i];
        while (cm != NULL) {
            cm2 = cm->c_next;
@@ -1144,8 +1141,8 @@ free_component(struct comp *cm)
 {
     if (--cm->c_refcount <= 0) {
        /* Shouldn't ever be NULL, but just in case ... */
-        mh_xfree(cm->c_name);
-        mh_xfree(cm->c_text);
+        free(cm->c_name);
+        free(cm->c_text);
        if (cm->c_type & CT_DATE)
            free(cm->c_tws);
        if (cm->c_type & CT_ADDR && cm->c_mn && cm->c_mn != &fmt_mnull)