X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6ba5b855ebc737cc46cabfbe799b0c7706f437f4..b4f2851d:/sbr/fmt_scan.c?ds=inline

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 408b1093..fe2a0044 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -25,7 +25,6 @@
 #  include <wchar.h>
 #endif
 
-extern int fmt_norm;		/* defined in sbr/fmt_def.c = AD_NAME */
 struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
 			      NULL, NULL };
 
@@ -468,29 +467,31 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 		       scanl + max - 1);
 	    break;
 	case FT_STRLIT:
-	    sp = str;
-	    while ((c = *sp++) && cp < ep)
-		*cp++ = c;
+	    if (str) {
+		sp = str;
+		while ((c = *sp++) && cp < ep)
+		    *cp++ = c;
+	    }
 	    break;
-	case FT_STRLITZ: {
-	    size_t len = strlen (str);
-
-	    /* Don't want to emit part of an escape sequence.  So if
-	       there isn't enough room in the buffer for the entire
-	       string, skip it completely. */
-	    if (cp - scanl + len + 1 < max) {
-		for (sp = str; *sp; *cp++ = *sp++) continue;
-
-		/* This string doesn't count against the width.	 So
-		   increase ep the same amount as cp, only if the
-		   scan buffer will always be large enough. */
-		if (ep - scanl + len + 1 < max) {
-		    ep += len;
+	case FT_STRLITZ:
+	    if (str) {
+		size_t len = strlen (str);
+
+		/* Don't want to emit part of an escape sequence.  So if
+		   there isn't enough room in the buffer for the entire
+		   string, skip it completely. */
+		if (cp - scanl + len + 1 < max) {
+		    for (sp = str; *sp; *cp++ = *sp++) continue;
+
+		    /* This string doesn't count against the width.
+		       So increase ep the same amount as cp, only if the
+		       scan buffer will always be large enough. */
+		    if (ep - scanl + len + 1 < max) {
+			ep += len;
+		    }
 		}
 	    }
-
 	    break;
-	}
 	case FT_STRFW:
 	    adios (NULL, "internal error (FT_STRFW)");
 
@@ -519,6 +520,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 
 	case FT_IF_S:
 	    if (!(value = (str && *str))) {
+		if (callbacks && callbacks->trace_func)
+		    callbacks->trace_func(callbacks->trace_context, fmt, value,
+					  str, scanl);
 		fmt += fmt->f_skip;
 		continue;
 	    }
@@ -526,6 +530,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 
 	case FT_IF_S_NULL:
 	    if (!(value = (str == NULL || *str == 0))) {
+		if (callbacks && callbacks->trace_func)
+		    callbacks->trace_func(callbacks->trace_context, fmt, value,
+					  str, scanl);
 		fmt += fmt->f_skip;
 		continue;
 	    }
@@ -533,6 +540,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 
 	case FT_IF_V_EQ:
 	    if (value != fmt->f_value) {
+		if (callbacks && callbacks->trace_func)
+		    callbacks->trace_func(callbacks->trace_context, fmt, value,
+					  str, scanl);
 		fmt += fmt->f_skip;
 		continue;
 	    }
@@ -540,6 +550,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 
 	case FT_IF_V_NE:
 	    if (value == fmt->f_value) {
+		if (callbacks && callbacks->trace_func)
+		    callbacks->trace_func(callbacks->trace_context, fmt, value,
+					  str, scanl);
 		fmt += fmt->f_skip;
 		continue;
 	    }
@@ -547,6 +560,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 
 	case FT_IF_V_GT:
 	    if (value <= fmt->f_value) {
+		if (callbacks && callbacks->trace_func)
+		    callbacks->trace_func(callbacks->trace_context, fmt, value,
+					  str, scanl);
 		fmt += fmt->f_skip;
 		continue;
 	    }
@@ -554,6 +570,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 
 	case FT_IF_MATCH:
 	    if (!(value = (str && match (str, fmt->f_text)))) {
+		if (callbacks && callbacks->trace_func)
+		    callbacks->trace_func(callbacks->trace_context, fmt, value,
+					  str, scanl);
 		fmt += fmt->f_skip;
 		continue;
 	    }
@@ -568,6 +587,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 
 	case FT_IF_AMATCH:
 	    if (!(value = (str && uprf (str, fmt->f_text)))) {
+		if (callbacks && callbacks->trace_func)
+		    callbacks->trace_func(callbacks->trace_context, fmt, value,
+					  str, scanl);
 		fmt += fmt->f_skip;
 		continue;
 	    }
@@ -598,6 +620,9 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 	    break;
 
 	case FT_GOTO:
+	    if (callbacks && callbacks->trace_func)
+		callbacks->trace_func(callbacks->trace_context, fmt, value,
+				      str, scanl);
 	    fmt += fmt->f_skip;
 	    continue;
 
@@ -987,7 +1012,7 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 	    if (comp->c_mn != &fmt_mnull)
 		mnfree (comp->c_mn);
 	    if ((sp = comp->c_text) && (sp = getname(sp)) &&
-		(mn = getm (sp, NULL, 0, fmt_norm, NULL))) {
+		(mn = getm (sp, NULL, 0, NULL, 0))) {
 		comp->c_mn = mn;
 		while (getname(""))
 		    ;
@@ -1009,7 +1034,7 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 	    if (comp->c_mn != &fmt_mnull)
 		mnfree (comp->c_mn);
 	    if ((sp = comp->c_text) && (sp = getname(sp)) &&
-		(mn = getm (sp, NULL, 0, AD_NAME, NULL))) {
+		(mn = getm (sp, NULL, 0, NULL, 0))) {
 		comp->c_mn = mn;
 		if (ismymbox(mn))
 		    comp->c_flags |= CF_TRUE;
@@ -1017,7 +1042,7 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 		    comp->c_flags &= ~CF_TRUE;
 		while ((sp = getname(sp)))
 		    if ((comp->c_flags & CF_TRUE) == 0 &&
-			(mn = getm (sp, NULL, 0, AD_NAME, NULL)))
+			(mn = getm (sp, NULL, 0, NULL, 0)))
 			if (ismymbox(mn))
 			    comp->c_flags |= CF_TRUE;
 	    } else {
@@ -1054,7 +1079,7 @@ fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat,
 	       there isn't enough room in the buffer for the entire
 	       string, skip it completely.  Need room for null
 	       terminator, and maybe trailing newline (added below). */
-	    if (cp - scanl + strlen (str) + 1 < max) {
+	    if (str && (cp - scanl + strlen (str) + 1 < max)) {
 		for (sp = str; *sp; *cp++ = *sp++) continue;
 	    }
 	    if (callbacks && callbacks->trace_func)