X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a57e5d9907d845d6f83d2cfdea55cd52efad793f..07dbafdaf673d7f20d7f93ab4e8e42c6c7f00a2d:/uip/mhlsbr.c?ds=sidebyside diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 0c9719c2..35e918bb 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -88,11 +88,12 @@ DEFINE_SWITCH_ARRAY(MHL, mhlswitches); #define DATEFMT 0x000800 /* contains dates */ #define FORMAT 0x001000 /* parse address/date/RFC-2047 field */ #define INIT 0x002000 /* initialize component */ +#define RTRIM 0x004000 /* trim trailing whitespace */ #define SPLIT 0x010000 /* split headers (don't concatenate) */ #define NONEWLINE 0x020000 /* don't write trailing newline */ #define NOWRAP 0x040000 /* Don't wrap lines ever */ #define FMTFILTER 0x080000 /* Filter through format filter */ -#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER" +#define LBITS "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\017RTRIM\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER" #define GFLAGS (NOCOMPONENT | UPPERCASE | CENTER | LEFTADJUST | COMPRESS | SPLIT | NOWRAP) /* @@ -221,6 +222,8 @@ static struct triple triples[] = { { "nocompress", 0, COMPRESS }, { "split", SPLIT, 0 }, { "nosplit", 0, SPLIT }, + { "rtrim", RTRIM, 0 }, + { "nortrim", 0, RTRIM }, { "addrfield", ADDRFMT, DATEFMT }, { "bell", BELL, 0 }, { "nobell", 0, BELL }, @@ -400,7 +403,8 @@ mhl (int argc, char **argv) case SLEEPSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - sleepsw = atoi (cp);/* ZERO ok! */ + else + sleepsw = atoi (cp);/* ZERO ok! */ continue; case PROGSW: @@ -422,13 +426,13 @@ mhl (int argc, char **argv) case LENSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - if ((length = atoi (cp)) < 1) + else if ((length = atoi (cp)) < 1) adios (NULL, "bad argument %s %s", argp[-2], cp); continue; case WIDTHSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - if ((width = atoi (cp)) < 1) + else if ((width = atoi (cp)) < 1) adios (NULL, "bad argument %s %s", argp[-2], cp); continue; @@ -439,13 +443,13 @@ mhl (int argc, char **argv) case ISSUESW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - if ((issue = atoi (cp)) < 1) + else if ((issue = atoi (cp)) < 1) adios (NULL, "bad argument %s %s", argp[-2], cp); continue; case VOLUMSW: if (!(cp = *argp++) || *cp == '-') adios (NULL, "missing argument to %s", argp[-2]); - if ((volume = atoi (cp)) < 1) + else if ((volume = atoi (cp)) < 1) adios (NULL, "bad argument %s %s", argp[-2], cp); continue; @@ -541,7 +545,7 @@ static void mhl_format (char *file, int length, int width) { int i; - char *bp, *cp, **ip; + char *bp, **ip; char *ap, name[NAMESZ]; struct mcomp *c1; struct stat st; @@ -587,11 +591,10 @@ mhl_format (char *file, int length, int width) if (*bp == ';') continue; - if ((cp = strchr(bp, '\n'))) - *cp = 0; + TrimSuffixC(bp, '\n'); if (*bp == ':') { - c1 = add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT); + (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT); continue; } @@ -610,7 +613,7 @@ mhl_format (char *file, int length, int width) int n = 0; /* split the fields */ - tmparray = brkstring (getcpy (++parptr), ",", NULL); + tmparray = brkstring (mh_xstrdup(++parptr), ",", NULL); /* count number of fields split */ p = tmparray; @@ -641,14 +644,14 @@ mhl_format (char *file, int length, int width) if (!c1->c_nfs && global.c_nfs) { if (c1->c_flags & DATEFMT) { if (global.c_flags & DATEFMT) { - c1->c_nfs = getcpy (global.c_nfs); + c1->c_nfs = mh_xstrdup(global.c_nfs); compile_formatfield(c1); } } else if (c1->c_flags & ADDRFMT) { if (global.c_flags & ADDRFMT) { - c1->c_nfs = getcpy (global.c_nfs); + c1->c_nfs = mh_xstrdup(global.c_nfs); compile_formatfield(c1); } } @@ -774,7 +777,7 @@ evalvar (struct mcomp *c1) return 1; } - args = (struct arglist *) calloc((size_t) 1, sizeof(struct arglist)); + NEW0(args); if (arglist_tail) arglist_tail->a_next = args; @@ -832,7 +835,7 @@ ptos (char *name, char **s) } c = *parptr; *parptr = 0; - *s = getcpy (cp); + *s = mh_xstrdup(cp); if ((*parptr = c) == '"') parptr++; return 0; @@ -871,14 +874,18 @@ parse (void) static void process (char *folder, char *fname, int ofilen, int ofilec) { - char *cp = NULL; - FILE *fp = NULL; + /* static to prevent "might be clobbered" warning from gcc 4.9.2: */ + static char *cp; + static FILE *fp; struct mcomp *c1; struct stat st; struct arglist *ap; /* volatile to prevent "might be clobbered" warning from gcc: */ char *volatile fname2 = fname ? fname : "(stdin)"; + cp = NULL; + fp = NULL; + switch (setjmp (env)) { case OK: if (fname) { @@ -896,10 +903,11 @@ process (char *folder, char *fname, int ofilen, int ofilec) } else { filesize = 0; } - cp = folder ? concat (folder, ":", fname2, NULL) : getcpy (fname2); + cp = folder ? concat (folder, ":", fname2, NULL) : mh_xstrdup(fname2); if (ontty != PITTY) SIGNAL (SIGINT, intrser); mhlfile (fp, cp, ofilen, ofilec); /* FALL THROUGH! */ + free (cp); for (ap = arglist_head; ap; ap = ap->a_next) { fmt_free(ap->a_fmt, 0); @@ -909,12 +917,11 @@ process (char *folder, char *fname, int ofilen, int ofilec) if (arglist_head) fmt_free(NULL, 1); - default: + default: if (ontty != PITTY) SIGNAL (SIGINT, SIG_IGN); - if (mhl_action == NULL && fp != stdin) + if (mhl_action == NULL && fp != stdin && fp != NULL) fclose (fp); - free (cp); if (holder.c_text) { free (holder.c_text); holder.c_text = NULL; @@ -982,7 +989,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec) nmh_clear_screen (); } else - printf ("\n"); + putchar('\n'); break; default: @@ -1180,17 +1187,15 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) (q = &pq)->pq_next = NULL; while ((cp = getname (ap))) { - if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL) - adios (NULL, "unable to allocate pqpair memory"); - - if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) { - p->pq_text = getcpy (cp); - p->pq_error = getcpy (error); - } else { - p->pq_text = getcpy (mp->m_text); - mnfree (mp); - } - q = (q->pq_next = p); + NEW0(p); + if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) { + p->pq_text = mh_xstrdup(cp); + p->pq_error = mh_xstrdup(error); + } else { + p->pq_text = getcpy (mp->m_text); + mnfree (mp); + } + q = (q->pq_next = p); } for (p = pq.pq_next; p; p = q) { @@ -1208,7 +1213,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL); buffer = charstring_buffer_copy (scanl); - if (strlen (buffer) > 0) { + if (*buffer) { if (c2->c_text) c2->c_text = add (",\n", c2->c_text); if (*(cp = buffer + strlen (buffer) - 1) == '\n') @@ -1235,21 +1240,19 @@ add_queue (struct mcomp **head, struct mcomp **tail, char *name, char *text, int { struct mcomp *c1; - if ((c1 = (struct mcomp *) calloc ((size_t) 1, sizeof(*c1))) == NULL) - adios (NULL, "unable to allocate comp memory"); - + NEW0(c1); c1->c_flags = flags & ~INIT; - if ((c1->c_name = name ? getcpy (name) : NULL)) - c1->c_flags |= mcomp_flags (c1->c_name); - c1->c_text = text ? getcpy (text) : NULL; + if ((c1->c_name = name ? mh_xstrdup(name) : NULL)) + c1->c_flags |= mcomp_flags (c1->c_name); + c1->c_text = text ? mh_xstrdup(text) : NULL; if (flags & INIT) { - if (global.c_ovtxt) - c1->c_ovtxt = getcpy (global.c_ovtxt); - c1->c_offset = global.c_offset; - c1->c_ovoff = global. c_ovoff; - c1->c_width = c1->c_length = 0; - c1->c_cwidth = global.c_cwidth; - c1->c_flags |= global.c_flags & GFLAGS; + if (global.c_ovtxt) + c1->c_ovtxt = mh_xstrdup(global.c_ovtxt); + c1->c_offset = global.c_offset; + c1->c_ovoff = global. c_ovoff; + c1->c_width = c1->c_length = 0; + c1->c_cwidth = global.c_cwidth; + c1->c_flags |= global.c_flags & GFLAGS; } if (*head == NULL) *head = c1; @@ -1290,6 +1293,12 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) { int count, cchdr; char *cp; + /* + * Create a copy of c1->c_text with trailing whitespace + * trimmed, for use with blank lines. + */ + char *trimmed_prefix = + rtrim (add (c1->c_text ? c1->c_text : c1->c_name, NULL)); cchdr = 0; lm = 0; @@ -1305,7 +1314,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) onelp = NULL; if (c1->c_flags & CLEARTEXT) { - putstr (c1->c_text, c1->c_flags); + putstr (c1->c_flags & RTRIM ? rtrim (c1->c_text) : c1->c_text, + c1->c_flags); putstr ("\n", c1->c_flags); return; } @@ -1379,21 +1389,33 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag) count += c1->c_offset; if ((cp = oneline (c2->c_text, c1->c_flags))) - putstr(cp, c1->c_flags); + /* Output line, trimming trailing whitespace if requested. */ + putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags); if (term == '\n') putstr ("\n", c1->c_flags); while ((cp = oneline (c2->c_text, c1->c_flags))) { lm = count; if (flag == BODYCOMP - && !(c1->c_flags & NOCOMPONENT)) - putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags); - if (*cp) - putstr (cp, c1->c_flags); + && !(c1->c_flags & NOCOMPONENT)) { + /* Output component, trimming trailing whitespace if there + is no text on the line. */ + if (*cp) { + putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags); + } else { + putstr (trimmed_prefix, c1->c_flags); + } + } + if (*cp) { + /* Output line, trimming trailing whitespace if requested. */ + putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags); + } if (term == '\n') putstr ("\n", c1->c_flags); } if (flag == BODYCOMP && term == '\n') c1->c_flags &= ~HDROUTPUT; /* Buffer ended on a newline */ + + free (trimmed_prefix); }