X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=d7691db99a332a57c9ddc6322303cc6371b7bd91;hp=3ca6772190d9aba80ce5e58081dd6ce0de220acd;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=8bf8e1e29df17658c3d77629e17f88bf9159e21b

diff --git a/uip/send.c b/uip/send.c
index 3ca6772..d7691db 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -11,26 +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 */
-int verbosesw = 0;
-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 */
@@ -45,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 *);
@@ -70,6 +73,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
@@ -78,7 +82,7 @@ main(int argc, char **argv)
 	int msgnum, status;
 	int in, out;
 	int n;
-	char *cp, *maildir = NULL;
+	char *cp, *maildir = NULL, *folder = NULL;
 	char buf[BUFSIZ], **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
 	char *files[MAXARGS];
@@ -100,30 +104,34 @@ 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++;
 				/* fall */
 			case VERBSW:
-				verbosesw += 2;
 			case NVERBSW:
-				verbosesw--;
 				vec[vecp++] = --cp;
 				continue;
 			}
+		} else if (*cp == '+' || *cp == '@') {
+			if (folder) {
+				adios(EX_USAGE, NULL, "only one folder at a time!");
+			} else {
+				folder = mh_xstrdup(expandfol(cp));
+			}
 		} else {
 			if (*cp == '/') {
 				files[nfiles++] = cp;
@@ -138,22 +146,23 @@ main(int argc, char **argv)
 	}
 
 	if (nmsgs) {
-		maildir = toabsdir(draftfolder);
+		folder = folder ? folder : draftfolder;
+		maildir = toabsdir(folder);
 		if (chdir(maildir) == NOTOK) {
-			adios(maildir, "unable to change directory to");
+			adios(EX_OSERR, maildir, "unable to change directory to");
 		}
-		if (!(mp = folder_read(draftfolder))) {
-			adios(NULL, "unable to read draft folder %s",
-					draftfolder);
+		if (!(mp = folder_read(folder))) {
+			adios(EX_IOERR, NULL, "unable to read folder %s",
+					folder);
 		}
 		if (mp->nummsg == 0) {
-			adios(NULL, "no messages in draft folder %s",
-					draftfolder);
+			adios(EX_DATAERR, NULL, "no messages in folder %s",
+					folder);
 		}
 		/* parse all the msgranges/sequences and set SELECTED */
 		for (msgnum = 0; msgnum < nmsgs; msgnum++) {
 			if (!m_convert(mp, msgs[msgnum])) {
-				done(1);
+				exit(EX_USAGE);
 			}
 		}
 		seq_setprev(mp);
@@ -161,7 +170,7 @@ main(int argc, char **argv)
 		for (nmsgs = 0, msgnum = mp->lowsel;
 				msgnum <= mp->hghsel; msgnum++) {
 			if (is_selected(mp, msgnum)) {
-				files[nfiles++] = getcpy(m_name(msgnum));
+				files[nfiles++] = mh_xstrdup(m_name(msgnum));
 				unset_exists(mp, msgnum);
 			}
 		}
@@ -178,7 +187,7 @@ main(int argc, char **argv)
 
 	for (n = 0; n < nfiles; n++) {
 		if (stat(files[n], &st) == NOTOK) {
-			adios(files[n], "unable to stat draft file");
+			adios(EX_IOERR, files[n], "unable to stat draft file");
 		}
 	}
 
@@ -192,12 +201,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));
+		distfile = mh_xstrdup(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);
@@ -220,7 +229,7 @@ main(int argc, char **argv)
 	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:
@@ -229,8 +238,7 @@ main(int argc, char **argv)
 	}
 
 	context_save();
-	done(status);
-	return 1;
+	return status;
 }
 
 
@@ -240,8 +248,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;
 
 	/*
@@ -262,6 +269,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 	*/
 	switch (attach(drft)) {
 	case OK:
+		/* successfully MIMEified: use generate draft */
 		drft = composition_file_name;
 		break;
 
@@ -269,6 +277,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 		return (NOTOK);
 
 	case DONE:
+		/* already in MIME format: keep original draft */
 		break;
 	}
 
@@ -292,27 +301,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);
 	}
@@ -330,60 +334,22 @@ 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 length;  /* length of attachment header field name */
+	int length = strlen(attach_hdr);
 	char *p;
 
-	if (!(draft_file = fopen(draft_file_name, "r"))) {
-		adios(NULL, "can't open draft file `%s'.", draft_file_name);
-	}
-
-	/* We'll grow the buffer as needed. */
-	field = (char *)mh_xmalloc(field_size = 256);
-
-	/*
-	** Scan the draft file for an attachment header field name.
-	*/
-	length = strlen(attach_hdr);
-	has_attachment = 0;
-	while (get_line() != EOF && *field != '\0' && *field != '-') {
-		if (strncasecmp(field, attach_hdr, length)==0 &&
-				field[length] == ':') {
-			has_attachment = 1;
-		}
+	if(distfile) {
+		return DONE;
 	}
 
-	/*
-	** Look for at least one non-blank line in the body of the
-	** message which indicates content in the body.
-	** 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') {
-				has_body = 1;
-			}
-			if (*p > 127 || *p < 0) {
-				non_ascii = 1;
-			}
-		}
-		if (has_body && non_ascii) {
-			break;  /* that's been already enough information */
-		}
+	if (!(draft_file = fopen(draft_file_name, "r"))) {
+		adios(EX_IOERR, NULL, "can't open draft file `%s'.", draft_file_name);
 	}
 
