3 files changed, 6 insertions, 3 deletions

diff --git a/editors/awk.c b/editors/awk.c
index 1bdb9b924..5a504d034 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2145,7 +2145,8 @@ static var *evaluate(node *op, var *res)
                                 X.rsm = newfile(R.s);
                                 if (! X.rsm->F) {
                                         if (opn == '|') {
-                                                if((X.rsm->F = popen(R.s, "w")) == NULL)
+                                                X.rsm->F = popen(R.s, "w");
+                                                if (X.rsm->F == NULL)
                                                         bb_perror_msg_and_die("popen");
                                                 X.rsm->is_pipe = 1;
                                         } else {
diff --git a/editors/patch.c b/editors/patch.c
index 4d1425edc..11b2f2587 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -62,7 +62,9 @@ static char *extract_filename(char *line, int patch_level)
 
         /* skip over (patch_level) number of leading directories */
         for (i = 0; i < patch_level; i++) {
-                if(!(temp = strchr(filename_start_ptr, '/'))) break;
+                temp = strchr(filename_start_ptr, '/');
+                if (!temp)
+                        break;
                 filename_start_ptr = temp + 1;
         }
 
diff --git a/editors/vi.c b/editors/vi.c
index 5bce4272f..a103776d2 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -447,7 +447,7 @@ static void edit_file(char * fn)
                                 q = p;
                                 p = strchr(q,'\n');
                                 if (p)
-                                        while(*p == '\n')
+                                        while (*p == '\n')
                                                 *p++ = '\0';
                                 if (*q)
                                         colon(q);