From: markus schnalke <meillo@marmaro.de>
Date: Fri, 23 Oct 2015 12:26:49 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Tag: mmh-0.2-RC1~14
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=9c61a657f72aa43b4a2f4e027ad84e7f65fb66cb;hp=64821c40d50284022f9eda4ade8dbd1a77c189a9

Merge branch 'master'
---

diff --git a/uip/folder.c b/uip/folder.c
index 3ca0e7d..4ffb9f5 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -329,16 +329,17 @@ main(int argc, char **argv)
 	/*
 	** Scan the folders
 	*/
+	/*
+	** change directory to base of nmh directory for
+	** crawl_folders
+	*/
+	if (chdir(nmhdir) == NOTOK) {
+		adios(EX_OSERR, nmhdir, "unable to change directory to");
+	}
 	if (all || ftotal > 0) {
 		/*
 		** If no folder is given, do them all
 		*/
-		/*
-		** change directory to base of nmh directory for
-		** crawl_folders
-		*/
-		if (chdir(nmhdir) == NOTOK)
-			adios(EX_OSERR, nmhdir, "unable to change directory to");
 		if (!argfolder) {
 			if (msg)
 				admonish(NULL, "no folder given for message %s", msg);
diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index ba88319..87e7943 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -228,7 +228,7 @@ writeQuoted(CT ct, FILE *out)
 			n = 0;
 		}
 		for (; *cp; cp++) {
-			if (n > CPERLIN - 3) {
+			if (n + 1 >= CPERLIN) {
 				fputs("=\n", out);
 				n = 0;
 			}