X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b2cc954248dff07883ef749c1c2851dd07e0d400..9cc2510:/sbr/fmt_scan.c?ds=inline

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index cc5c192d..5732af91 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -499,6 +499,9 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 		if (val < scale) {
 		    snprintf(buffer, sizeof(buffer), "%u", val);
 		} else {
+		    /* To prevent divide by 0, found by clang static
+		       analyzer. */
+		    if (scale == 0) { scale = 1; }
 
 		    /* find correct scale for size (Kilo/Mega/Giga/Tera) */
 		    for (unitcp = "KMGT"; val > (scale * scale); val /= scale) {
@@ -821,6 +824,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 		default:
 		    value = -1; break;
 	    }
+	    break;
 	case FT_LV_ZONEF:
 	    if ((fmt->f_comp->c_tws->tw_flags & TW_SZONE) == TW_SZEXP)
 		    value = 1;
@@ -828,7 +832,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 		    value = -1;
 	    break;
 	case FT_LV_DST:
-	    value = fmt->f_comp->c_tws->tw_flags & TW_DST;
+	    value = fmt->f_comp->c_tws->tw_flags & TW_DST ? 1 : 0;
 	    break;
 	case FT_LS_822DATE:
 	    str = dasctime (fmt->f_comp->c_tws , TW_ZONE);
@@ -988,7 +992,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 
 	    lp = str;
 	    wid = value;
-	    len = strlen (str);
+	    len = str ? strlen (str) : 0;
 	    sp = fmt->f_text;
 	    indent = strlen (sp);
 	    wid -= indent;
@@ -1058,6 +1062,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	    break;
 
 	case FT_MYMBOX:
+	case FT_GETMYMBOX:
+	case FT_GETMYADDR:
 	    /*
 	     * if there's no component, we say true.  Otherwise we
 	     * say "true" only if we can parse the address and it
@@ -1069,24 +1075,46 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat,
 	    if ((sp = comp->c_text) && (sp = getname(sp)) &&
 		(mn = getm (sp, NULL, 0, NULL, 0))) {
 		comp->c_mn = mn;
-		if (ismymbox(mn))
+		if (ismymbox(mn)) {
 		    comp->c_flags |= CF_TRUE;
-		else
+		    /* Set str for use with FT_GETMYMBOX.  With
+		       FT_GETMYADDR, comp->c_mn will be run through
+		       FT_LS_ADDR, which will strip off any pers
+		       name. */
+		    str = mn->m_text;
+		} else {
 		    comp->c_flags &= ~CF_TRUE;
+		}
 		while ((sp = getname(sp)))
 		    if ((comp->c_flags & CF_TRUE) == 0 &&
 			(mn = getm (sp, NULL, 0, NULL, 0)))
-			if (ismymbox(mn))
+			if (ismymbox(mn)) {
 			    comp->c_flags |= CF_TRUE;
+			    /* Set str and comp->c_text for use with
+			       FT_GETMYMBOX.  With FT_GETMYADDR,
+			       comp->c_mn will be run through
+			       FT_LS_ADDR, which will strip off any
+			       pers name. */
+			    free (comp->c_text);
+			    comp->c_text = str = strdup (mn->m_text);
+			    comp->c_mn = mn;
+			}
+		comp->c_flags |= CF_PARSED;
 	    } else {
 		while (getname(""))		/* XXX */
 		    ;
 		if (comp->c_text == 0)
 		    comp->c_flags |= CF_TRUE;
-		else
+		else {
 		    comp->c_flags &= ~CF_TRUE;
+		}
 		comp->c_mn = &fmt_mnull;
 	    }
+	    if ((comp->c_flags & CF_TRUE) == 0  &&
+		(fmt->f_type == FT_GETMYMBOX || fmt->f_type == FT_GETMYADDR)) {
+		/* Fool FT_LS_ADDR into not producing an address. */
+		comp->c_mn = &fmt_mnull; comp->c_text = NULL;
+	    }
 	    break;
 	}