#define NOWRAP 0x040000 /* Don't wrap lines ever */
#define FMTFILTER 0x080000 /* Filter through format filter */
#define INVISIBLE 0x100000 /* count byte in display columns? */
-#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\017RTRIM\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER\025INVISIBLE"
+#define FORCE7BIT 0x200000 /* don't display 8-bit bytes */
+#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\017RTRIM\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER\025INVISIBLE\026FORCE7BIT"
#define GFLAGS (NOCOMPONENT | UPPERCASE | CENTER | LEFTADJUST | COMPRESS | SPLIT | NOWRAP)
/*
int c_width; /* width of field */
int c_cwidth; /* width of component */
int c_length; /* length in lines */
- long c_flags;
+ unsigned long c_flags;
struct mcomp *c_next;
};
struct pair {
char *p_name;
- long p_flags;
+ unsigned long p_flags;
};
static struct pair pairs[] = {
struct triple {
char *t_name;
- long t_on;
- long t_off;
+ unsigned long t_on;
+ unsigned long t_off;
};
static struct triple triples[] = {
static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
-/*
- * Redefine a couple of functions.
- * These are undefined later in the code.
- */
-#define adios mhladios
-#define done mhldone
-
/*
* prototypes
*/
static void process (char *, char *, int, int);
static void mhlfile (FILE *, char *, int, int);
static int mcomp_flags (char *);
-static char *mcomp_add (long, char *, char *);
+static char *mcomp_add (unsigned long, char *, char *);
static void mcomp_format (struct mcomp *, struct mcomp *);
static struct mcomp *add_queue (struct mcomp **, struct mcomp **, char *, char *, int);
static void free_queue (struct mcomp **, struct mcomp **);
static void putcomp (struct mcomp *, struct mcomp *, int);
-static char *oneline (char *, long);
-static void putstr (char *, long);
-static void putch (char, long);
+static char *oneline (char *, unsigned long);
+static void putstr (char *, unsigned long);
+static void putch (char, unsigned long);
static void intrser (int);
static void pipeser (int);
static void quitser (int);
switch (smatch (++cp, mhlswitches)) {
case AMBIGSW:
ambigsw (cp, mhlswitches);
- done (1);
+ mhldone (1);
+ /* FALLTHRU */
case UNKWNSW:
- adios (NULL, "-%s unknown\n", cp);
+ mhladios (NULL, "-%s unknown\n", cp);
+ /* FALLTHRU */
case HELPSW:
snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
print_help (buf, mhlswitches, 1);
- done (0);
+ mhldone (0);
+ /* FALLTHRU */
case VERSIONSW:
print_version(invo_name);
- done (0);
+ mhldone (0);
+ /* FALLTHRU */
case BELLSW:
bellflg = 1;
case FOLDSW:
if (!(folder = *argp++) || *folder == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
continue;
case SLEEPSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
else
sleepsw = atoi (cp);/* ZERO ok! */
continue;
case PROGSW:
if (!(moreproc = *argp++) || *moreproc == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
continue;
case NPROGSW:
nomore++;
case FMTPROCSW:
if (!(formatproc = *argp++) || *formatproc == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
continue;
case NFMTPROCSW:
formatproc = NULL;
case LENSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
else if ((length = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ mhladios (NULL, "bad argument %s %s", argp[-2], cp);
continue;
case WIDTHSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
else if ((width = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ mhladios (NULL, "bad argument %s %s", argp[-2], cp);
continue;
case DGSTSW:
if (!(digest = *argp++) || *digest == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
continue;
case ISSUESW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
else if ((issue = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ mhladios (NULL, "bad argument %s %s", argp[-2], cp);
continue;
case VOLUMSW:
if (!(cp = *argp++) || *cp == '-')
- adios (NULL, "missing argument to %s", argp[-2]);
+ mhladios (NULL, "missing argument to %s", argp[-2]);
else if ((volume = atoi (cp)) < 1)
- adios (NULL, "bad argument %s %s", argp[-2], cp);
+ mhladios (NULL, "bad argument %s %s", argp[-2], cp);
continue;
case FORW2SW:
- forwall++; /* fall */
+ forwall++;
+ /* FALLTHRU */
case FORW1SW:
forwflg++;
clearflg = -1;/* XXX */
fflush(stdout);
if(ferror(stdout)){
- adios("output", "error writing");
+ mhladios("output", "error writing");
}
if (clearflg > 0 && ontty == NOTTY)
}
if ((fp = fopen (etcpath (file), "r")) == NULL)
- adios (file, "unable to open format file");
+ mhladios (file, "unable to open format file");
if (fstat (fileno (fp), &st) != NOTOK) {
mtime = st.st_mtime;
if (*bp == ';')
continue;
- TrimSuffixC(bp, '\n');
+ trim_suffix_c(bp, '\n');
if (*bp == ':') {
(void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
parptr = bp;
while (*parptr) {
if (evalvar (&global))
- adios (NULL, "format file syntax error: %s", bp);
+ mhladios (NULL, "format file syntax error: %s", bp);
if (*parptr)
parptr++;
}
while (*parptr == ':' || *parptr == ',') {
parptr++;
if (evalvar (c1))
- adios (NULL, "format file syntax error: %s", bp);
+ mhladios (NULL, "format file syntax error: %s", bp);
}
if (!c1->c_nfs && global.c_nfs) {
if (c1->c_flags & DATEFMT) {
continue;
default:
- adios (NULL, "format file syntax error: %s", bp);
+ mhladios (NULL, "format file syntax error: %s", bp);
}
}
fclose (fp);
cp = folder ? concat (folder, ":", fname2, NULL) : mh_xstrdup(fname2);
if (ontty != PITTY)
SIGNAL (SIGINT, intrser);
- mhlfile (fp, cp, ofilen, ofilec); /* FALL THROUGH! */
+ mhlfile (fp, cp, ofilen, ofilec);
free (cp);
for (ap = arglist_head; ap; ap = ap->a_next) {
}
if (arglist_head)
- fmt_free(NULL, 1);
+ fmt_free(NULL, 1);
+ /* FALLTHRU */
default:
if (ontty != PITTY)
return;
default:
- adios (NULL, "getfld() returned %d", state);
+ mhladios (NULL, "getfld() returned %d", state);
}
}
}
static char *
-mcomp_add (long flags, char *s1, char *s2)
+mcomp_add (unsigned long flags, char *s1, char *s2)
{
char *dp;
char *trimmed_prefix;
int count, cchdr;
char *cp;
+ const int utf8 = strcasecmp(get_charset(), "UTF-8") == 0;
+
+ if (! utf8 && flag != BODYCOMP) {
+ /* Don't print 8-bit bytes in header field values if not in a
+ UTF-8 locale, as required by RFC 6532. */
+ c1->c_flags |= FORCE7BIT;
+ }
text = c1->c_text ? c1->c_text : c1->c_name;
/* Create a copy with trailing whitespace trimmed, for use with
if ((ovtxt = c1->c_ovtxt ? c1->c_ovtxt : global.c_ovtxt) == NULL)
ovtxt = "";
if (wid < ovoff + strlen (ovtxt) + 5)
- adios (NULL, "component: %s width(%d) too small for overflow(%d)",
+ mhladios (NULL, "component: %s width(%d) too small for overflow(%d)",
c1->c_name, wid, ovoff + strlen (ovtxt) + 5);
onelp = NULL;
if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {
if (c1->c_flags & UPPERCASE) /* uppercase component also */
- ToUpper(text);
+ to_upper(text);
putstr(text, c1->c_flags);
if (flag != BODYCOMP) {
putstr (": ", c1->c_flags);
&& !(c2->c_flags & HDROUTPUT)
&& !(c2->c_flags & NOCOMPONENT)) {
if (c1->c_flags & UPPERCASE)
- ToUpper(c2->c_name);
+ to_upper(c2->c_name);
putstr (c2->c_name, c1->c_flags);
putstr (": ", c1->c_flags);
if (!(c1->c_flags & SPLIT))
putstr (" ", c1->c_flags);
}
if (c1->c_flags & UPPERCASE)
- ToUpper(c2->c_text);
+ to_upper(c2->c_text);
count = 0;
if (cchdr) {
static char *
-oneline (char *stuff, long flags)
+oneline (char *stuff, unsigned long flags)
{
int spc;
char *cp, *ret;
static void
-putstr (char *string, long flags)
+putstr (char *string, unsigned long flags)
{
/* To not count, for the purpose of counting columns, all of
the bytes of a multibyte character. */
lm = 0;
#ifdef MULTIBYTE_SUPPORT
- (void) mbtowc (NULL, NULL, 0); /* reset shift state */
+ if (mbtowc (NULL, NULL, 0)) {} /* reset shift state */
char_len = 0;
#else
NMH_UNUSED (char_len);
static void
-putch (char ch, long flags)
+putch (char ch, unsigned long flags)
{
char buf[BUFSIZ];
putchar ('-');
putchar (' ');
}
- if ((flags & INVISIBLE) == 0) {
- /* If multibyte character, its first byte only. */
- ++column;
+ /*
+ * Increment the character count, unless
+ * 1) In UTF-8 locale, this is other than the last byte of
+ a multibyte character, or
+ * 2) In C locale, will print a non-printable character.
+ */
+ if ((flags & FORCE7BIT) == 0) {
+ /* UTF-8 locale */
+ if ((flags & INVISIBLE) == 0) {
+ /* If multibyte character, its first byte only. */
+ ++column;
+ }
+ } else {
+ /* If not an ASCII character, the replace character will be
+ displayed. Count it. */
+ if (! isascii((unsigned char) ch) || isprint((unsigned char) ch)) {
+ ++column;
+ }
}
break;
}
return;
}
- putchar (ch);
+ if (flags & FORCE7BIT && ! isascii((unsigned char) ch)) {
+ putchar ('?');
+ } else {
+ putchar (ch);
+ }
}
{
NMH_UNUSED (i);
- done (NOTOK);
+ mhldone (NOTOK);
}
putchar ('\n');
fflush (stdout);
- done (NOTOK);
+ mhldone (NOTOK);
}
-#undef adios
-#undef done
-
static void
mhladios (char *what, char *fmt, ...)
{
projects / nmh / blobdiff