Merge branch 'master' into ifnot

1 files changed, 10 insertions, 6 deletions

diff --git a/main.c b/main.c
index 9743a2c..c5dc5d5 100644
--- a/main.c
+++ b/main.c
@@ -6,17 +6,19 @@
 
 #include "input.h"
 
-bool dashdee, dashee, dashvee, dashex, dasheye,
-	dashen, dashpee, interactive;
+bool dashdee, dashee, dasheye, dashell, dashen;
+bool dashpee, dashoh, dashess, dashvee, dashex;
+bool interactive;
+static bool dashEYE;
+char *dashsee[2];
 pid_t rc_pid;
 
-static bool dashEYE, dashell, dashoh, dashess;
 
 static void assigndefault(char *,...);
 static void checkfd(int, enum redirtype);
 
 extern int main(int argc, char *argv[], char *envp[]) {
-	char *dashsee[2], *dollarzero, *null[1];
+	char *dollarzero, *null[1];
 	int c;
 	initprint();
 	dashsee[0] = dashsee[1] = NULL;
@@ -67,8 +69,10 @@ extern int main(int argc, char *argv[], char *envp[]) {
 		}
 quitopts:
 	argv += rc_optind;
-	/* use isatty() iff neither -i nor -I is set, and iff the input is not from a script or -c flags */
-	if (!dasheye && !dashEYE && dashsee[0] == NULL && (dashess || *argv == NULL))
+	/* use isatty() iff neither -i nor -I is set, and iff the input is not
+	 * from a script or -c flags */
+	if (!dasheye && !dashEYE && dashsee[0] == NULL &&
+			(dashess || *argv == NULL))
 		interactive = isatty(0);
 	if (!dashoh) {
 		checkfd(0, rFrom);