From: markus schnalke <meillo@marmaro.de>
Date: Wed, 14 Jan 2015 07:08:07 +0000 (+0100)
Subject: Refactoring in the small
X-Git-Tag: mmh-0.2-RC1~76
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=6e5da31c92f5a3fa38e010052c5a7743bfe1cf11;p=mmh

Refactoring in the small

Out-sorting failure cases instead of deep-nesting the success case.
---

diff --git a/uip/whatnow.c b/uip/whatnow.c
index ff9d84c..914e298 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -302,32 +302,28 @@ main(int argc, char **argv)
 			** working directory to relative path names.
 			** Add the attachment annotation to the draft.
 			*/
-			if ((f = popen_in_dir(cwd, buf, "r"))) {
-				while (fgets(shell, sizeof(shell), f)) {
-					*(strchr(shell, '\n')) = '\0';
-
-					if (*shell == '/')
-						sprintf(file, "%s", shell);
-					else {
-						sprintf(file, "%s/%s", cwd,
-								shell);
-					}
-					if (execprogl("anno", "anno",
-							"-nodate",
-							"-append", "-comp",
-							attach_hdr, "-text",
-							file, drft,
-							(char *)NULL)
-							!= 0) {
-						advise(NULL, "Could not add attachment header.");
-					}
-				}
-
-				pclose(f);
-			} else {
+			if (!(f = popen_in_dir(cwd, buf, "r"))) {
 				advise("popen", "could not get file from shell");
+				break;
 			}
 
+			while (fgets(shell, sizeof(shell), f)) {
+				*(strchr(shell, '\n')) = '\0';
+
+				if (*shell == '/')
+					sprintf(file, "%s", shell);
+				else {
+					sprintf(file, "%s/%s", cwd, shell);
+				}
+				if (execprogl("anno", "anno",
+						"-nodate", "-append",
+						"-comp", attach_hdr,
+						"-text", file,
+						drft, (char *)NULL) != 0) {
+					advise(NULL, "Could not add attachment header.");
+				}
+			}
+			pclose(f);
 			break;
 
 		case DETACHCMDSW: