X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsendsbr.c;h=8eb67cc8eae016e19d74f3f0688dc93aa1998edb;hb=58160ee7bcee7dcc7dbf8e2d5377009e48bcf40b;hp=9c335bd9885a6701d81a65f3d8ebbde2e47d48aa;hpb=f41f04cf4ceca7355232cf7413e59afafccc9550;p=mmh

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 9c335bd..8eb67cc 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -30,7 +30,6 @@ int debugsw = 0;  /* global */
 int forwsw  = 1;
 int inplace = 1;
 int pushsw  = 0;
-int unique  = 0;
 int verbsw  = 0;
 
 char *altmsg   = NULL;  /*  .. */
@@ -79,7 +78,7 @@ int
 sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 {
 	int status;
-	char buffer[BUFSIZ], file[BUFSIZ];
+	char buffer[BUFSIZ];
 	char *original_draft;  /* name of original draft file */
 	char *p;  /* string pointer for building file name */
 
@@ -115,23 +114,7 @@ sendsbr(char **vec, int vecp, char *drft, struct stat *st, int rename_drft)
 	done=armed_done;
 	switch (setjmp(env)) {
 	case OK:
-		/*
-		** If given -push and -unique (which is undocumented), then
-		** rename the draft file.  I'm not quite sure why.
-		*/
-		if (pushsw && unique) {
-			char *cp = m_mktemp2(drft, invo_name, NULL, NULL);
-			if (cp == NULL) {
-				adios("sendsbr", "unable to create temporary file");
-			}
-			if (rename(drft, strncpy(file, cp, sizeof(file)))
-					== NOTOK)
-				adios(file, "unable to rename %s to", drft);
-			drft = file;
-		}
-
 		status = sendaux(vec, vecp, drft, st) ? NOTOK : OK;
-
 		/* rename the original draft */
 		if (rename_drft && status == OK &&
 				rename(original_draft, strncpy(buffer,
@@ -495,20 +478,14 @@ sendaux(char **vec, int vecp, char *drft, struct stat *st)
 {
 	pid_t child_id;
 	int i, status, fd, fd2;
-	char backup[BUFSIZ], buf[BUFSIZ];
+	char backup[BUFSIZ];
 
 	fd = pushsw ? tmp_fd() : NOTOK;
 	fd2 = NOTOK;
 
 	vec[vecp++] = drft;
-	if (annotext) {
-		if ((fd2 = tmp_fd()) != NOTOK) {
-			vec[vecp++] = "-idanno";
-			snprintf(buf, sizeof(buf), "%d", fd2);
-			vec[vecp++] = buf;
-		} else {
-			admonish(NULL, "unable to create file for annotation list");
-		}
+	if (annotext && (fd2 = tmp_fd()) == NOTOK) {
+		admonish(NULL, "unable to create file for annotation list");
 	}
 	if (distfile && distout(drft, distfile, backup) == NOTOK)
 		done(1);
@@ -785,7 +762,7 @@ annoaux(int fd)
 		if (is_selected(mp, msgnum)) {
 			if (debugsw)
 				advise(NULL, "annotate message %d", msgnum);
-			annotate(m_name (msgnum), annotext, cp, inplace,
+			annotate(m_name(msgnum), annotext, cp, inplace,
 					1, -2, 0);
 		}
 	}