X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/69819af4834557e60c33bb378e29cf3d4e8269f8..fc5bc39368b0c7e05bb5c62a84c44e3bdcbbb1c2:/sbr/fmt_scan.c diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c index 2e547286..f0803d25 100644 --- a/sbr/fmt_scan.c +++ b/sbr/fmt_scan.c @@ -8,12 +8,19 @@ * fmt_compile (found in fmt_compile.c). */ -#include -#include -#include -#include -#include -#include +#include "h/mh.h" +#include "fmt_addr.h" +#include "dtime.h" +#include "strindex.h" +#include "fmt_rfc2047.h" +#include "uprf.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 @@ -32,8 +39,6 @@ struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, * static prototypes */ static int match (char *, char *) PURE; -static char *get_x400_friendly (char *, char *, int); -static int get_x400_comp (char *, char *, char *, int); /* @@ -63,55 +68,66 @@ match (char *str, char *sub) return 1; } -/* - * copy a number to the destination subject to a maximum width - */ +/* cpnumber formats num as a signed decimal, + * appending it to dest if the result doesn't exceed max. + * The absolute value of width is the minimum width to produce. + * A smaller string is padded; + * on the left if width is positive, else the right. + * Left-padding uses fill. It is either ' ' or '0'. + * Right-padding is always with space. */ void -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; - - do { - charstring_push_back (rev, i % 10 + '0'); - i /= 10; - } while (--wid > 0 && i > 0); - if (i > 0) { - /* Overflowed the field (wid). */ - charstring_push_back (rev, '?'); - } else if (num < 0 && wid > 0) { - /* Shouldn't need the wid > 0 check, that's why the condition - at the top checks wid < max-1 when num < 0. */ - --wid; - if (fill == ' ') { - charstring_push_back (rev, '-'); - } - } - while (wid-- > 0 && fill != 0) { - charstring_push_back (rev, fill); - } - if (num < 0 && fill == '0') { - charstring_push_back (rev, '-'); - } +cpnumber(charstring_t dest, int num, int width, char fill, size_t max) +{ + if (width == 0 || width == INT_MIN) { + return; + } - { - /* Output the string in reverse. */ - size_t b = charstring_bytes (rev); - const char *cp = b ? &charstring_buffer (rev)[b] : NULL; + bool padright = width < 0; + if (padright) { + width = -width; /* Can't overflow after above check. */ + } + size_t w = width; + if (w > max) { + return; /* The padded result can't fit. */ + } + if (num < 0 && w == 1) { + return; /* No room for `-' and a digit or `?'. */ + } - for (; b > 0; --b) { - charstring_push_back (dest, *--cp); - } - } + char *s = m_str(num); + size_t len = strlen(s); + if (len == w) { + charstring_append_cstring(dest, s); + return; + } - charstring_free (rev); + bool neg = *s == '-'; + if (len < w) { + if (padright) { + charstring_append_cstring(dest, s); + while (len++ < w) { + charstring_push_back(dest, ' '); + } + return; + } + + if (neg && fill == '0') { + charstring_push_back(dest, *s++); + } + while (len++ < w) { + charstring_push_back(dest, fill); + } + charstring_append_cstring(dest, s); + return; + } + + /* Transform 1234567 -> 1234?67 and -1234567 -> 1234-?7. */ + char *news = s + len - w; + if (neg) { + *news = '-'; } + news[neg] = '?'; + charstring_append_cstring(dest, news); } /* @@ -120,9 +136,10 @@ cpnumber(charstring_t dest, int num, 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 @@ -134,10 +151,10 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) { char *sp; /* current position in source string */ /* get alignment */ - rjust = 0; + rjust = false; if ((remaining = wid) < 0) { remaining = -remaining; - rjust++; + rjust = true; } if (remaining > (int) max) { remaining = max; } @@ -160,12 +177,12 @@ cptrimmed(charstring_t dest, char *str, int wid, char fill, size_t max) { */ if (char_len < 0) { - altstr = "?"; + altstr = "?"; char_len = mbtowc(&wide_char, altstr, 1); } if (char_len <= 0) { - break; + break; } w = wcwidth(wide_char); @@ -228,9 +245,9 @@ static void cpstripped (charstring_t dest, size_t max, char *str) { static bool deja_vu; - static char *oddchar; + static char oddchar[MB_LEN_MAX * 2]; static size_t oddlen; - static char *spacechar; + static char spacechar[MB_LEN_MAX * 2]; static size_t spacelen; char *end; bool squash; @@ -240,19 +257,12 @@ cpstripped (charstring_t dest, size_t max, char *str) int w; if (!deja_vu) { - size_t two; - deja_vu = true; - two = MB_CUR_MAX * 2; /* Varies at run-time. */ - - oddchar = mh_xmalloc(two); - oddlen = wcstombs(oddchar, L"?", two); + oddlen = wcstombs(oddchar, L"?", sizeof oddchar); assert(oddlen > 0); - assert(wcwidth(L' ') == 1); /* Need to pad in ones. */ - spacechar = mh_xmalloc(two); - spacelen = wcstombs(spacechar, L" ", two); + spacelen = wcstombs(spacechar, L" ", sizeof spacechar); assert(spacelen > 0); } @@ -345,58 +355,18 @@ static char *lmonth[] = { "January", "February","March", "April", "May", "June", "July", "August", "September","October", "November","December" }; -static char * -get_x400_friendly (char *mbox, char *buffer, int buffer_len) -{ - char given[BUFSIZ], surname[BUFSIZ]; - - if (mbox == NULL) - return NULL; - if (*mbox == '"') - mbox++; - if (*mbox != '/') - return NULL; - - if (get_x400_comp (mbox, "/PN=", buffer, buffer_len)) { - for (mbox = buffer; (mbox = strchr(mbox, '.')); ) - *mbox++ = ' '; - - return buffer; - } - - if (!get_x400_comp (mbox, "/S=", surname, sizeof(surname))) - return NULL; - - if (get_x400_comp (mbox, "/G=", given, sizeof(given))) - snprintf (buffer, buffer_len, "%s %s", given, surname); - else - snprintf (buffer, buffer_len, "%s", surname); - - return buffer; -} - -static int -get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len) -{ - int idx; - char *cp; - - if ((idx = stringdex (key, mbox)) < 0 - || !(cp = strchr(mbox += idx + strlen (key), '/'))) - return 0; - - snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox); - return 1; -} - struct format * fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, struct fmt_callbacks *callbacks) { char *sp; - char *savestr, *str; + /* If str points to part of buffer[] or buffer2[] then it must only + * ever point at their first element as otherwise undefined + * behaviour from overlapping strncpy(3)s can result. */ + char *str, *savestr; char buffer[NMH_BUFSIZ], buffer2[NMH_BUFSIZ]; - int i, c, rjust; + int i, c; + bool rjust; int value; time_t t; size_t max; @@ -464,11 +434,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); @@ -560,6 +530,34 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, str = buffer; } break; + case FT_LS_ORDINAL: + { + int digit = value % 10; + int seconddigit = (value / 10) % 10; + const char *suffix; + + if (seconddigit == 1) { + suffix = "th"; + } else { + switch (digit) { + case 1: + suffix = "st"; + break; + case 2: + suffix = "nd"; + break; + case 3: + suffix = "rd"; + break; + default: + suffix = "th"; + } + } + + strncpy(buffer, suffix, sizeof(buffer)); + str = buffer; + } + break; case FT_NUMF: cpnumber (scanlp, value, fmt->f_width, fmt->f_fill, max - charstring_chars (scanlp)); @@ -723,10 +721,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) @@ -737,6 +735,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, *xp-- = '\0'; if (rjust && i > 0 && (int) strlen(str) > i) str += strlen(str) - i; + str = memmove(buffer, str, strlen(str) + 1); } break; @@ -771,15 +770,18 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, value *= fmt->f_value; break; case FT_LV_DIVIDE_L: - if (fmt->f_value) - value /= fmt->f_value; - else + if (fmt->f_value == 0 || (fmt->f_value == -1 && value == INT_MIN)) { + // FIXME: Tell the user, and probably stop. value = 0; + } else { + value /= fmt->f_value; + } break; case FT_LV_MODULO_L: if (fmt->f_value) value %= fmt->f_value; else + // FIXME: Tell the user, and probably stop. value = 0; break; case FT_SAVESTR: @@ -916,18 +918,18 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, buffer[sizeof(buffer)-1] = '\0'; str = buffer; if (*str == '(') - str++; + str++; sp = str + strlen(str) - 1; if (*sp == ')') { - *sp-- = '\0'; - while (sp >= str) - if (*sp == ' ') - *sp-- = '\0'; - else - break; + *sp-- = '\0'; + while (sp >= str) + if (*sp == ' ') + *sp-- = '\0'; + else + break; } - } else if (!(str = get_x400_friendly (mn->m_mbox, - buffer, sizeof(buffer)))) { + str = memmove(buffer, str, strlen(str) + 1); + } else { unfriendly: switch (mn->m_type) { case LOCALHOST: @@ -955,7 +957,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, /* UNQUOTEs RFC-2822 quoted-string and quoted-pair */ case FT_LS_UNQUOTE: - if (str) { + if (str) { if (str != buffer) strncpy(buffer, str, sizeof(buffer)); /* strncpy doesn't NUL-terminate if it fills the buffer */ @@ -1029,7 +1031,7 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, indent = strlen (sp); wid -= indent; if (wid <= 0) { - die("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) { @@ -1127,7 +1129,11 @@ fmt_scan (struct format *format, charstring_t scanlp, int width, int *dat, comp->c_mn will be run through FT_LS_ADDR, which will strip off any pers name. */ - free (comp->c_text); + /* NB: We remove the call to free() here + because it interferes with the buffer + management in scansbr.c. Revisit this + when we clean up memory handling */ + /* free (comp->c_text); */ comp->c_text = str = strdup (mn->m_text); comp->c_mn = mn; }