X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8ba2c2e0a5c0e2c087cd1684a885b959c101e010..4aca08ce404ffaa63000c218e8e042d7b27fbfcc:/sbr/fmt_scan.c diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index e5e1ff85..1d8dd29c 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -8,12 +8,14 @@ * fmt_compile (found in fmt_compile.c). */ -#include -#include -#include -#include -#include -#include +#include "h/mh.h" +#include "context_find.h" +#include "error.h" +#include "h/addrsbr.h" +#include "h/fmt_scan.h" +#include "h/tws.h" +#include "h/fmt_compile.h" +#include "h/utils.h" #include "unquote.h" #ifdef HAVE_SYS_TIME_H @@ -31,7 +33,7 @@ struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, /* * static prototypes */ -static int match (char *, char *); +static int match (char *, char *) PURE; static char *get_x400_friendly (char *, char *, int); static int get_x400_comp (char *, char *, char *, int); @@ -67,8 +69,14 @@ match (char *str, char *sub) * copy a number to the destination subject to a maximum width */ void -cpnumber(charstring_t dest, int num, unsigned int wid, char fill, size_t max) { - if (wid < (num >= 0 ? max : max-1)) { +cpnumber(charstring_t dest, int num, int wid, char fill, size_t max) +{ + /* Maybe we should handle left padding at some point? */ + if (wid == 0) + return; + if (wid < 0) + wid = -wid; /* OK because wid originally a short. */ + if ((size_t)wid < (num >= 0 ? max : max-1)) { /* Build up the string representation of num in reverse. */ charstring_t rev = charstring_create (0); int i = num >= 0 ? num : -num; @@ -115,9 +123,10 @@ cpnumber(charstring_t dest, int num, unsigned int wid, char fill, size_t max) { * aligned no more than max characters are copied */ void -cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) { +cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) +{ int remaining; /* remaining output width available */ - int rjust; + bool rjust; struct charstring *trimmed; size_t end; /* number of input bytes remaining in str */ #ifdef MULTIBYTE_SUPPORT @@ -127,18 +136,18 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) { char *altstr = NULL; #endif char *sp; /* current position in source string */ - int prevCtrl = 1; /* get alignment */ - rjust = 0; + rjust = false; if ((remaining = wid) < 0) { remaining = -remaining; - rjust++; + rjust = true; } if (remaining > (int) max) { remaining = max; } trimmed = rjust ? charstring_create(remaining) : dest; + bool prevCtrl = true; if ((sp = str)) { #ifdef MULTIBYTE_SUPPORT if (mbtowc(NULL, NULL, 0)) {} /* reset shift state */ @@ -188,10 +197,10 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) { remaining--; } - prevCtrl = 1; + prevCtrl = true; continue; } - prevCtrl = 0; + prevCtrl = false; #ifdef MULTIBYTE_SUPPORT if (w >= 0 && remaining >= w) { @@ -222,75 +231,87 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) { static void cpstripped (charstring_t dest, size_t max, char *str) { - int prevCtrl = 1; /* This is 1 so we strip out leading spaces */ - int len; - int char_len, w; - wchar_t wide_char; - char *altstr = NULL; - - if (!str) { - return; - } + static bool deja_vu; + static char *oddchar; + static size_t oddlen; + static char *spacechar; + static size_t spacelen; + char *end; + bool squash; + char *src; + int srclen; + wchar_t rune; + int w; - len = strlen(str); + if (!deja_vu) { + size_t two; - if (mbtowc(NULL, NULL, 0)) {} /* Reset shift state */ + deja_vu = true; - /* - * Process each character at a time; if we have multibyte support - * then deal with that here. - */ + two = MB_CUR_MAX * 2; /* Varies at run-time. */ - while (*str != '\0' && len > 0 && max > 0) { - char_len = mbtowc(&wide_char, str, len); + oddchar = mh_xmalloc(two); + oddlen = wcstombs(oddchar, L"?", two); + assert(oddlen > 0); - /* - * If mbrtowc() failed, then we have a character that isn't valid - * in the current encoding, or len wasn't enough for the whole - * multi-byte rune to be read. Replace it with a '?'. We do that by - * setting the alstr variable to the value of the replacement string; - * altstr is used below when the bytes are copied into the output - * buffer. - */ - if (char_len < 0) { - altstr = "?"; - char_len = mbtowc(&wide_char, altstr, 1); - } + assert(wcwidth(L' ') == 1); /* Need to pad in ones. */ + spacechar = mh_xmalloc(two); + spacelen = wcstombs(spacechar, L" ", two); + assert(spacelen > 0); + } - if (char_len <= 0) { - break; - } + if (!str) + return; /* It's unclear why no padding in this case. */ + end = str + strlen(str); + + if (mbtowc(NULL, NULL, 0)) + {} /* Reset shift state. */ + + squash = true; /* Trim `space' or `cntrl' from the start. */ + while (max) { + if (!*str) + return; /* It's unclear why no padding in this case. */ + + srclen = mbtowc(&rune, str, end - str); + if (srclen == -1) { + /* Invalid rune, or not enough bytes to finish it. */ + rune = L'?'; + src = oddchar; + srclen = oddlen; + str++; /* Skip one byte. */ + } else { + src = str; + str += srclen; + } - len -= char_len; + if (iswspace(rune) || iswcntrl(rune)) { + if (squash) + continue; /* Amidst a run of these. */ + rune = L' '; + src = spacechar; + srclen = spacelen; + squash = true; + } else + squash = false; - if (iswcntrl(wide_char) || iswspace(wide_char)) { - str += char_len; - if (! prevCtrl) { - charstring_push_back (dest, ' '); - --max; - } + w = wcwidth(rune); + if (w == -1) { + rune = L'?'; + w = wcwidth(rune); + assert(w != -1); + src = oddchar; + srclen = oddlen; + } - prevCtrl = 1; - continue; - } + if ((size_t)w > max) { + /* No room for rune; pad. */ + while (max--) + charstring_push_back_chars(dest, spacechar, spacelen, 1); + return; + } - prevCtrl = 0; - - w = wcwidth(wide_char); - assert(w >= 0); - if (max >= (size_t) w) { - charstring_push_back_chars (dest, altstr ? altstr : str, char_len, w); - max -= w; - str += char_len; - altstr = NULL; - } else { - /* Not enough width available for the last character. Output - space(s) to fill. */ - while (max-- > 0) { - charstring_push_back (dest, ' '); - } - break; - } + charstring_push_back_chars(dest, src, srclen, w); + max -= w; } } #endif @@ -379,7 +400,8 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, char *sp; char *savestr, *str; char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ]; - int i, c, rjust; + int i, c; + bool rjust; int value; time_t t; size_t max; @@ -447,11 +469,11 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, break; case FT_LITF: sp = fmt->f_text; - rjust = 0; + rjust = false; i = fmt->f_width; if (i < 0) { i = -i; - rjust++; /* XXX should do something with this */ + rjust = true; /* XXX should do something with this */ } while ((c = *sp++) && --i >= 0 && charstring_chars (scanlp) < max) { charstring_push_back (scanlp, c); @@ -480,7 +502,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, if (str) charstring_push_back_chars (scanlp, str, strlen (str), 0); break; case FT_STRFW: - adios (NULL, "internal error (FT_STRFW)"); + die("internal error (FT_STRFW)"); case FT_NUM: { int num = value; @@ -706,10 +728,10 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, str = buffer; while (isspace((unsigned char) *str)) str++; - rjust = 0; + rjust = false; if ((i = fmt->f_width) < 0) { i = -i; - rjust++; + rjust = true; } if (!rjust && i > 0 && (int) strlen(str) > i) @@ -824,7 +846,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, case FT_LV_RCLOCK: if ((value = fmt->f_comp->c_tws->tw_clock) == 0) value = dmktime(fmt->f_comp->c_tws); - value = time((time_t *) 0) - value; + value = time(NULL) - value; break; case FT_LV_DAYF: if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP))) @@ -972,7 +994,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, *comp->c_tws = *tws; comp->c_flags &= ~CF_TRUE; } else if ((comp->c_flags & CF_DATEFAB) == 0) { - memset (comp->c_tws, 0, sizeof *comp->c_tws); + ZERO(comp->c_tws); comp->c_flags = CF_TRUE; } comp->c_flags |= CF_PARSED; @@ -1012,7 +1034,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, indent = strlen (sp); wid -= indent; if (wid <= 0) { - adios(NULL, "putaddr -- num register (%d) must be greater " + die("putaddr -- num register (%d) must be greater " "than label width (%d)", value, indent); } while ((c = *sp++) && charstring_chars (scanlp) < max) { @@ -1189,5 +1211,5 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, } } - return (NULL); + return NULL; }