From 6e5da31c92f5a3fa38e010052c5a7743bfe1cf11 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Wed, 14 Jan 2015 08:08:07 +0100 Subject: [PATCH] Refactoring in the small Out-sorting failure cases instead of deep-nesting the success case. --- uip/whatnow.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) 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: -- 1.7.10.4