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

diff --git a/uip/send.c b/uip/send.c
index 3ca6772..3c2db0e 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -24,8 +24,7 @@
 #include <time.h>
 
 int debugsw = 0;  /* global */
-int verbosesw = 0;
-char *altmsg   = NULL;
+char *altmsg = NULL;
 char *annotext = NULL;
 char *distfile = NULL;
 
@@ -118,9 +117,7 @@ main(int argc, char **argv)
 				debugsw++;
 				/* fall */
 			case VERBSW:
-				verbosesw += 2;
 			case NVERBSW:
-				verbosesw--;
 				vec[vecp++] = --cp;
 				continue;
 			}
@@ -653,12 +650,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) {
@@ -680,6 +674,9 @@ anno(struct stat *st)
 	struct stat st2;
 	char *msgs, *folder;
 	char buf[BUFSIZ];
+	char *vec[MAXARGS];
+	int vecp;
+	char *cp, *dp;
 
 	if (altmsg && (stat(altmsg, &st2) == NOTOK ||
 			st->st_mtime != st2.st_mtime ||
@@ -707,9 +704,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,13 +737,13 @@ 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";
 	}
 }