X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=5e1f0a10cef5fb35cce34703dfcca68b18b828d0;hb=9fca5fd33b87291cdcb326c7aab6ab9574244289;hp=ed4aca04fde8519766b8646c65ae4198aae25ae9;hpb=a8a894a102eb7f31662d49355312d6e64e081664;p=mmh

diff --git a/uip/send.c b/uip/send.c
index ed4aca0..5e1f0a1 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -22,7 +22,6 @@
 #include <time.h>
 
 int debugsw = 0;  /* global */
-int verbsw  = 0;
 char *altmsg   = NULL;
 char *annotext = NULL;
 char *distfile = NULL;
@@ -42,7 +41,7 @@ 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 anno(struct stat *);
 static int sendaux(char **, int, char *, struct stat *);
@@ -53,21 +52,15 @@ static void make_mime_composition_file_entry(char *);
 
 
 static struct swit switches[] = {
-#define ALIASW  0
-	{ "alias aliasfile", 0 },
-#define DEBUGSW  1
+#define DEBUGSW  0
 	{ "debug", -5 },
-#define VERBSW  2
+#define VERBSW  1
 	{ "verbose", 0 },
-#define NVERBSW  3
-	{ "noverbose", 0 },
-#define WATCSW  4
-	{ "watch", 0 },
-#define NWATCSW  5
-	{ "nowatch", 0 },
-#define VERSIONSW  6
-	{ "version", 0 },
-#define HELPSW  7
+#define NVERBSW  2
+	{ "noverbose", 2 },
+#define VERSIONSW  3
+	{ "Version", 0 },
+#define HELPSW  4
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -81,17 +74,14 @@ main(int argc, char **argv)
 	int in, out;
 	int n;
 	char *cp, *maildir = NULL;
-	char buf[BUFSIZ], **ap, **argp, **arguments;
+	char buf[BUFSIZ], **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
 	char *files[MAXARGS];
 	struct msgs *mp;
 	struct stat st;
 	struct stat st2;
 
-
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -100,9 +90,6 @@ main(int argc, char **argv)
 	arguments = getarguments(invo_name, argc, argv, 1);
 	argp = arguments;
 
-	vec[vecp++] = "-library";
-	vec[vecp++] = getcpy(toabsdir("+"));
-
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
@@ -122,31 +109,13 @@ main(int argc, char **argv)
 				print_version(invo_name);
 				done(1);
 
+			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;
-
-			case ALIASW:
-				vec[vecp++] = --cp;
-				if (!(cp = *argp++) || *cp == '-') {
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				}
-				vec[vecp++] = cp;
-				continue;
-
 			}
 		} else {
 			if (*cp == '/') {
@@ -157,16 +126,6 @@ main(int argc, char **argv)
 		}
 	}
 
-	/* check for "Aliasfile:" profile entry */
-	if ((cp = context_find("Aliasfile"))) {
-		char *dp = NULL;
-
-		for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap; ap++) {
-			vec[vecp++] = "-alias";
-			vec[vecp++] = getcpy(etcpath(*ap));
-		}
-	}
-
 	if (!msgp && !nfiles) {
 		msgs[msgp++] = seq_cur;
 	}
@@ -248,7 +207,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:
@@ -268,7 +227,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];
@@ -308,11 +267,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;