X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=df8134017dd73e6d76c2d9a521420c651c46f02d;hp=76280aa6bd3e81fdae6d9b079c073abf11bc44ae;hb=a87df3543d3bc128ba4079d1f95638476ba5ca50;hpb=c7b5e1df086bcc37ff40163ee67571f076cf6683

diff --git a/uip/send.c b/uip/send.c
index 76280aa..df81340 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -11,23 +11,30 @@
 #include <errno.h>
 #include <signal.h>
 #include <h/signals.h>
-#include <setjmp.h>
 #include <h/mime.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <sysexits.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
 #include <time.h>
 
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
 int debugsw = 0;  /* global */
-char *altmsg   = NULL;
+char *altmsg = NULL;
 char *annotext = NULL;
 char *distfile = NULL;
 
-static jmp_buf env;
-
 /* name of temp file for body content */
 static char body_file_name[MAXPATHLEN + 1];
 /* name of mhbuild composition temporary file */
@@ -42,7 +49,6 @@ static FILE *composition_file;  /* composition file pointer */
 ** static prototypes
 */
 static int sendsbr(char **, int, char *, struct stat *);
-static void armed_done(int) NORETURN;
 static void anno(struct stat *);
 static int sendaux(char **, int, char *, struct stat *);
 static int attach(char *);
@@ -50,6 +56,7 @@ static int signandenc(char *);
 static void clean_up_temporary_files(void);
 static int get_line(void);
 static void make_mime_composition_file_entry(char *);
+static char* strexit(int status);
 
 
 static struct swit switches[] = {
@@ -70,7 +77,7 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
+	int nmsgs = 0, nfiles = 0, distsw = 0, vecp = 1;
 	int msgnum, status;
 	int in, out;
 	int n;
@@ -96,19 +103,19 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown\n", cp);
+				adios(EX_USAGE, NULL, "-%s unknown\n", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf),
 						"%s [file] [switches]",
 						invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case DEBUGSW:
 				debugsw++;
@@ -122,43 +129,47 @@ main(int argc, char **argv)
 			if (*cp == '/') {
 				files[nfiles++] = cp;
 			} else {
-				msgs[msgp++] = cp;
+				msgs[nmsgs++] = cp;
 			}
 		}
 	}
 
