From: markus schnalke <meillo@marmaro.de>
Date: Fri, 23 Mar 2012 14:05:49 +0000 (+0100)
Subject: whatnow: Some minor refactoring.
X-Git-Tag: mmh-thesis-end~214
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=f8960957ae53f962fe12e5a5eb4c01eb54cb4228;p=mmh

whatnow: Some minor refactoring.
---

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 168384f..874a787 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -144,7 +144,7 @@ main(int argc, char **argv)
 	** Get the initial current working directory.
 	*/
 
-	if (getcwd(cwd, sizeof (cwd)) == NULL) {
+	if (!getcwd(cwd, sizeof (cwd))) {
 		adios("getcwd", "could not get working directory");
 	}
 
@@ -191,7 +191,7 @@ main(int argc, char **argv)
 			drft = cp;
 	}
 
-	if ((drft == NULL && (drft = getenv("mhdraft")) == NULL) || *drft == 0)
+	if ((!drft && !(drft = getenv("mhdraft"))) || !*drft)
 		drft = getcpy(m_draft(seq_cur));
 
 	msgnam = (cp = getenv("mhaltmsg")) && *cp ? getcpy(cp) : NULL;
@@ -199,7 +199,7 @@ main(int argc, char **argv)
 	if ((cp = getenv("mhuse")) && *cp)
 		use = atoi(cp);
 
-	if (ed == NULL && ((ed = getenv("mheditor")) == NULL || *ed == 0)) {
+	if (!ed && (!(ed = getenv("mheditor")) || !*ed)) {
 		ed = NULL;
 		nedit++;
 	}
@@ -286,11 +286,11 @@ main(int argc, char **argv)
 			} else {
 				writesomecmd(buf, BUFSIZ, "cd", "pwd", argp);
 			}
-			if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
+			if ((f = popen_in_dir(cwd, buf, "r"))) {
 				fgets(cwd, sizeof (cwd), f);
 
-				if (strchr(cwd, '\n') != NULL)
-						*strchr(cwd, '\n') = '\0';
+				if (strchr(cwd, '\n'))
+					*strchr(cwd, '\n') = '\0';
 
 				pclose(f);
 			} else {
@@ -328,7 +328,7 @@ main(int argc, char **argv)
 			l = NULL;
 			n = 0;
 
-			while (*++argp != NULL) {
+			while (*++argp) {
 				if (strcmp(*argp, "-l") == 0)
 					l = "/";
 
@@ -380,22 +380,18 @@ 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")) != (FILE *)0) {
-				while (fgets(shell, sizeof (shell), f)
-						!= NULL) {
+			if ((f = popen_in_dir(cwd, buf, "r"))) {
+				while (fgets(shell, sizeof(shell), f)) {
 					*(strchr(shell, '\n')) = '\0';
 
 					if (*shell == '/')
-						annotate(drft, attach_hdr,
-								shell, 0,
-								-2, 1, 0);
+						sprintf(file, "%s", shell);
 					else {
 						sprintf(file, "%s/%s", cwd,
 								shell);
-						annotate(drft, attach_hdr,
-								file, 0,
-								-2, 1, 0);
 					}
+					annotate(drft, attach_hdr, file, 0,
+							-2, 1, 0);
 				}
 
 				pclose(f);
@@ -444,7 +440,7 @@ main(int argc, char **argv)
 								NULL, 0,
 								n, 1, 0);
 
-						for (argp = arguments + 1; *argp != NULL; argp++) {
+						for (argp = arguments + 1; *argp; argp++) {
 							if (atoi(*argp) > n) {
 								if (atoi(*argp) == 1)
 									*argp = "";
@@ -469,9 +465,8 @@ main(int argc, char **argv)
 			** with a space in it.
 			*/
 			writelscmd(buf, sizeof(buf), argp);
-			if ((f = popen_in_dir(cwd, buf, "r")) != (FILE *)0) {
-				while (fgets(shell, sizeof (shell), f)
-						!= NULL) {
+			if ((f = popen_in_dir(cwd, buf, "r"))) {
+				while (fgets(shell, sizeof (shell), f)) {
 					*(strchr(shell, '\n')) = '\0';
 					annotate(drft, attach_hdr, shell,
 							0, 0, 1, 0);
@@ -525,7 +520,7 @@ writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp)
 
 	cp = buf + ln;
 
-	while (*++argp != NULL) {
+	while (*++argp) {
 		ln = strlen(*argp);
 		/* +1 for leading space */
 		if (ln + trailln + 1 > bufsz - (cp-buf))
@@ -614,12 +609,12 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 	if (reedit) {
 		if (!*ed) {  /* no explicit editor */
 			*ed = edsave;  /* so use the previous one */
-			if ((cp = mhbasename(*ed)) == NULL)
+			if (!(cp = mhbasename(*ed)))
 				cp = *ed;
 
 			/* unless we've specified it via "editor-next" */
 			cp = concat(cp, "-next", NULL);
-			if ((cp = context_find(cp)) != NULL)
+			if ((cp = context_find(cp)))
 				*ed = cp;
 		}
 	} else if (!*ed) {
@@ -628,12 +623,12 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 	}
 
 	if (altmsg) {
-		if (mp == NULL || *altmsg == '/' || cwd == NULL)
+		if (!mp || *altmsg == '/' || !cwd)
 			strncpy(altpath, altmsg, sizeof(altpath));
 		else
 			snprintf(altpath, sizeof(altpath), "%s/%s",
 					mp->foldpath, altmsg);
-		if (cwd == NULL)
+		if (!cwd)
 			strncpy(linkpath, altmsglink, sizeof(linkpath));
 		else
 			snprintf(linkpath, sizeof(linkpath), "%s/%s",