X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a362ecdd2e3df304885b3d520e56cfb5963bf1a8..cf57870921b26703aad420c6741c524b33736ff1:/uip/mhlsbr.c diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 5a6401e8..f07d786d 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -94,7 +94,8 @@ DEFINE_SWITCH_ARRAY(MHL, mhlswitches); #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) /* @@ -162,7 +163,7 @@ struct mcomp { 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; }; @@ -181,7 +182,7 @@ static struct mcomp holder = { struct pair { char *p_name; - long p_flags; + unsigned long p_flags; }; static struct pair pairs[] = { @@ -204,8 +205,8 @@ 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[] = { @@ -305,13 +306,6 @@ static char delim4[] = "\n------------------------------\n\n"; 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 */ @@ -323,14 +317,14 @@ static char *parse (void); 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); @@ -366,17 +360,21 @@ mhl (int argc, char **argv) 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; @@ -394,23 +392,23 @@ mhl (int argc, char **argv) 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++; @@ -418,7 +416,7 @@ mhl (int argc, char **argv) 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; @@ -426,36 +424,37 @@ mhl (int argc, char **argv) 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 */ @@ -529,7 +528,7 @@ mhl (int argc, char **argv) fflush(stdout); if(ferror(stdout)){ - adios("output", "error writing"); + mhladios("output", "error writing"); } if (clearflg > 0 && ontty == NOTTY) @@ -565,7 +564,7 @@ mhl_format (char *file, int length, int width) } 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; @@ -591,7 +590,7 @@ mhl_format (char *file, int length, int width) if (*bp == ';') continue; - TrimSuffixC(bp, '\n'); + trim_suffix_c(bp, '\n'); if (*bp == ':') { (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT); @@ -628,7 +627,7 @@ mhl_format (char *file, int length, int width) 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++; } @@ -639,7 +638,7 @@ mhl_format (char *file, int length, int width) 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) { @@ -659,7 +658,7 @@ mhl_format (char *file, int length, int width) continue; default: - adios (NULL, "format file syntax error: %s", bp); + mhladios (NULL, "format file syntax error: %s", bp); } } fclose (fp); @@ -906,7 +905,7 @@ process (char *folder, char *fname, int ofilen, int ofilec) 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) { @@ -915,7 +914,8 @@ process (char *folder, char *fname, int ofilen, int ofilec) } if (arglist_head) - fmt_free(NULL, 1); + fmt_free(NULL, 1); + /* FALLTHRU */ default: if (ontty != PITTY) @@ -1106,7 +1106,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) return; default: - adios (NULL, "getfld() returned %d", state); + mhladios (NULL, "getfld() returned %d", state); } } } @@ -1126,7 +1126,7 @@ mcomp_flags (char *name) static char * -mcomp_add (long flags, char *s1, char *s2) +mcomp_add (unsigned long flags, char *s1, char *s2) { char *dp; @@ -1287,6 +1287,13 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) 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 @@ -1302,7 +1309,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) 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; @@ -1329,7 +1336,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) 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); @@ -1349,7 +1356,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) && !(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)) @@ -1361,7 +1368,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) putstr (" ", c1->c_flags); } if (c1->c_flags & UPPERCASE) - ToUpper(c2->c_text); + to_upper(c2->c_text); count = 0; if (cchdr) { @@ -1406,7 +1413,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) static char * -oneline (char *stuff, long flags) +oneline (char *stuff, unsigned long flags) { int spc; char *cp, *ret; @@ -1458,7 +1465,7 @@ oneline (char *stuff, long flags) 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. */ @@ -1478,7 +1485,7 @@ putstr (char *string, long flags) 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); @@ -1507,7 +1514,7 @@ putstr (char *string, long flags) static void -putch (char ch, long flags) +putch (char ch, unsigned long flags) { char buf[BUFSIZ]; @@ -1561,9 +1568,24 @@ putch (char ch, long flags) 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; } @@ -1577,7 +1599,11 @@ putch (char ch, long flags) return; } - putchar (ch); + if (flags & FORCE7BIT && ! isascii((unsigned char) ch)) { + putchar ('?'); + } else { + putchar (ch); + } } @@ -1597,7 +1623,7 @@ pipeser (int i) { NMH_UNUSED (i); - done (NOTOK); + mhldone (NOTOK); } @@ -1608,13 +1634,10 @@ quitser (int i) putchar ('\n'); fflush (stdout); - done (NOTOK); + mhldone (NOTOK); } -#undef adios -#undef done - static void mhladios (char *what, char *fmt, ...) {