-	if (!has_attachment && non_ascii==0) {
-		/* We don't need to convert it to MIME. */
-		return DONE;
-	}
+	/* We'll grow the buffer as needed. */
+	field = mh_xcalloc(field_size = 256, sizeof(char));
 
 	/*
-	** Else: mimify
+	** MIMEify
 	*/
 
 	/* Make names for the temporary files.  */
@@ -394,19 +360,27 @@ attach(char *draft_file_name)
 			m_mktemp(toabsdir(invo_name), NULL, NULL),
 			sizeof (composition_file_name));
 
-	if (has_body) {
-		body_file = fopen(body_file_name, "w");
-	}
+	body_file = fopen(body_file_name, "w");
 	composition_file = fopen(composition_file_name, "w");
 
-	if ((has_body && !body_file) || !composition_file) {
+	if (!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. */
 	rewind(draft_file);
 	while (get_line() != EOF && *field && *field != '-') {
+		if (strncasecmp(field, VRSN_FIELD, strlen(VRSN_FIELD))==0 &&
+				field[strlen(VRSN_FIELD)] == ':') {
+			/*
+			** The draft is already in MIME format, thus
+			** back out and use the original draft file.
+			*/
+			clean_up_temporary_files();
+			return DONE;
+		}
+
 		if (strncasecmp(field, attach_hdr, length) != 0 ||
 				field[length] != ':') {
 			fprintf(composition_file, "%s\n", field);
@@ -414,17 +388,15 @@ attach(char *draft_file_name)
 	}
 	fputs("--------\n", composition_file);
 
-	if (has_body) {
-		/* Copy the message body to the temporary file. */
-		while ((c = getc(draft_file)) != EOF) {
-			putc(c, body_file);
-		}
-		fclose(body_file);
-
-		/* Add a mhbuild MIME composition file line for the body */
-		/* charset will be discovered/guessed by mhbuild */
-		fprintf(composition_file, "#text/plain %s\n", body_file_name);
+	/* Copy the message body to the temporary file. */
+	while ((c = getc(draft_file)) != EOF) {
+		putc(c, body_file);
 	}
+	fclose(body_file);
+
+	/* Add a mhbuild MIME composition file line for the body */
+	/* charset will be discovered/guessed by mhbuild */
+	fprintf(composition_file, "#text/plain %s\n", body_file_name);
 
 	/*
 	** Now, go back to the beginning of the draft file and look for
@@ -471,12 +443,16 @@ signandenc(char *draft_file_name)
 	int doenc = 0;
 	int ret;
 
+	if(distfile) {
+		return DONE;
+	}
+
 	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. */
-	field = (char *)mh_xmalloc(field_size = 256);
+	field = mh_xcalloc(field_size = 256, sizeof(char));
 
 	/* Scan the draft file for an attachment header field name. */
 	while (get_line() != EOF && *field != '\0' && *field != '-') {
@@ -545,7 +521,7 @@ get_line(void)
 			break;
 		}
 		if (++n >= field_size - 1) {
-			field = (char *)mh_xrealloc(field, field_size += 256);
+			field = mh_xrealloc(field, field_size += 256);
 			p = field + n - 1;
 		}
 	}
@@ -575,7 +551,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) &&
@@ -591,14 +567,14 @@ 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);
 	}
 
 	/* Check for broken file(1). See man page mh-profile(5). */
 	for (cp=content_type; *cp; cp++) {
 		if (isspace(*cp)) {
 			if (!semicolon) {
-				adios(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);
+				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;
@@ -628,22 +604,22 @@ 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:
@@ -653,12 +629,9 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 			if (annotext) {
 				anno(st);
 			}
-		}
-		else {
+		} else {
+			/* spost failed */
 			advise(NULL, "%s", strexit(status));
-			if (verbosesw <= 0) {
-				advise(NULL, "Try using -v to get better output");
-			}
 			if (distfile) {
 				unlink(drft);
 				if (rename(backup, drft) == NOTOK) {
@@ -669,8 +642,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 		}
 	}
 
-
-	return status;
+	return status ? NOTOK : status;
 }
 
 
@@ -680,6 +652,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 ||
@@ -707,9 +682,27 @@ 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");
 	}
 }
@@ -722,21 +715,12 @@ strexit(int status)
 		return "spost or sendmail killed by signal";
 	}
 	if (!WIFEXITED(status)) {
-		return "sendmail stopt for unknown reasen, message not deliverd to anyone";
+		return "message not delivered to anyone";
 	}
 	switch (WEXITSTATUS(status)) {
-		case EX_TEMPFAIL:
-			return "Temporary error, maby the MTA hase queued the Mail";
-		default:
-			return "sendmail stopt for unknown reasen, message not deliverd to anyone";
+	case EX_TEMPFAIL:
+		return "Temporary error, maybe the MTA has queued the message";
+	default:
+		return "message not delivered to anyone";
 	}
 }
-
-
-static void
-armed_done(int status)
-{
-	longjmp(env, status ? status : NOTOK);
-
-	exit(status);
-}