#include <h/fmt_scan.h>
#include <h/tws.h>
#include <h/fmt_compile.h>
+#include <ctype.h>
+#include <sysexits.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# include <wchar.h>
#endif
-extern char *formataddr(); /* hook for custom address formatting */
-
extern int fmt_norm; /* defined in sbr/fmt_def.c = AD_NAME */
struct mailname fmt_mnull;
static int match(char *, char *);
static char *get_x400_friendly(char *, char *, int);
static int get_x400_comp(char *, char *, char *, int);
+static char *fmt_trim(char *, int);
/*
static void
cpstripped(char **start, char *end, char *str)
{
+#ifdef MULTIBYTE_SUPPORT
+ int char_len; /* bytes in current character */
+ int nbytes;
+ wchar_t wide_char;
+#else
int c;
+#endif
char *s = str;
if (!s)
return;
/* skip any initial control characters or spaces */
+#ifdef MULTIBYTE_SUPPORT
+ nbytes = end - *start + 1;
+ mbtowc(NULL, NULL, 0); /* reset shift state */
+ while ((char_len = mbtowc(&wide_char, s, nbytes)) > 0 && (iswcntrl(wide_char) || iswspace(wide_char))) {
+ s += char_len;
+ nbytes -= char_len;
+ }
+#else
while ((c = (unsigned char) *s) && (iscntrl(c) || isspace(c)))
s++;
+#endif
/* compact repeated control characters and spaces into a single space */
- while((c = (unsigned char) *s++) && *start < end)
- if (!iscntrl(c) && !isspace(c))
+#ifdef MULTIBYTE_SUPPORT
+ while ((char_len = mbtowc(&wide_char, s, nbytes)) > 0 && *start < end) {
+ if (!iswcntrl(wide_char) && !iswspace(wide_char)) {
+ strncpy(*start, s, char_len);
+ s += char_len;
+ *start += char_len;
+ nbytes -= char_len;
+ } else {
+ while ((char_len = mbtowc(&wide_char, s, nbytes)) > 0 && (iswcntrl(wide_char) || iswspace(wide_char))) {
+ s += char_len;
+ nbytes -= char_len;
+ }
+ *(*start)++ = ' ';
+ }
+ }
+#else
+ while((c = (unsigned char) *s++) && *start < end) {
+ if (!iscntrl(c) && !isspace(c)) {
*(*start)++ = c;
- else {
+ } else {
while ((c = (unsigned char) *s) &&
(iscntrl(c) || isspace(c)))
s++;
*(*start)++ = ' ';
}
+ }
+#endif
}
static char *lmonth[] = {
return 1;
}
+static char *
+fmt_trim(char *str, int width)
+{
+ char *xp;
+ int ljust, i;
+ char buffer[BUFSIZ];
+ char *dst;
+
+ strncpy(buffer, str, sizeof(buffer));
+ dst = buffer;
+ dst[sizeof(buffer)-1] = '\0';
+ while (isspace(*dst)) {
+ dst++;
+ }
+ ljust = 0;
+ if ((i = width) < 0) {
+ i = -i;
+ ljust++;
+ }
+
+ if (!ljust && i > 0 && (int)strlen(dst) > i) {
+ dst[i] = '\0';
+ }
+ xp = dst;
+ xp += strlen(dst) - 1;
+ while (xp > dst && isspace(*xp)) {
+ *xp-- = '\0';
+ }
+ if (ljust && i > 0 && (int)strlen(dst) > i) {
+ dst += strlen(dst) - i;
+ }
+ strncpy(str, dst, strlen(str) + 1);
+ return str;
+}
+
struct format *
fmt_scan(struct format *format, char *scanl, int width, int *dat)
{
cptrimmed(&cp, str, fmt->f_width, fmt->f_fill, ep - cp);
break;
case FT_STRFW:
- adios(NULL, "internal error (FT_STRFW)");
+ adios(EX_SOFTWARE, NULL, "internal error (FT_STRFW)");
case FT_NUM:
n = snprintf(cp, ep - cp + 1, "%d", value);
case FT_LS_TRIM:
if (str) {
- unsigned char *xp;
-
- strncpy(buffer, str, sizeof(buffer));
- buffer[sizeof(buffer)-1] = '\0';
- str = buffer;
- while (isspace(*str))
- str++;
- ljust = 0;
- if ((i = fmt->f_width) < 0) {
- i = -i;
- ljust++;
- }
-
- 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 && (int)strlen(str) > i)
- str += strlen(str) - i;
+ str = fmt_trim(str, fmt->f_width);
}
break;
} else
str = mn->m_text;
break;
- }
+ }
}
}
break;
/* UNQUOTEs RFC-2822 quoted-string and quoted-pair */
case FT_LS_UNQUOTE:
if (str) {
- int m;
strncpy(buffer, str, sizeof(buffer));
/* strncpy doesn't NUL-terminate if it fills the buffer */
buffer[sizeof(buffer)-1] = '\0';
- str = buffer;
-
- /* we will parse from buffer to buffer2 */
- n = 0; /* n is the input position in str */
- m = 0; /* m is the ouput position in buffer2 */
-
- while ( str[n] != '\0') {
- switch ( str[n] ) {
- case '\\':
- n++;
- if ( str[n] != '\0')
- buffer2[m++] = str[n++];
- break;
- case '"':
- n++;
- break;
- default:
- buffer2[m++] = str[n++];
- break;
- }
- }
- buffer2[m] = '\0';
+ unquote_string(buffer, buffer2);
str = buffer2;
}
break;
sp = fmt->f_text;
indent = strlen(sp);
wid -= indent;
+ if (wid <= 0) {
+ adios(EX_SOFTWARE, NULL, "putaddr -- num register (%d) "
+ "must be greater than label "
+ "width (%d)", value, indent);
+ }
while( (c = *sp++) && cp < ep)
*cp++ = c;
while (len > wid) {
- /* try to break at a comma; failing that,
- * break at a space.
- */
+ /*
+ ** try to break at a comma; failing that,
+ ** break at a space.
+ */
lastb = 0; sp = lp + wid;
while (sp > lp && (c = *--sp) != ',') {
if (! lastb && isspace(c))
}
break;
+ case FT_LS_UNMAILTO:
+ if (!str) {
+ break;
+ }
+ str = trim(str);
+ if (*str == '<' && str[strlen(str)-1] == '>') {
+ str++;
+ str[strlen(str)-1] = '\0';
+ }
+ if (strncmp("mailto:", str, 7)==0) {
+ str += 7;
+ }
+ break;
+
}
fmt++;
}
*cp++ = '\n';
*cp = '\0';
return ((struct format *)0);
-
-#ifdef JLR
- /* I'll remove this as soon as I understand what it does. --meillo */
- if (cp[-1] != '\n')
- *cp++ = '\n';
- while (fmt->f_type != FT_DONE)
- fmt++;
-
- finished:;
- *cp = '\0';
- return (fmt->f_value ? ++fmt : (struct format *) 0);
-#endif /* JLR */
-
}