* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
* complete copyright information.
+ *
+ * This is the engine that processes the format instructions created by
+ * fmt_compile (found in fmt_compile.c).
*/
#include <h/mh.h>
# include <wchar.h>
#endif
-#define NFMTS MAXARGS
-
-extern char *formataddr (); /* hook for custom address formatting */
-
#ifdef LBL
struct msgs *fmt_current_folder; /* current folder (set by main program) */
#endif
extern int fmt_norm; /* defined in sbr/fmt_def.c = AD_NAME */
-struct mailname fmt_mnull;
+struct mailname fmt_mnull = { NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0,
+ NULL, NULL };
/*
* static prototypes
if (iswcntrl(wide_char) || iswspace(wide_char)) {
sp += char_len;
#else
+ int c;
end--;
- if (iscntrl(*sp) || isspace(*sp)) {
+ /* isnctrl(), etc., take an int argument. Cygwin's ctype.h
+ intentionally warns if they are passed a char. */
+ c = *sp;
+ if (iscntrl(c) || isspace(c)) {
sp++;
#endif
if (!prevCtrl) {
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;
case FT_STRF:
cptrimmed (&cp, str, fmt->f_width, fmt->f_fill, ep - cp);
break;
+ case FT_STRLIT:
+ sp = str;
+ while ((c = *sp++) && cp < ep)
+ *cp++ = c;
+ break;
case FT_STRFW:
adios (NULL, "internal error (FT_STRFW)");
ljust++;
}
- if (!ljust && i > 0 && strlen(str) > i)
+ if (!ljust && i > 0 && (int) strlen(str) > i)
str[i] = '\0';
xp = str;
xp += strlen(str) - 1;
while (xp > str && isspace(*xp))
*xp-- = '\0';
- if (ljust && i > 0 && strlen(str) > i)
+ if (ljust && i > 0 && (int) strlen(str) > i)
str += strlen(str) - i;
}
break;
str = formataddr (savestr, str);
break;
+ case FT_CONCATADDR:
+ /* The same as formataddr, but doesn't do duplicate suppression */
+ str = concataddr (savestr, str);
+ break;
+
case FT_PUTADDR:
/* output the str register as an address component,
* splitting it into multiple lines if necessary. The
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) {