-	if (!msgp && !nfiles) {
-		msgs[msgp++] = seq_cur;
-	}
-	maildir = toabsdir(draftfolder);
-
-	if (chdir(maildir) == NOTOK) {
-		adios(maildir, "unable to change directory to");
+	if (!nmsgs && !nfiles) {
+		msgs[nmsgs++] = seq_cur;
 	}
 
-	if (!(mp = folder_read(draftfolder))) {
-		adios(NULL, "unable to read draft folder %s", draftfolder);
-	}
-	if (mp->nummsg == 0) {
-		adios(NULL, "no messages in draft folder %s", draftfolder);
-	}
-	/* parse all the message ranges/sequences and set SELECTED */
-	for (msgnum = 0; msgnum < msgp; msgnum++) {
-		if (!m_convert(mp, msgs[msgnum])) {
-			done(1);
+	if (nmsgs) {
+		maildir = toabsdir(draftfolder);
+		if (chdir(maildir) == NOTOK) {
+			adios(EX_OSERR, maildir, "unable to change directory to");
 		}
-	}
-	seq_setprev(mp);
+		if (!(mp = folder_read(draftfolder))) {
+			adios(EX_IOERR, NULL, "unable to read draft folder %s",
+					draftfolder);
+		}
+		if (mp->nummsg == 0) {
+			adios(EX_DATAERR, NULL, "no messages in draft folder %s",
+					draftfolder);
+		}
+		/* parse all the msgranges/sequences and set SELECTED */
+		for (msgnum = 0; msgnum < nmsgs; msgnum++) {
+			if (!m_convert(mp, msgs[msgnum])) {
+				exit(EX_USAGE);
+			}
+		}
+		seq_setprev(mp);
 
-	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected(mp, msgnum)) {
-			files[nfiles++] = getcpy(m_name(msgnum));
-			unset_exists(mp, msgnum);
+		for (nmsgs = 0, msgnum = mp->lowsel;
+				msgnum <= mp->hghsel; msgnum++) {
+			if (is_selected(mp, msgnum)) {
+				files[nfiles++] = getcpy(m_name(msgnum));
+				unset_exists(mp, msgnum);
+			}
 		}
-	}
 
-	mp->msgflags |= SEQMOD;
-	seq_save(mp);
+		mp->msgflags |= SEQMOD;
+		seq_save(mp);
+	}
 
 	if (!(cp = getenv("SIGNATURE")) || !*cp) {
 		if ((cp = context_find("signature")) && *cp) {
@@ -166,9 +177,9 @@ main(int argc, char **argv)
 		}
 	}
 
-	for (msgnum = 0; msgnum < nfiles; msgnum++) {
-		if (stat(files[msgnum], &st) == NOTOK) {
-			adios(files[msgnum], "unable to stat draft file");
+	for (n = 0; n < nfiles; n++) {
+		if (stat(files[n], &st) == NOTOK) {
+			adios(EX_IOERR, files[n], "unable to stat draft file");
 		}
 	}
 
@@ -182,12 +193,12 @@ main(int argc, char **argv)
 	if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) {
 		vec[vecp++] = "-dist";
 		if ((in = open(altmsg, O_RDONLY)) == NOTOK) {
-			adios(altmsg, "unable to open for reading");
+			adios(EX_IOERR, altmsg, "unable to open for reading");
 		}
 		fstat(in, &st2);
 		distfile = getcpy(m_mktemp2(NULL, invo_name, NULL, NULL));
 		if ((out = creat(distfile, (int)st2.st_mode & 0777))==NOTOK) {
-			adios(distfile, "unable to open for writing");
+			adios(EX_IOERR, distfile, "unable to open for writing");
 		}
 		cpydata(in, out, altmsg, distfile);
 		close(in);
@@ -207,10 +218,10 @@ main(int argc, char **argv)
 		close(n);
 	}
 
-	for (msgnum = 0; msgnum < nfiles; msgnum++) {
-		switch (sendsbr(vec, vecp, files[msgnum], &st)) {
+	for (n = 0; n < nfiles; n++) {
+		switch (sendsbr(vec, vecp, files[n], &st)) {
 		case DONE:
-			done(++status);
+			exit(++status);
 		case NOTOK:
 			status++;  /* fall */
 		case OK:
@@ -219,8 +230,7 @@ main(int argc, char **argv)
 	}
 
 	context_save();
-	done(status);
-	return 1;
+	return status;
 }
 
 
@@ -230,8 +240,7 @@ main(int argc, char **argv)
 static int
 sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 {
-	int status;
-	char buffer[BUFSIZ];
+	int status, dupfd;
 	char *original_draft;
 
 	/*
@@ -282,27 +291,22 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 		break;
 	}
 
-	done=armed_done;
-	switch (setjmp(env)) {
-	case OK:
-		status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
-		if (status == OK) {
-			/* move original draft to +trash folder */
-			snprintf(buffer, sizeof buffer,
-					"</dev/null refile -file %s +trash",
-					original_draft);
-			if (system(buffer) != 0) {
-				advise(NULL, "unable to trash the draft");
-			}
+	if ((status = sendaux(vec, vecp, drft, st)) == OK) {
+		/* move original draft to +trash folder */
+		/* temporary close stdin, for refile not to ask */
+		dupfd = dup(0);
+		close(0);
+		if (execprogl("refile", "refile", "-file",
+				original_draft, "+trash",
+				(char *)NULL) != 0) {
+			advise(NULL, "unable to trash the draft");
 		}
-		break;
-
-	default:
+		dup2(dupfd, 0);
+		close(dupfd);
+	} else {
 		status = DONE;
-		break;
 	}
 
-	done=exit;
 	if (distfile) {
 		unlink(distfile);
 	}
@@ -316,18 +320,31 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 }
 
 static int
+contains_non_ascii(char *str)
+{
+	unsigned char *cp;
+
+	for (cp = str; *cp; cp++) {
+		if (*cp > 127) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static int
 attach(char *draft_file_name)
 {
 	char buf[MAXPATHLEN + 6];
 	int c;
 	int has_attachment;
-	int has_body;
-	int non_ascii; /* msg body contains non-ASCII chars */
+	int has_body = 0;
+	int non_ascii = 0; /* msg body or hdr contains non-ASCII chars */
 	int length;  /* length of attachment header field name */
 	char *p;
 
 	if (!(draft_file = fopen(draft_file_name, "r"))) {
-		adios(NULL, "can't open draft file `%s'.", draft_file_name);
+		adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
 	}
 
 	/* We'll grow the buffer as needed. */
@@ -343,6 +360,9 @@ attach(char *draft_file_name)
 				field[length] == ':') {
 			has_attachment = 1;
 		}
+		if (contains_non_ascii(field)) {
+			non_ascii = 1;
+		}
 	}
 
 	/*
@@ -351,16 +371,14 @@ attach(char *draft_file_name)
 	** Check if body contains at least one non-blank (= not empty)
 	** and if it contains any non-ASCII chars (= need MIME).
 	*/
-	has_body = 0;
-	non_ascii = 0;
 	while (get_line() != EOF) {
-		for (p = field; *p != '\0'; p++) {
-			if (*p != ' ' && *p != '\t') {
+		if (contains_non_ascii(field)) {
+			non_ascii = 1;
+		}
+		for (p = field; *p; p++) {
+			if (isgraph(*p)) {
 				has_body = 1;
 			}
-			if (*p > 127 || *p < 0) {
-				non_ascii = 1;
-			}
 		}
 		if (has_body && non_ascii) {
 			break;  /* that's been already enough information */
@@ -391,7 +409,7 @@ attach(char *draft_file_name)
 
 	if ((has_body && !body_file) || !composition_file) {
 		clean_up_temporary_files();
-		adios(NULL, "unable to open all of the temporary files.");
+		adios(EX_IOERR, NULL, "unable to open all of the temporary files.");
 	}
 
 	/* Copy non-attachment header fields to the temp composition file. */
@@ -425,9 +443,7 @@ attach(char *draft_file_name)
 	while (get_line() != EOF && *field && *field != '-') {
 		if (strncasecmp(field, attach_hdr, length) == 0 &&
 				field[length] == ':') {
-			for (p = field+length+1; *p==' ' || *p=='\t'; p++) {
-				continue;
-			}
+			p = trim(field+length+1);
 			if (*p == '+') {
 				/* forwarded message */
 				fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
@@ -440,8 +456,8 @@ attach(char *draft_file_name)
 	fclose(composition_file);
 
 	/* We're ready to roll! */
-	sprintf(buf, "mhbuild %s", composition_file_name);
-	if (system(buf) != 0) {
+	if (execprogl("mhbuild", "mhbuild", composition_file_name,
+			(char *)NULL) != 0) {
 		/* some problem */
 		clean_up_temporary_files();
 		return (NOTOK);
@@ -461,9 +477,10 @@ signandenc(char *draft_file_name)
 	char buf[BUFSIZ];
 	int dosign = 0;
 	int doenc = 0;
+	int ret;
 
 	if (!(draft_file = fopen(draft_file_name, "r"))) {
-		adios(NULL, "can't open draft file `%s'.", draft_file_name);
+		adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
 	}
 
 	/* We'll grow the buffer as needed. */
@@ -487,9 +504,14 @@ signandenc(char *draft_file_name)
 	strcpy(composition_file_name, draft_file_name);
 
 	/* We're ready to roll! */
-	sprintf(buf, "mhsign -m%s '%s'", doenc ? " -e" : "",
-			draft_file_name);
-	if (system(buf) != 0) {
+	if (doenc) {
+		ret = execprogl("mhsign", "mhsign", "-m", "-e",
+				draft_file_name, (char *)NULL);
+	} else {
+		ret = execprogl("mhsign", "mhsign", "-m",
+				draft_file_name, (char *)NULL);
+	}
+	if (ret != 0) {
 		/* some problem */
 		return (NOTOK);
 	}
@@ -549,6 +571,7 @@ make_mime_composition_file_entry(char *file_name)
 	char content_type[BUFSIZ];
 	char cmdbuf[BUFSIZ];
 	char *cmd = mimetypequeryproc;
+	int semicolon = 0;
 
 	for (np = m_defs; np; np = np->n_next) {
 		if (strcasecmp(np->n_name, mimetypequery)==0) {
@@ -560,7 +583,7 @@ make_mime_composition_file_entry(char *file_name)
 
 	if (!(fp = popen(cmdbuf, "r"))) {
 		clean_up_temporary_files();
-		adios(NULL, "unable to determine content type with `%s'",
+		adios(EX_IOERR, NULL, "unable to determine content type with `%s'",
 				cmdbuf);
 	}
 	if (fgets(content_type, sizeof content_type, fp) &&
@@ -576,14 +599,26 @@ make_mime_composition_file_entry(char *file_name)
 	/* TODO: don't use access(2) because it checks for ruid, not euid */
 	if (access(file_name, R_OK) != 0) {
 		clean_up_temporary_files();
-		adios(NULL, "unable to access file `%s'", file_name);
+		adios(EX_IOERR, NULL, "unable to access file `%s'", file_name);
 	}
 
-	cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
-	fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}",
-			content_type, cp, cp);
+	/* Check for broken file(1). See man page mh-profile(5). */
+	for (cp=content_type; *cp; cp++) {
+		if (isspace(*cp)) {
+			if (!semicolon) {
+				adios(EX_SOFTWARE, NULL, "Sorry, your Mime-Type-Query command (%s) is broken.\n\tThe output misses a semicolon before the whitespace.\n\tOutput was: %s", cmd, content_type);
+			}
+		} else if (*cp == ';') {
+			semicolon = 1;
+		} else {
+			semicolon = 0;
+		}
+	}
 
-	fprintf(composition_file, " %s\n", file_name);
+	cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
+	fprintf(composition_file,
+			"#%s; name=\"%s\" <> [%s] {attachment} %s\n",
+			content_type, cp, cp, file_name);
 
 	return;
 }
@@ -601,33 +636,34 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 
 	vec[vecp++] = drft;
 	if (distfile && distout(drft, distfile, backup) == NOTOK) {
-		done(1);
+		return DONE;
 	}
 	vec[vecp] = NULL;
 
 	switch (child_id = fork()) {
 	case -1:
 		/* oops -- fork error */
-		adios("fork", "unable to");
-		break;  /* NOT REACHED */
+		advise("fork", "unable to");
+		return DONE;
 
 	case 0:
 		/* child process -- send it */
 		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
 		perror(*vec);
-		_exit(-1);
+		_exit(EX_OSERR);
 		break;  /* NOT REACHED */
 
 	default:
 		/* parent process -- wait for it */
-		if ((status = pidwait(child_id, NOTOK)) == OK) {
+		status = pidwait(child_id, NOTOK);
+		if (WIFEXITED(status) && WEXITSTATUS(status) == EX_OK) {
 			if (annotext) {
 				anno(st);
 			}
 		} else {
 			/* spost failed */
-			advise(NULL, "message not delivered to anyone");
+			advise(NULL, "%s", strexit(status));
 			if (distfile) {
 				unlink(drft);
 				if (rename(backup, drft) == NOTOK) {
@@ -636,10 +672,10 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 				}
 			}
 		}
-		break;
 	}
 
-	return status;
+
+	return status ? NOTOK : status;
 }
 
 
@@ -649,6 +685,9 @@ anno(struct stat *st)
 	struct stat st2;
 	char *msgs, *folder;
 	char buf[BUFSIZ];
+	char *vec[MAXARGS];
+	int vecp = 0;
+	char *cp, *dp;
 
 	if (altmsg && (stat(altmsg, &st2) == NOTOK ||
 			st->st_mtime != st2.st_mtime ||
@@ -676,18 +715,45 @@ anno(struct stat *st)
 		advise(NULL, "annotate as `%s': %s %s", annotext,
 				folder, msgs);
 	}
-	snprintf(buf, sizeof buf, "anno -comp '%s' '+%s' %s",
-			annotext, folder, msgs);
-	if (system(buf) != 0) {
+	vec[vecp++] = "anno";
+	vec[vecp++] = "-comp";
+	vec[vecp++] = annotext;
+	snprintf(buf, sizeof buf, "+%s", folder);
+	vec[vecp++] = buf;
+
+	while (isspace(*msgs)) {
+		msgs++;
+	}
+	for (cp=dp=msgs; *cp; cp++) {
+		if (isspace(*cp)) {
+			while (isspace(*cp)) {
+				*cp++ = '\0';
+			}
+			vec[vecp++] = dp;
+			dp = cp;
+		}
+	}
+	vec[vecp++] = dp;
+	vec[vecp] = NULL;
+	if (execprog(*vec, vec) != 0) {
 		advise(NULL, "unable to annotate");
 	}
 }
 
 
-static void
-armed_done(int status)
+char*
+strexit(int status)
 {
-	longjmp(env, status ? status : NOTOK);
-
-	exit(status);
+	if (WIFSIGNALED(status)) {
+		return "spost or sendmail killed by signal";
+	}
+	if (!WIFEXITED(status)) {
+		return "message not delivered to anyone";
+	}
+	switch (WEXITSTATUS(status)) {
+	case EX_TEMPFAIL:
+		return "Temporary error, maybe the MTA has queued the message";
+	default:
+		return "message not delivered to anyone";
+	}
 }