X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=b2adebfea5cd53b1d668490ab1e37b10da5f1242;hp=a5864c11debf0f41e0bf2e4d74befa27aa3b41a6;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=2abb9a7cfb0930e27062088734d306e7d78e4cc2

diff --git a/uip/repl.c b/uip/repl.c
index a5864c1..b2adebf 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -16,6 +16,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define GROUPSW  0
@@ -59,6 +60,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 static struct swit ccswitches[] = {
 #define CTOSW  0
 	{ "to", 0 },
@@ -71,15 +74,6 @@ static struct swit ccswitches[] = {
 	{ NULL, 0 }
 };
 
-/*
-** Buffer size for content part of header fields.
-** We want this to be large enough so that we don't
-** do a lot of extra FLDPLUS calls on m_getfld but
-** small enough so that we don't snarf the entire
-** message body when we're not going to use any of it.
-*/
-#define SBUFSIZ 256
-
 static short ccto = -1;
 static short cccc = -1;
 static short ccme = -1;
@@ -101,8 +95,6 @@ static struct mailname mq;
 static struct format *fmt;
 
 static int ncomps = 0;  /* # of interesting components */
-static char **compbuffers = NULL;  /* buffers for component text */
-static struct comp **used_buf = NULL;  /* stack for comp that use buffers */
 
 static int dat[5];  /* aux. data for format routine */
 
@@ -144,14 +136,14 @@ main(int argc, char **argv)
 	FILE *in;
 	int buildsw = 0;
 
-	filter = getcpy(etcpath(mhlreply));
-
 	setlocale(LC_ALL, "");
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
 	context_read();
 
+	filter = mh_xstrdup(etcpath(mhlreply));
+
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
@@ -160,17 +152,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				exit(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s: [+folder] [msg] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				exit(0);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case GROUPSW:
 				groupreply++;
@@ -188,27 +180,27 @@ main(int argc, char **argv)
 
 			case CCSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				docc(cp, 1);
 				continue;
 			case NCCSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				docc(cp, 0);
 				continue;
 
 			case EDITRSW:
 				if (!(ed = *argp++) || *ed == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
 			case WHATSW:
 				if (!(whatnowproc = *argp++) ||
 						*whatnowproc == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
@@ -218,23 +210,23 @@ main(int argc, char **argv)
 
 			case FILESW:
 				if (file)
-					adios(NULL, "only one file at a time!");
+					adios(EX_USAGE, NULL, "only one file at a time!");
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				file = getcpy(expanddir(cp));
+				file = mh_xstrdup(expanddir(cp));
 				continue;
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
 
 			case FILTSW:
 				if (!(cp = *argp++) || *cp == '-')
-					adios(NULL, "missing argument to %s",
+					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				filter = getcpy(etcpath(cp));
+				filter = mh_xstrdup(etcpath(cp));
 				continue;
 			case NFILTSW:
 				filter = NULL;
@@ -258,12 +250,12 @@ main(int argc, char **argv)
 		}
 		if (*cp == '+' || *cp == '@') {
 			if (folder)
-				adios(NULL, "only one folder at a time!");
+				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 		} else {
 			if (msg)
-				adios(NULL, "only one message at a time!");
+				adios(EX_USAGE, NULL, "only one message at a time!");
 			else
 				msg = cp;
 		}
@@ -276,10 +268,10 @@ main(int argc, char **argv)
 	if (ccme == -1)
 		ccme = groupreply;
 
-	cwd = getcpy(pwd());
+	cwd = mh_xstrdup(pwd());
 
 	if (file && (msg || folder))
-		adios(NULL, "can't mix files and folders/msgs");
+		adios(EX_USAGE, NULL, "can't mix files and folders/msgs");
 
 	strncpy(drft, buildsw ? toabsdir("reply") : m_draft(seq_beyond),
 			sizeof(drft));
@@ -306,24 +298,23 @@ main(int argc, char **argv)
 		maildir = toabsdir(folder);
 
 		if (chdir(maildir) == NOTOK)
-			adios(maildir, "unable to change directory to");
+			adios(EX_OSERR, maildir, "unable to change directory to");
 
 		/* read folder and create message structure */
 		if (!(mp = folder_read(folder)))
-			adios(NULL, "unable to read folder %s", folder);
+			adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
 		/* check for empty folder */
 		if (mp->nummsg == 0)
-			adios(NULL, "no messages in %s", folder);
+			adios(EX_DATAERR, NULL, "no messages in %s", folder);
 
 		/* parse the message range/sequence/name and set SELECTED */
 		if (!m_convert(mp, msg))
-			/* sysexits.h EX_USAGE */
-			exit(1);
+			exit(EX_SOFTWARE);
 		seq_setprev(mp);  /* set the previous-sequence */
 
 		if (mp->numsel > 1)
-			adios(NULL, "only one message at a time!");
+			adios(EX_USAGE, NULL, "only one message at a time!");
 
 		context_replace(curfolder, folder); /* update current folder */
 		seq_setcur(mp, mp->lowsel);  /* update current message  */
@@ -331,10 +322,10 @@ main(int argc, char **argv)
 		context_save();  /* save the context file   */
 	}
 
-	msg = file ? file : getcpy(m_name(mp->lowsel));
+	msg = file ? file : mh_xstrdup(m_name(mp->lowsel));
 
 	if ((in = fopen(msg, "r")) == NULL)
-		adios(msg, "unable to open");
+		adios(EX_IOERR, msg, "unable to open");
 
 	/* find form (components) file */
 	if (!form) {
@@ -348,10 +339,9 @@ main(int argc, char **argv)
 	fclose(in);
 
 	if (buildsw)
-		exit(0);
+		exit(EX_OK);
 	what_now(ed, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL, cwd);
-	/* sysexits.h EX_SOFTWARE */
-	return 1;
+	return EX_OSERR;
 }
 
 static void
@@ -360,9 +350,9 @@ docc(char *cp, int ccflag)
 	switch (smatch(cp, ccswitches)) {
 	case AMBIGSW:
 		ambigsw(cp, ccswitches);
-		exit(1);
+		exit(EX_USAGE);
 	case UNKWNSW:
-		adios(NULL, "-%scc %s unknown", ccflag ? "" : "no", cp);
+		adios(EX_USAGE, NULL, "-%scc %s unknown", ccflag ? "" : "no", cp);
 
 	case CTOSW:
 		ccto = ccflag;
@@ -389,20 +379,19 @@ static void
 replout(FILE *inb, char *drft, struct msgs *mp,
 	int mime, char *form, char *filter)
 {
-	register int state, i;
-	register struct comp *cptr;
-	register char *tmpbuf;
-	register char **nxtbuf;
-	register char **ap;
-	register struct comp **savecomp;
+	enum state state;
+	struct field f = {{0}};
+	int i;
+	struct comp *cptr;
+	char **ap;
 	int char_read = 0, format_len, mask;
-	char name[NAMESZ], *scanl;
+	char *scanl;
 	unsigned char *cp;
 	FILE *out;
 
 	mask = umask(~m_gmprot());
 	if ((out = fopen(drft, "w")) == NULL)
-		adios(drft, "unable to create");
+		adios(EX_CANTCREAT, drft, "unable to create");
 
 	umask(mask);
 
@@ -413,21 +402,6 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 	/* compile format string */
 	ncomps = fmt_compile(cp, &fmt) + 1;
 
-	if (!(nxtbuf = compbuffers = (char **)
-			calloc((size_t) ncomps, sizeof(char *))))
-		adios(NULL, "unable to allocate component buffers");
-	if (!(savecomp = used_buf = (struct comp **)
-			calloc((size_t) (ncomps+1), sizeof(struct comp *))))
-		adios(NULL, "unable to allocate component buffer stack");
-	savecomp += ncomps + 1;
-	*--savecomp = NULL;  /* point at zero'd end minus 1 */
-
-	for (i = ncomps; i--; )
-		*nxtbuf++ = mh_xmalloc(SBUFSIZ);
-
-	nxtbuf = compbuffers;  /* point at start */
-	tmpbuf = *nxtbuf++;
-
 	for (ap = addrcomps; *ap; ap++) {
 		FINDCOMP(cptr, *ap);
 		if (cptr)
@@ -450,7 +424,7 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 	if ((cp = getenv("USER"))) {
 		FINDCOMP(cptr, "user");
 		if (cptr)
-			cptr->c_text = getcpy(cp);
+			cptr->c_text = mh_xstrdup(cp);
 	}
 	if (!ccme)
 		ismymbox(NULL);
@@ -458,11 +432,10 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 	/*
 	** pick any interesting stuff out of msg "inb"
 	*/
-	for (state = FLD;;) {
-		state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb);
+	for (state = FLD2;;) {
+		state = m_getfld2(state, &f, inb);
 		switch (state) {
-		case FLD:
-		case FLDPLUS:
+		case FLD2:
 			/*
 			** if we're interested in this component, save
 			** a pointer to the component text, then start
@@ -470,51 +443,45 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 			** temp buffer (buffer switching saves an extra
 			** copy of the component text).
 			*/
-			if ((cptr = wantcomp[CHASH(name)]))
+			if ((cptr = wantcomp[CHASH(f.name)])) {
 				do {
-					if (!mh_strcasecmp(name, cptr->c_name)) {
-						char_read += msg_count;
-						if (! cptr->c_text) {
-							i = strlen(cptr->c_text = tmpbuf) - 1;
-							if (tmpbuf[i] == '\n')
-								tmpbuf[i] = '\0';
-							*--savecomp = cptr;
-							tmpbuf = *nxtbuf++;
-						} else {
-							i = strlen(cp = cptr->c_text) - 1;
-							if (cp[i] == '\n') {
-								if (cptr->c_type & CT_ADDR) {
-									cp[i] = '\0';
-									cp = add(",\n\t", cp);
-								} else {
-									cp = add("\t", cp);
-								}
-							}
-							cptr->c_text = add(tmpbuf, cp);
+					if (mh_strcasecmp(f.name, cptr->c_name)!=0) {
+						continue;
+					}
+					char_read += strlen(f.value);
+					if (!cptr->c_text) {
+						cptr->c_text = mh_xstrdup(f.value);
+						i = strlen(cptr->c_text) - 1;
+						if (cptr->c_text[i] == '\n') {
+							cptr->c_text[i] = '\0';
 						}
-						while (state == FLDPLUS) {
-							state = m_getfld(state, name, tmpbuf,
-											  SBUFSIZ, inb);
-							cptr->c_text = add(tmpbuf, cptr->c_text);
-							char_read += msg_count;
+					} else {
+						cp = cptr->c_text;
+						i = strlen(cp) - 1;
+						if (cp[i] == '\n') {
+							if (cptr->c_type & CT_ADDR) {
+								cp[i] = '\0';
+								cp = add(",\n\t", cp);
+							} else {
+								cp = add("\t", cp);
+							}
 						}
-						break;
+						cptr->c_text = add(f.value, cp);
 					}
+					break;
 				} while ((cptr = cptr->c_next));
-
-			while (state == FLDPLUS)
-				state = m_getfld(state, name, tmpbuf,
-						SBUFSIZ, inb);
+			}
 			break;
 
-		case LENERR:
-		case FMTERR:
-		case BODY:
-		case FILEEOF:
+		case LENERR2:
+		case FMTERR2:
+		case IOERR2:
+		case BODY2:
+		case FILEEOF2:
 			goto finished;
 
 		default:
-			adios(NULL, "m_getfld() returned %d", state);
+			adios(EX_SOFTWARE, NULL, "m_getfld() returned %d", state);
 		}
 	}
 
@@ -528,7 +495,7 @@ finished:
 	*/
 	FINDCOMP(cptr, "subject")
 	if (cptr && (cp = cptr->c_text)) {
-		register char *sp = cp;
+		char *sp = cp;
 
 		for (;;) {
 			while (isspace(*cp))
@@ -541,12 +508,12 @@ finished:
 		}
 		if (sp != cptr->c_text) {
 			cp = cptr->c_text;
-			cptr->c_text = getcpy(sp);
-			free(cp);
+			cptr->c_text = mh_xstrdup(sp);
+			mh_free0(&cp);
 		}
 	}
 	i = format_len + char_read + 256;
-	scanl = mh_xmalloc((size_t) i + 2);
+	scanl = mh_xcalloc(i + 2, sizeof(char));
 	dat[0] = 0;
 	dat[1] = 0;
 	dat[2] = 0;
@@ -563,14 +530,14 @@ finished:
 	if (filter) {
 		fflush(out);
 		if (ferror(out))
-			adios(drft, "error writing");
+			adios(EX_IOERR, drft, "error writing");
 
 		replfilter(inb, out, filter);
 	}
 
 	fflush(out);
 	if (ferror(out))
-		adios(drft, "error writing");
+		adios(EX_IOERR, drft, "error writing");
 	fclose(out);
 
 	if (mime && mp) {
@@ -587,14 +554,7 @@ finished:
 	}
 
 	/* return dynamically allocated buffers */
-	free(scanl);
-	for (nxtbuf = compbuffers, i = ncomps; (cptr = *savecomp++);
-			nxtbuf++, i--)
-		free(cptr->c_text);  /* if not nxtbuf, nxtbuf already freed */
-	while ( i-- > 0)
-		free(*nxtbuf++);  /* free unused nxtbufs */
-	free((char *) compbuffers);
-	free((char *) used_buf);
+	mh_free0(&scanl);
 }
 
 static char *buf;  /* our current working buffer */
@@ -630,7 +590,7 @@ static unsigned int bufsiz=0;  /* current size of buf */
 ** returns a pointer to the concatenated address string.
 **
 ** We try to not do a lot of malloc/copy/free's (which is why we
-** don't call "getcpy") but still place no upper limit on the
+** don't call "mh_xstrdup") but still place no upper limit on the
 ** length of the result string.
 **
 ** This routine is an override for the equally named one in sbr/fmt_addr.c.
@@ -639,17 +599,17 @@ static unsigned int bufsiz=0;  /* current size of buf */
 char *
 formataddr(char *orig, char *str)
 {
-	register int len;
+	int len;
 	char baddr[BUFSIZ], error[BUFSIZ];
-	register int isgroup;
-	register char *dst;
-	register char *cp;
-	register char *sp;
-	register struct mailname *mp = NULL;
+	int isgroup;
+	char *dst;
+	char *cp;
+	char *sp;
+	struct mailname *mp = NULL;
 
 	/* if we don't have a buffer yet, get one */
 	if (bufsiz == 0) {
-		buf = mh_xmalloc(BUFINCR);
+		buf = mh_xcalloc(BUFINCR, sizeof(char));
 		last_dst = buf;  /* XXX */
 		bufsiz = BUFINCR - 6;  /* leave some slop */
 		bufend = buf + bufsiz;
@@ -711,7 +671,7 @@ static int
 insert(struct mailname *np)
 {
 	char buffer[BUFSIZ];
-	register struct mailname *mp;
+	struct mailname *mp;
 
 	if (np->m_mbox == NULL)
 		return 0;
@@ -743,40 +703,62 @@ insert(struct mailname *np)
 static void
 replfilter(FILE *in, FILE *out, char *filter)
 {
-	int pid, n;
-	char *errstr;
+	int pid, pid_show, n;
+	int mailpipe[2];
 
 	if (filter == NULL)
 		return;
 
 	if (access(filter, R_OK) == NOTOK)
-		adios(filter, "unable to read");
+		adios(EX_IOERR, filter, "unable to read");
 
 	rewind(in);
 	lseek(fileno(in), (off_t) 0, SEEK_SET);
 
 	switch (pid = fork()) {
 	case NOTOK:
-		adios("fork", "unable to");
+		adios(EX_OSERR, "fork", "unable to");
 
 	case OK:
-		dup2(fileno(in), fileno(stdin));
-		dup2(fileno(out), fileno(stdout));
-		for (n=3; n<OPEN_MAX; n++) {
-			close(n);
+		if (pipe(mailpipe) == -1) {
+			adios(EX_OSERR, "pipe", "can't create pipe");
 		}
 
-		execlp("mhl", "mhl", "-form", filter, NULL);
-		errstr = strerror(errno);
-		write(2, "unable to exec mhl: ", 20);
-		write(2, errstr, strlen(errstr));
-		write(2, "\n", 1);
-		_exit(-1);
+		switch (pid_show = fork()) {
+		case NOTOK:
+			adios(EX_OSERR, "fork", "unable to");
+		case OK:
+			dup2(fileno(in), STDIN_FILENO);
+			dup2(mailpipe[1], STDOUT_FILENO);
+			close(fileno(in));
+			close(fileno(out));
+			close(mailpipe[0]);
+			close(mailpipe[1]);
+			for (n=3; n<OPEN_MAX; n++) {
+				close(n);
+			}
+			execlp("show", "show", "-file", "-", NULL);
+			adios(EX_OSERR, "exec", "unable to");
+			break;
+		default:
+			dup2(mailpipe[0], STDIN_FILENO);
+			dup2(fileno(out), STDOUT_FILENO);
+			close(fileno(in));
+			close(fileno(out));
+			close(mailpipe[0]);
+			close(mailpipe[1]);
+			for (n=3; n<OPEN_MAX; n++) {
+				close(n);
+			}
+			execlp("mhl", "mhl", "-form", filter, NULL);
+			adios(EX_OSERR, "exec", "unable to");
+			break;
+		}
 
 	default:
-		if (pidXwait(pid, "mhl"))
-			/* sysexits.h EX_SOFTWARE */
-			exit(1);
+		if (pidXwait(pid, "mhl")) {
+			exit(EX_SOFTWARE);
+		}
 		fseek(out, 0L, SEEK_END);
 		break;
 	}