# include <wchar.h>
#endif
-extern char *formataddr (); /* hook for custom address formatting */
-extern char *concataddr (); /* address formatting but allowing duplicates */
-
#ifdef LBL
struct msgs *fmt_current_folder; /* current folder (set by main program) */
#endif
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
}
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",
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;
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) {