X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/71458b3b2492943349f7693a46792756d5013c69..92128dac:/uip/mhlsbr.c?ds=sidebyside diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 6a1c3db7..3a53941d 100644 --- a/uip/mhlsbr.c +++ b/uip/mhlsbr.c @@ -332,7 +332,6 @@ static void pipeser (int); static void quitser (int); static void mhladios (char *, char *, ...); static void mhldone (int); -static void m_popen (char *); static void filterbody (struct mcomp *, char *, int, int, FILE *, m_getfld_state_t); static void compile_formatfield(struct mcomp *); @@ -349,11 +348,9 @@ mhl (int argc, char **argv) char buf[BUFSIZ], *files[MAXARGS]; char **argp, **arguments; + /* Need this if called from main() of show(1). */ invo_name = r1bindex (argv[0], '/'); - /* read user profile/context */ - context_read(); - arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -484,7 +481,7 @@ mhl (int argc, char **argv) SIGNAL2 (SIGQUIT, quitser); } SIGNAL2 (SIGPIPE, pipeser); - m_popen (moreproc); + m_popen (moreproc, mhl_action != NULL); ontty = PITTY; } else { SIGNAL (SIGINT, SIG_IGN); @@ -545,7 +542,7 @@ mhl_format (char *file, int length, int width) { int i; char *bp, *cp, **ip; - char *ap, buffer[BUFSIZ], name[NAMESZ]; + char *ap, name[NAMESZ]; struct mcomp *c1; struct stat st; FILE *fp; @@ -666,6 +663,8 @@ mhl_format (char *file, int length, int width) if (mhldebug) { for (c1 = fmthd; c1; c1 = c1->c_next) { + char buffer[BUFSIZ]; + fprintf (stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n", c1->c_name, c1->c_text, c1->c_ovtxt); fprintf (stderr, "\tnfs=0x%x fmt=0x%x\n", @@ -1146,7 +1145,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) { int dat[5]; char *ap, *cp; - char buffer[BUFSIZ], error[BUFSIZ]; + char error[BUFSIZ]; struct pqpair *p, *q; struct pqpair pq; struct mailname *mp; @@ -1156,20 +1155,22 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) dat[0] = 0; dat[1] = 0; dat[2] = filesize; - dat[3] = sizeof(buffer) - 1; + dat[3] = BUFSIZ - 1; dat[4] = 0; if (!(c1->c_flags & ADDRFMT)) { + charstring_t scanl = charstring_create (BUFSIZ); + if (c1->c_c_text) c1->c_c_text->c_text = ap; if ((cp = strrchr(ap, '\n'))) /* drop ending newline */ if (!cp[1]) *cp = 0; - fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, - dat, NULL); + fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL); /* Don't need to append a newline, dctime() already did */ - c2->c_text = getcpy (buffer); + c2->c_text = charstring_buffer_copy (scanl); + charstring_free (scanl); /* ap is now owned by the component struct, so do NOT free it here */ return; @@ -1191,6 +1192,9 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) } for (p = pq.pq_next; p; p = q) { + charstring_t scanl = charstring_create (BUFSIZ); + char *buffer; + if (c1->c_c_text) { c1->c_c_text->c_text = p->pq_text; p->pq_text = NULL; @@ -1200,15 +1204,16 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2) p->pq_error = NULL; } - fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, - dat, NULL); - if (*buffer) { + fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL); + buffer = charstring_buffer_copy (scanl); + if (strlen (buffer) > 0) { if (c2->c_text) c2->c_text = add (",\n", c2->c_text); if (*(cp = buffer + strlen (buffer) - 1) == '\n') *cp = 0; c2->c_text = add (buffer, c2->c_text); } + charstring_free (scanl); if (p->pq_text) free (p->pq_text); @@ -1564,62 +1569,6 @@ quitser (int i) } -int -mhlsbr (int argc, char **argv, FILE *(*action)()) -{ - SIGNAL_HANDLER istat = NULL, pstat = NULL, qstat = NULL; - char *cp = NULL; - struct mcomp *c1; - struct arglist *a, *a2; - - switch (setjmp (mhlenv)) { - case OK: - cp = invo_name; - sleepsw = 0; /* XXX */ - bellflg = clearflg = forwflg = forwall = exitstat = 0; - digest = NULL; - ontty = NOTTY; - mhl_action = action; - - /* - * If signal is at default action, then start ignoring - * it, else let it set to its current action. - */ - if ((istat = SIGNAL (SIGINT, SIG_IGN)) != SIG_DFL) - SIGNAL (SIGINT, istat); - if ((qstat = SIGNAL (SIGQUIT, SIG_IGN)) != SIG_DFL) - SIGNAL (SIGQUIT, qstat); - pstat = SIGNAL (SIGPIPE, pipeser); - mhl (argc, argv); /* FALL THROUGH! */ - - default: - SIGNAL (SIGINT, istat); - SIGNAL (SIGQUIT, qstat); - SIGNAL (SIGPIPE, SIG_IGN);/* should probably change to block instead */ - if (ontty == PITTY) - m_pclose (); - SIGNAL (SIGPIPE, pstat); - invo_name = cp; - if (holder.c_text) { - free (holder.c_text); - holder.c_text = NULL; - } - free_queue (&msghd, &msgtl); - for (c1 = fmthd; c1; c1 = c1->c_next) - c1->c_flags &= ~HDROUTPUT; - - a = arglist_head; - while (a) { - if (a->a_nfs) - free(a->a_nfs); - a2 = a->a_next; - free(a); - a = a2; - } - return exitstat; - } -} - #undef adios #undef done @@ -1646,74 +1595,6 @@ mhldone (int status) } -static int m_pid = NOTOK; -static int sd = NOTOK; - -static void -m_popen (char *name) -{ - int pd[2]; - char *file; - char **arglist; - - if (mhl_action && (sd = dup (fileno (stdout))) == NOTOK) - adios ("standard output", "unable to dup()"); - - if (pipe (pd) == NOTOK) - adios ("pipe", "unable to"); - - switch (m_pid = fork()) { - case NOTOK: - adios ("fork", "unable to"); - - case OK: - SIGNAL (SIGINT, SIG_DFL); - SIGNAL (SIGQUIT, SIG_DFL); - - close (pd[1]); - if (pd[0] != fileno (stdin)) { - dup2 (pd[0], fileno (stdin)); - close (pd[0]); - } - arglist = argsplit(name, &file, NULL); - execvp (file, arglist); - fprintf (stderr, "unable to exec "); - perror (name); - _exit (-1); - - default: - close (pd[0]); - if (pd[1] != fileno (stdout)) { - dup2 (pd[1], fileno (stdout)); - close (pd[1]); - } - } -} - - -void -m_pclose (void) -{ - if (m_pid == NOTOK) - return; - - if (sd != NOTOK) { - fflush (stdout); - if (dup2 (sd, fileno (stdout)) == NOTOK) - adios ("standard output", "unable to dup2()"); - - clearerr (stdout); - close (sd); - sd = NOTOK; - } - else - fclose (stdout); - - pidwait (m_pid, OK); - m_pid = NOTOK; -} - - /* * Compile a format string used by the formatfield option and save it * for later. @@ -1885,22 +1766,25 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp, */ for (a = arglist_head, i = argp; a != NULL; a = a->a_next, i++) { - args[i] = mh_xmalloc(BUFSIZ); - fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL); + charstring_t scanl = charstring_create (BUFSIZ); + + fmt_scan(a->a_fmt, scanl, BUFSIZ, dat, NULL); + args[i] = charstring_buffer_copy (scanl); + charstring_free (scanl); /* * fmt_scan likes to put a trailing newline at the end of the * format string. If we have one, get rid of it. */ s = strlen(args[i]); if (args[i][s - 1] == '\n') - args[i][s - 1] = '\0'; + args[i][s - 1] = '\0'; if (mhldebug) - fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n", + fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n", a->a_nfs, args[i]); } - if (dup2(fdinput[0], STDIN_FILENO) < 0) { + if (dup2(fdinput[0], STDIN_FILENO) < 0) { adios("formatproc", "Unable to dup2() standard input"); } if (dup2(fdoutput[1], STDOUT_FILENO) < 0) {