X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Ffmt_scan.c;h=3818b85e30cbe5a4d6af139fb4e3b7d4cba0fa28;hb=90986dddba4b24b0449238f86f836581cfb93938;hp=29b87d02713d18cf26b2f0c0250150429210adee;hpb=24ba06b111dbadb912fa97f74ec8595f71b04393;p=mmh diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 29b87d0..3818b85 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -152,10 +152,11 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) { if (iswcntrl(wide_char) || iswspace(wide_char)) { sp += char_len; #else + int c; end--; /* isnctrl(), etc., take an int argument. Cygwin's ctype.h intentionally warns if they are passed a char. */ - int c = *sp; + c = *sp; if (iscntrl(c) || isspace(c)) { sp++; #endif @@ -207,37 +208,64 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) { } static void -cpstripped (char **start, char *end, char *str) +cpstripped (char **dest, char *end, char *str) { - int c; - char *s = str; + int prevCtrl = 1; /* This is 1 so we strip out leading spaces */ + int len; +#ifdef MULTIBYTE_SUPPORT + int char_len; + wchar_t wide_char; +#endif /* MULTIBYTE_SUPPORT */ - if (!s) + if (!str) return; - /* skip any initial control characters or spaces */ - while ((c = (unsigned char) *s) && -#ifdef LOCALE - (iscntrl(c) || isspace(c))) -#else - (c <= 32)) -#endif - s++; - - /* compact repeated control characters and spaces into a single space */ - while((c = (unsigned char) *s++) && *start < end) - if (!iscntrl(c) && !isspace(c)) - *(*start)++ = c; - else { - while ((c = (unsigned char) *s) && -#ifdef LOCALE - (iscntrl(c) || isspace(c))) -#else - (c <= 32)) -#endif - s++; - *(*start)++ = ' '; + len = strlen(str); + +#ifdef MULTIBYTE_SUPPORT + mbtowc(NULL, NULL, 0); /* Reset shift state */ +#endif /* MULTIBYTE_SUPPORT */ + + /* + * Process each character at a time; if we have multibyte support + * then deal with that here. + */ + + while (*str != '\0' && len > 0 && *dest < end) { +#ifdef MULTIBYTE_SUPPORT + char_len = mbtowc(&wide_char, str, len); + + if (char_len <= 0 || *dest + char_len > end) + break; + + len -= char_len; + + if (iswcntrl(wide_char) || iswspace(wide_char)) { + str += char_len; +#else /* MULTIBYTE_SUPPORT */ + int c = *str; + len--; + if (iscntrl(c) || isspace(c)) { + str++; +#endif /* MULTIBYTE_SUPPORT */ + if (! prevCtrl) { + *(*dest)++ = ' '; + } + + prevCtrl = 1; + continue; } + + prevCtrl = 0; + +#ifdef MULTIBYTE_SUPPORT + memcpy(*dest, str, char_len); + str += char_len; + *dest += char_len; +#else /* MULTIBYE_SUPPORT */ + *(*dest)++ = *str++ +#endif /* MULTIBYTE_SUPPORT */ + } } static char *lmonth[] = { "January", "February","March", "April", @@ -289,7 +317,7 @@ get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len) } struct format * -fmt_scan (struct format *format, char *scanl, int width, int *dat) +fmt_scan (struct format *format, char *scanl, size_t max, int width, int *dat) { char *cp, *ep; unsigned char *sp; @@ -304,8 +332,11 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat) struct tws *tws; struct mailname *mn; + /* ep keeps track of displayed characters. They're limited by width. + The total number of characters, cp - scanl + 1 (for trailing NULL), + includes invisible control characters and is limited by max. */ cp = scanl; - ep = scanl + width - 1; + ep = scanl + (width <= (int) max ? width : (int) max) - 1; for (fmt = format; fmt->f_type != FT_DONE; fmt++) switch (fmt->f_type) { @@ -313,6 +344,27 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat) case FT_PARSEDATE: fmt->f_comp->c_flags &= ~CF_PARSED; break; + case FT_COMP: + case FT_COMPF: + case FT_LS_COMP: + case FT_LS_DECODECOMP: + /* + * Trim these components of any newlines. + * + * But don't trim the "body" and "text" components. + */ + + comp = fmt->f_comp; + + if (! (comp->c_flags & CF_TRIMMED) && comp->c_text) { + i = strlen(comp->c_text); + if (comp->c_text[i - 1] == '\n' && + strcmp(comp->c_name, "body") != 0 && + strcmp(comp->c_name, "text") != 0) + comp->c_text[i - 1] = '\0'; + comp->c_flags |= CF_TRIMMED; + } + break; } fmt = format; @@ -357,6 +409,25 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat) 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; + } + } + + break; + } case FT_STRFW: adios (NULL, "internal error (FT_STRFW)"); @@ -924,10 +995,31 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat) fmt++; } #ifndef JLR + /* Emit any trailing sequences of zero display length. */ + while (fmt->f_type != FT_DONE) { + if (fmt->f_type == FT_LS_LIT) { + str = fmt->f_text; + } else if (fmt->f_type == FT_STRLITZ) { + /* 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. Need room for null + terminator, and maybe trailing newline (added below). */ + if (cp - scanl + strlen (str) + 1 < max) { + for (sp = str; *sp; *cp++ = *sp++) continue; + } + } + fmt++; + } + finished:; - if (cp[-1] != '\n') - *cp++ = '\n'; - *cp = 0; + if (cp > scanl && cp[-1] != '\n') { + if (cp - scanl < (int) max - 1) { + *cp++ = '\n'; + } else { + cp[-1] = '\n'; + } + } + *cp = '\0'; return ((struct format *)0); #else /* JLR */ if (cp[-1] != '\n')