X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=c454f7655fd9c5482d1c5db57bc13048976bfb69;hb=9677896bbb11f7b49ca3e1665601407b6c7a459f;hp=e39ab800e6a7c8569047cca2ff2a3eb61074dc90;hpb=3e300b97e9a54a3157e37948f8827abbe3eecf05;p=mmh

diff --git a/uip/send.c b/uip/send.c
index e39ab80..c454f76 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -16,21 +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;
 char *distfile = NULL;
@@ -50,10 +41,8 @@ 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 int sendaux(char **, int, char *, struct stat *);
 static int attach(char *);
@@ -67,25 +56,13 @@ static struct swit switches[] = {
 	{ "alias aliasfile", 0 },
 #define DEBUGSW  1
 	{ "debug", -5 },
-#define FORWSW  2
-	{ "forward", 0 },
-#define NFORWSW  3
-	{ "noforward", 0 },
-#define PUSHSW  4
-	{ "push", 0 },
-#define NPUSHSW  5
-	{ "nopush", 0 },
-#define VERBSW  6
+#define VERBSW  2
 	{ "verbose", 0 },
-#define NVERBSW  7
-	{ "noverbose", 0 },
-#define WATCSW  8
-	{ "watch", 0 },
-#define NWATCSW  9
-	{ "nowatch", 0 },
-#define VERSIONSW  10
-	{ "version", 0 },
-#define HELPSW  11
+#define NVERBSW  3
+	{ "noverbose", 2 },
+#define VERSIONSW  4
+	{ "Version", 0 },
+#define HELPSW  5
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -106,10 +83,7 @@ main(int argc, char **argv)
 	struct stat st;
 	struct stat st2;
 
-
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -140,33 +114,11 @@ 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 DEBUGSW:
+				debugsw++;
+				/* fall */
 			case VERBSW:
-				verbsw++;
-				vec[vecp++] = --cp;
-				continue;
 			case NVERBSW:
-				verbsw = 0;
-				vec[vecp++] = --cp;
-				continue;
-
-			case DEBUGSW:
-				debugsw++;  /* fall */
-			case WATCSW:
-			case NWATCSW:
 				vec[vecp++] = --cp;
 				continue;
 
@@ -273,36 +225,6 @@ main(int argc, char **argv)
 		st.st_dev = 0;
 		st.st_ino = 0;
 	}
-	if (pushsw) {
-		/* push a fork into the background */
-		pid_t pid;
-
-		switch (pid = fork()) {
-		case -1:
-			/* fork error */
-			advise(NULL, "unable to fork, so can't push...");
-			break;
-
-		default:
-			/* parent, just exit */
-			done(0);
-
-		case 0:
-			/* child, block a few signals and continue */
-			SIGNAL(SIGHUP, SIG_IGN);
-			SIGNAL(SIGINT, SIG_IGN);
-			SIGNAL(SIGQUIT, SIG_IGN);
-			SIGNAL(SIGTERM, SIG_IGN);
-#ifdef SIGTSTP
-			SIGNAL(SIGTSTP, SIG_IGN);
-			SIGNAL(SIGTTIN, SIG_IGN);
-			SIGNAL(SIGTTOU, SIG_IGN);
-#endif
-			freopen("/dev/null", "r", stdin);
-			freopen("/dev/null", "w", stdout);
-			break;
-		}
-	}
 	status = 0;
 	vec[0] = "spost";
 	for (n=3; n<OPEN_MAX; n++) {
@@ -310,7 +232,7 @@ main(int argc, char **argv)
 	}
 
 	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:
@@ -330,7 +252,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];
@@ -370,11 +292,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;
 
@@ -647,15 +570,9 @@ static int
 sendaux(char **vec, int vecp, char *drft, struct stat *st)
 {
 	pid_t child_id;
-	int status, fd;
+	int status;
 	char backup[BUFSIZ];
 
-	/*
-	** fd collects the output of spost, 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);
@@ -669,17 +586,7 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 		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);
-		}
+		/* child process -- send it */
 		execvp(*vec, vec);
 		fprintf(stderr, "unable to exec ");
 		perror(*vec);
@@ -693,17 +600,8 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 				anno(st);
 			}
 		} else {
-			/*
-			** If spost 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,86 +617,6 @@ 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 mhmail(1).
-*/
-static void
-alert(char *file, int out)
-{
-	pid_t child_id;
-	int in;
-	char buf[BUFSIZ];
-
-	switch (child_id = fork()) {
-	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("mhmail", "mhmail", getusername(),
-				"-subject", buf, NULL);
-		fprintf(stderr, "unable to exec ");
-		perror("mhmail");
-		_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)
 {