X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsend.c;h=84e05dfb31386d64a6d1b312c8156e945bbba8ef;hp=3055df78a4c513bd3f21f702d1f099167d6a2f18;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=c8195849d2e366c569271abb0f5f60f4ebf0b4d0

diff --git a/uip/send.c b/uip/send.c
index 3055df7..84e05df 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -16,20 +16,12 @@
 #include <h/tws.h>
 #include <h/utils.h>
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 int debugsw = 0;  /* global */
-int forwsw  = 1;
-int pushsw  = 0;
 int verbsw  = 0;
 char *altmsg   = NULL;
 char *annotext = NULL;
@@ -50,12 +42,9 @@ static FILE *composition_file;  /* composition file pointer */
 /*
 ** static prototypes
 */
-static int sendsbr(char **, int, char *, struct stat *, int);
+static int sendsbr(char **, int, char *, struct stat *);
 static void armed_done(int) NORETURN;
-static void alert(char *, int);
-static int tmp_fd(void);
 static void anno(struct stat *);
-static void annoaux(void);
 static int sendaux(char **, int, char *, struct stat *);
 static int attach(char *);
 static void clean_up_temporary_files(void);
@@ -68,33 +57,17 @@ static struct swit switches[] = {
 	{ "alias aliasfile", 0 },
 #define DEBUGSW  1
 	{ "debug", -5 },
-#define FILTSW  2
-	{ "filter filterfile", 0 },
-#define NFILTSW  3
-	{ "nofilter", 0 },
-#define FRMTSW  4
-	{ "format", 0 },
-#define NFRMTSW  5
-	{ "noformat", 0 },
-#define FORWSW  6
-	{ "forward", 0 },
-#define NFORWSW  7
-	{ "noforward", 0 },
-#define PUSHSW  8
-	{ "push", 0 },
-#define NPUSHSW  9
-	{ "nopush", 0 },
-#define VERBSW  10
+#define VERBSW  2
 	{ "verbose", 0 },
-#define NVERBSW  11
+#define NVERBSW  3
 	{ "noverbose", 0 },
-#define WATCSW  12
+#define WATCSW  4
 	{ "watch", 0 },
-#define NWATCSW  13
+#define NWATCSW  5
 	{ "nowatch", 0 },
-#define VERSIONSW  14
-	{ "version", 0 },
-#define HELPSW  15
+#define VERSIONSW  6
+	{ "Version", 0 },
+#define HELPSW  7
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -106,6 +79,7 @@ main(int argc, char **argv)
 	int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
 	int msgnum, status;
 	int in, out;
+	int n;
 	char *cp, *maildir = NULL;
 	char buf[BUFSIZ], **ap, **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
@@ -148,20 +122,6 @@ main(int argc, char **argv)
 				print_version(invo_name);
 				done(1);
 
-			case PUSHSW:
-				pushsw++;
-				continue;
-			case NPUSHSW:
-				pushsw = 0;
-				continue;
-
-			case FORWSW:
-				forwsw++;
-				continue;
-			case NFORWSW:
-				forwsw = 0;
-				continue;
-
 			case VERBSW:
 				verbsw++;
 				vec[vecp++] = --cp;
@@ -173,16 +133,12 @@ main(int argc, char **argv)
 
 			case DEBUGSW:
 				debugsw++;  /* fall */
-			case NFILTSW:
-			case FRMTSW:
-			case NFRMTSW:
 			case WATCSW:
 			case NWATCSW:
 				vec[vecp++] = --cp;
 				continue;
 
 			case ALIASW:
-			case FILTSW:
 				vec[vecp++] = --cp;
 				if (!(cp = *argp++) || *cp == '-') {
 					adios(NULL, "missing argument to %s",
@@ -265,27 +221,17 @@ main(int argc, char **argv)
 
 	if ((cp = getenv("mhdist")) && *cp && (distsw = atoi(cp)) && altmsg) {
 		vec[vecp++] = "-dist";
-		distfile = getcpy(m_mktemp2(altmsg, invo_name, NULL, NULL));
-		if (link(altmsg, distfile) == NOTOK) {
-			if (errno != EXDEV) {
-				adios(distfile, "unable to link %s to",
-						altmsg);
-			}
-			free(distfile);
-			distfile = getcpy(m_mktemp2(NULL, invo_name,
-					NULL, NULL));
-			if ((in = open(altmsg, O_RDONLY)) == NOTOK) {
-				adios(altmsg, "unable to open");
-			}
-			fstat(in, &st2);
-			if ((out = creat(distfile, (int)st2.st_mode & 0777)) ==
-					NOTOK) {
-				adios(distfile, "unable to write");
-			}
-			cpydata(in, out, altmsg, distfile);
-			close(in);
-			close(out);
+		if ((in = open(altmsg, O_RDONLY)) == NOTOK) {
+			adios(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");
 		}
+		cpydata(in, out, altmsg, distfile);
+		close(in);
+		close(out);
 	} else {
 		distfile = NULL;
 	}
@@ -295,15 +241,14 @@ main(int argc, char **argv)
 		st.st_dev = 0;
 		st.st_ino = 0;
 	}
-	if (pushsw) {
-		push();
-	}
 	status = 0;
-	vec[0] = mhbasename(postproc);
-	closefds(3);
+	vec[0] = "spost";
+	for (n=3; n<OPEN_MAX; n++) {
+		close(n);
+	}
 
 	for (msgnum = 0; msgnum < nfiles; msgnum++) {
-		switch (sendsbr(vec, vecp, files[msgnum], &st, 1)) {
+		switch (sendsbr(vec, vecp, files[msgnum], &st)) {
 		case DONE:
 			done(++status);
 		case NOTOK:
@@ -323,7 +268,7 @@ main(int argc, char **argv)
 ** message sending back-end
 */
 static int
-sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
+sendsbr(char **vec, int vecp, char *drft, struct stat *st)
 {
 	int status;
 	char buffer[BUFSIZ];
@@ -363,11 +308,12 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 	case OK:
 		status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
 		/* rename the original draft */
-		if (rename_drft && status == OK &&
-				rename(original_draft, strncpy(buffer,
-				m_backup(original_draft), sizeof(buffer)))
-				== NOTOK) {
-			advise(buffer, "unable to rename %s to", drft);
+		if (status == OK) {
+			strncpy(buffer, m_backup(original_draft),
+					sizeof(buffer));
+			if (rename(original_draft, buffer) == NOTOK) {
+				advise(buffer, "unable to rename %s to", drft);
+			}
 		}
 		break;
 
@@ -508,7 +454,7 @@ attach(char *draft_file_name)
 		fclose(body_file);
 
 		/* Add a mhbuild MIME composition file line for the body */
-		/* charset will be discovered/guessed by buildmimeproc */
+		/* charset will be discovered/guessed by mhbuild */
 		fprintf(composition_file, "#text/plain %s\n", body_file_name);
 	}
 
@@ -535,12 +481,8 @@ attach(char *draft_file_name)
 	}
 	fclose(composition_file);
 
-	/*
-	** We're ready to roll!  Run mhbuild on the composition file.
-	** Note that mhbuild is in the context as buildmimeproc.
-	*/
-	sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
-
+	/* We're ready to roll! */
+	sprintf(buf, "mhbuild %s", composition_file_name);
 	if (system(buf) != 0) {
 		/* some problem */
 		clean_up_temporary_files();
@@ -627,9 +569,9 @@ make_mime_composition_file_entry(char *file_name)
 		adios(NULL, "unable to access file `%s'", file_name);
 	}
 
-	fprintf(composition_file, "#%s; name=\"%s\" <>{attachment}",
-		content_type,
-		(!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1);
+	cp = (!(cp = strrchr(file_name, '/'))) ? file_name : cp + 1;
+	fprintf(composition_file, "#%s; name=\"%s\" <> [%s] {attachment}",
+			content_type, cp, cp);
 
 	fprintf(composition_file, " %s\n", file_name);
 
@@ -638,51 +580,32 @@ make_mime_composition_file_entry(char *file_name)
 
 /*
 ** The back-end of the message sending back-end.
-** Annotate original message, and call `postproc' to send message.
+** Annotate original message, and call `spost' to send message.
 */
 static int
 sendaux(char **vec, int vecp, char *drft, struct stat *st)
 {
 	pid_t child_id;
-	int i, status, fd;
+	int status;
 	char backup[BUFSIZ];
 
-	/*
-	** fd collects the output of postproc, and is used for the
-	** failure notice if we need to send one in alert().
-	*/
-	fd = pushsw ? tmp_fd() : NOTOK;
-
 	vec[vecp++] = drft;
 	if (distfile && distout(drft, distfile, backup) == NOTOK) {
 		done(1);
 	}
 	vec[vecp] = NULL;
 
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {
-		sleep(5);
-	}
-	switch (child_id) {
+	switch (child_id = fork()) {
 	case -1:
 		/* oops -- fork error */
 		adios("fork", "unable to");
 		break;  /* NOT REACHED */
 
 	case 0:
-		/*
-		** child process -- send it
-		**
-		** If fd is ok, then we are pushing and fd points to temp
-		** file, so capture anything on stdout and stderr there.
-		*/
-		if (fd != NOTOK) {
-			dup2(fd, fileno(stdout));
-			dup2(fd, fileno(stderr));
-			close(fd);
-		}
-		execvp(postproc, vec);
+		/* child process -- send it */
+		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
-		perror(postproc);
+		perror(*vec);
 		_exit(-1);
 		break;  /* NOT REACHED */
 
@@ -693,17 +616,8 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 				anno(st);
 			}
 		} else {
-			/*
-			** If postproc failed, and we have good fd (which
-			** means we pushed), then mail error message
-			** (and possibly the draft) back to the user.
-			*/
-			if (fd != NOTOK) {
-				alert(drft, fd);
-				close(fd);
-			} else {
-				advise(NULL, "message not delivered to anyone");
-			}
+			/* spost failed */
+			advise(NULL, "message not delivered to anyone");
 			if (distfile) {
 				unlink(drft);
 				if (rename(backup, drft) == NOTOK) {
@@ -719,98 +633,12 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 }
 
 
-/*
-** Mail error notification (and possibly a copy of the
-** message) back to the user, using the mailproc
-*/
-static void
-alert(char *file, int out)
-{
-	pid_t child_id;
-	int i, in;
-	char buf[BUFSIZ];
-
-	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) {
-		sleep(5);
-	}
-
-	switch (child_id) {
-	case NOTOK:
-		/* oops -- fork error */
-		advise("fork", "unable to");
-
-	case OK:
-		/* child process -- send it */
-		SIGNAL(SIGHUP, SIG_IGN);
-		SIGNAL(SIGINT, SIG_IGN);
-		SIGNAL(SIGQUIT, SIG_IGN);
-		SIGNAL(SIGTERM, SIG_IGN);
-		if (forwsw) {
-			if ((in = open(file, O_RDONLY)) == NOTOK) {
-				admonish(file, "unable to re-open");
-			} else {
-				lseek(out, (off_t) 0, SEEK_END);
-				strncpy(buf, "\nMessage not delivered to anyone.\n", sizeof(buf));
-				write(out, buf, strlen(buf));
-				strncpy(buf, "\n------- Unsent Draft\n\n", sizeof(buf));
-				write(out, buf, strlen(buf));
-				cpydgst(in, out, file, "temporary file");
-				close(in);
-				strncpy(buf, "\n------- End of Unsent Draft\n", sizeof(buf));
-				write(out, buf, strlen(buf));
-				if (rename(file, strncpy(buf, m_backup(file), sizeof(buf))) == NOTOK) {
-					admonish(buf, "unable to rename %s to", file);
-				}
-			}
-		}
-		lseek(out, (off_t) 0, SEEK_SET);
-		dup2(out, fileno(stdin));
-		close(out);
-		/* create subject for error notification */
-		snprintf(buf, sizeof(buf), "send failed on %s",
-				forwsw ? "enclosed draft" : file);
-
-		execlp(mailproc, mhbasename(mailproc), getusername(),
-				"-subject", buf, NULL);
-		fprintf(stderr, "unable to exec ");
-		perror(mailproc);
-		_exit(-1);
-
-	default:  /* no waiting... */
-		break;
-	}
-}
-
-
-static int
-tmp_fd(void)
-{
-	int fd;
-	char *tfile = NULL;
-
-	tfile = m_mktemp2(NULL, invo_name, &fd, NULL);
-	if (tfile == NULL) return NOTOK;
-	fchmod(fd, 0600);
-
-	if (debugsw) {
-		advise(NULL, "temporary file %s selected", tfile);
-	} else {
-		if (unlink(tfile) == NOTOK) {
-			advise(tfile, "unable to remove");
-		}
-	}
-
-	return fd;
-}
-
-
 static void
 anno(struct stat *st)
 {
-	pid_t child_id;
-	sigset_t set, oset;
-	static char *cwd = NULL;
 	struct stat st2;
+	char *msgs, *folder;
+	char buf[BUFSIZ];
 
 	if (altmsg && (stat(altmsg, &st2) == NOTOK ||
 			st->st_mtime != st2.st_mtime ||
@@ -822,120 +650,27 @@ anno(struct stat *st)
 		return;
 	}
 
-	child_id = debugsw ? NOTOK : fork();
-	switch (child_id) {
-	case NOTOK:  /* oops */
-		if (!debugsw) {
-			advise(NULL, "unable to fork, so doing annotations by hand...");
-		}
-		if (!cwd) {
-			cwd = getcpy(pwd());
-		}
-		/* fall */
-
-	case OK:
-		/* block a few signals */
-		sigemptyset(&set);
-		sigaddset(&set, SIGHUP);
-		sigaddset(&set, SIGINT);
-		sigaddset(&set, SIGQUIT);
-		sigaddset(&set, SIGTERM);
-		SIGPROCMASK(SIG_BLOCK, &set, &oset);
-
-		annoaux();
-		if (child_id == OK) {
-			_exit(0);
-		}
-
-		/* reset the signal mask */
-		SIGPROCMASK(SIG_SETMASK, &oset, &set);
-
-		chdir(cwd);
-		break;
-
-	default:  /* no waiting... */
-		break;
-	}
-}
-
-
-static void
-annoaux(void)
-{
-	int fd2, fd3, msgnum;
-	char *cp, *folder, *maildir;
-	char **ap;
-	struct msgs *mp;
-
 	if (!(folder = getenv("mhfolder")) || !*folder) {
 		if (debugsw) {
 			admonish(NULL, "$mhfolder not set");
 		}
 		return;
 	}
-	maildir = toabsdir(folder);
-	if (chdir(maildir) == NOTOK) {
-		if (debugsw) {
-			admonish(maildir, "unable to change directory to");
-		}
-		return;
-	}
-	if (!(mp = folder_read(folder))) {
-		if (debugsw) {
-			admonish(NULL, "unable to read folder %s", folder);
-		}
-		return;
-	}
-
-	if (mp->nummsg == 0) {
-		if (debugsw) {
-			admonish(NULL, "no messages in %s", folder);
-		}
-		goto oops;
-	}
-	if ((cp = getenv("mhmessages")) == NULL || *cp == 0) {
+	if (!(msgs = getenv("mhmessages")) || !*msgs) {
 		if (debugsw) {
 			admonish(NULL, "$mhmessages not set");
 		}
-		goto oops;
-	}
-	if (!debugsw  /* MOBY HACK... */
-			&& pushsw
-			&& (fd3 = open("/dev/null", O_RDWR)) != NOTOK
-			&& (fd2 = dup(fileno(stderr))) != NOTOK) {
-		dup2(fd3, fileno(stderr));
-		close(fd3);
-	} else {
-		fd2 = NOTOK;
-	}
-	for (ap = brkstring(cp = getcpy(cp), " ", NULL); *ap; ap++) {
-		m_convert(mp, *ap);
-	}
-	free(cp);
-	if (fd2 != NOTOK) {
-		dup2(fd2, fileno(stderr));
-	}
-	if (mp->numsel == 0) {
-		if (debugsw) {
-			admonish(NULL, "no messages to annotate");
-		}
-		goto oops;
+		return;
 	}
-
 	if (debugsw) {
-		advise(NULL, "annotate as `%s'", annotext);
+		advise(NULL, "annotate as `%s': %s %s", annotext,
+				folder, msgs);
 	}
-	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected(mp, msgnum)) {
-			if (debugsw) {
-				advise(NULL, "annotate message %d", msgnum);
-			}
-			annotate(m_name(msgnum), annotext, NULL, 1, -2, 0);
-		}
+	snprintf(buf, sizeof buf, "anno -comp '%s' '+%s' %s",
+			annotext, folder, msgs);
+	if (system(buf) != 0) {
+		advise(NULL, "unable to annotate");
 	}
-
-oops:
-	folder_free(mp);
 }