From: markus schnalke <meillo@marmaro.de>
Date: Fri, 26 Sep 2014 13:38:18 +0000 (+0200)
Subject: send: Check the draft folder only if we send msgs, not when sneding files.
X-Git-Tag: mmh-0.2-RC1~103
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=5b093c3d779ddbbd09a233c8cf7a20c0d0d15d1c;p=mmh

send: Check the draft folder only if we send msgs, not when sneding files.
Send can send files (specified by Unix path names) or messages (specified
by MH message names/sequences. (NB: It cannot send msgs from other folders
yet.) In case we've only specified files (this is done by whatnow, for
instance) we don't need to care if there is a draft folder and if it
contains any msgs.
This commit probably fixes a problem discovered by <philipp@bureaucracy.de>.
---

diff --git a/uip/send.c b/uip/send.c
index bf37600..e1e7518 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -70,7 +70,7 @@ static struct swit switches[] = {
 int
 main(int argc, char **argv)
 {
-	int msgp = 0, nfiles = 0, distsw = 0, vecp = 1;
+	int nmsgs = 0, nfiles = 0, distsw = 0, vecp = 1;
 	int msgnum, status;
 	int in, out;
 	int n;
@@ -122,43 +122,47 @@ main(int argc, char **argv)
 			if (*cp == '/') {
 				files[nfiles++] = cp;
 			} else {
-				msgs[msgp++] = cp;
+				msgs[nmsgs++] = cp;
 			}
 		}
 	}
 
-	if (!msgp && !nfiles) {
-		msgs[msgp++] = seq_cur;
+	if (!nmsgs && !nfiles) {
+		msgs[nmsgs++] = seq_cur;
 	}
-	maildir = toabsdir(draftfolder);
 
-	if (chdir(maildir) == NOTOK) {
-		adios(maildir, "unable to change directory to");
-	}
-
-	if (!(mp = folder_read(draftfolder))) {
-		adios(NULL, "unable to read draft folder %s", draftfolder);
-	}
-	if (mp->nummsg == 0) {
-		adios(NULL, "no messages in draft folder %s", draftfolder);
-	}
-	/* parse all the message ranges/sequences and set SELECTED */
-	for (msgnum = 0; msgnum < msgp; msgnum++) {
-		if (!m_convert(mp, msgs[msgnum])) {
-			done(1);
+	if (nmsgs) {
+		maildir = toabsdir(draftfolder);
+		if (chdir(maildir) == NOTOK) {
+			adios(maildir, "unable to change directory to");
 		}
-	}
-	seq_setprev(mp);
+		if (!(mp = folder_read(draftfolder))) {
+			adios(NULL, "unable to read draft folder %s",
+					draftfolder);
+		}
+		if (mp->nummsg == 0) {
+			adios(NULL, "no messages in draft folder %s",
+					draftfolder);
+		}
+		/* parse all the msgranges/sequences and set SELECTED */
+		for (msgnum = 0; msgnum < nmsgs; msgnum++) {
+			if (!m_convert(mp, msgs[msgnum])) {
+				done(1);
+			}
+		}
+		seq_setprev(mp);
 
-	for (msgp = 0, msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected(mp, msgnum)) {
-			files[nfiles++] = getcpy(m_name(msgnum));
-			unset_exists(mp, msgnum);
+		for (nmsgs = 0, msgnum = mp->lowsel;
+				msgnum <= mp->hghsel; msgnum++) {
+			if (is_selected(mp, msgnum)) {
+				files[nfiles++] = getcpy(m_name(msgnum));
+				unset_exists(mp, msgnum);
+			}
 		}
-	}
 
-	mp->msgflags |= SEQMOD;
-	seq_save(mp);
+		mp->msgflags |= SEQMOD;
+		seq_save(mp);
+	}
 
 	if (!(cp = getenv("SIGNATURE")) || !*cp) {
 		if ((cp = context_find("signature")) && *cp) {
@@ -166,9 +170,9 @@ main(int argc, char **argv)
 		}
 	}
 
-	for (msgnum = 0; msgnum < nfiles; msgnum++) {
-		if (stat(files[msgnum], &st) == NOTOK) {
-			adios(files[msgnum], "unable to stat draft file");
+	for (n = 0; n < nfiles; n++) {
+		if (stat(files[n], &st) == NOTOK) {
+			adios(files[n], "unable to stat draft file");
 		}
 	}
 
@@ -207,8 +211,8 @@ main(int argc, char **argv)
 		close(n);
 	}
 
-	for (msgnum = 0; msgnum < nfiles; msgnum++) {
-		switch (sendsbr(vec, vecp, files[msgnum], &st)) {
+	for (n = 0; n < nfiles; n++) {
+		switch (sendsbr(vec, vecp, files[n], &st)) {
 		case DONE:
 			done(++status);
 		case NOTOK: