X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=8414829b833347cd2dadff2ea0918e9eea0942ab;hb=0fb9981d2aff1a53d665123ef73857949a0e86f8;hp=5103dbd772697372477cda28ae083248f9611872;hpb=d5b5e6e4813b7fd77dc1664df4304537f3002cf3;p=mmh diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 5103dbd..8414829 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -607,10 +607,8 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat) value = fmt->f_comp->c_tws->tw_flags & TW_DST; break; case FT_LS_822DATE: - str = dasctime(fmt->f_comp->c_tws , TW_ZONE); - break; case FT_LS_PRETTY: - str = dasctime(fmt->f_comp->c_tws, TW_NULL); + str = dasctime(fmt->f_comp->c_tws); break; case FT_LS_PERS: @@ -777,6 +775,11 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat) sp = fmt->f_text; indent = strlen(sp); wid -= indent; + if (wid <= 0) { + adios(NULL, "putaddr -- num register (%d) " + "must be greater than label " + "width (%d)", value, indent); + } while( (c = *sp++) && cp < ep) *cp++ = c; while (len > wid) {