/*
* fmt_scan.c -- format string interpretation
*
- * $Id$
- *
* 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 <h/tws.h>
#include <h/fmt_compile.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
-#include <wchar.h>
-
-#define NFMTS MAXARGS
+#include <time.h>
+#ifdef MULTIBYTE_SUPPORT
+# include <wctype.h>
+# 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
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
static void
cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
int remaining; /* remaining output width available */
- int c, ljust, w;
+ int c, ljust;
int end; /* number of input bytes remaining in str */
+#ifdef MULTIBYTE_SUPPORT
int char_len; /* bytes in current character */
+ int w;
wchar_t wide_char;
+#endif
char *sp; /* current position in source string */
char *cp = *dest; /* current position in destination string */
char *ep = cp + n; /* end of destination buffer */
mbtowc(NULL, NULL, 0); /* reset shift state */
end = strlen(str);
while (*sp && remaining > 0 && end > 0) {
+#ifdef MULTIBYTE_SUPPORT
char_len = mbtowc(&wide_char, sp, end);
if (char_len <= 0 || (cp + char_len > ep))
break;
if (iswcntrl(wide_char) || iswspace(wide_char)) {
sp += char_len;
+#else
+ end--;
+ /* isnctrl(), etc., take an int argument. Cygwin's ctype.h
+ intentionally warns if they are passed a char. */
+ int c = *sp;
+ if (iscntrl(c) || isspace(c)) {
+ sp++;
+#endif
if (!prevCtrl) {
*cp++ = ' ';
remaining--;
}
prevCtrl = 0;
+#ifdef MULTIBYTE_SUPPORT
w = wcwidth(wide_char);
if (w >= 0 && remaining >= w) {
strncpy(cp, sp, char_len);
remaining -= w;
}
sp += char_len;
+#else
+ *cp++ = *sp++;
+ remaining--;
+#endif
}
}
|| !(cp = strchr(mbox += idx + strlen (key), '/')))
return 0;
- snprintf (buffer, buffer_len, "%*.*s", cp - mbox, cp - mbox, mbox);
+ snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox);
return 1;
}
struct format *
fmt_scan (struct format *format, char *scanl, int width, int *dat)
{
- char *cp, *ep, *sp;
- char *savestr, *str = NULL;
+ char *cp, *ep;
+ unsigned char *sp;
+ char *savestr = NULL;
+ unsigned char *str = NULL;
char buffer[BUFSIZ], buffer2[BUFSIZ];
int i, c, ljust, n;
int value = 0;
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)");
case FT_NUM:
- n = snprintf(cp, ep - cp, "%d", value);
- if (n >= 0) cp += n;
+ n = snprintf(cp, ep - cp + 1, "%d", value);
+ if (n >= 0) {
+ if (n >= ep - cp) {
+ cp = ep;
+ } else
+ cp += n;
+ }
break;
case FT_NUMF:
cpnumber (&cp, value, fmt->f_width, fmt->f_fill, ep - cp);
case FT_LS_TRIM:
if (str) {
- char *xp;
+ unsigned char *xp;
strncpy(buffer, str, sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
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
* (e.g., "To: ")
*/
{
- char *lp, *lastb;
+ unsigned char *lp;
+ char *lastb;
int indent, wid, len;
lp = str;