From 21f453445516378622faa924508697321e57fe7f Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 2 Jul 2011 20:23:40 +0000 Subject: [PATCH] main.c, reduce scope of `gdata' --- src/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main.c b/src/main.c index 967bcd63a..79ebc6968 100644 --- a/src/main.c +++ b/src/main.c @@ -779,12 +779,6 @@ print_news(void) int main(int argc, char **argv) { - -#ifdef SIMULATOR -#else - bool gdata = TRUE; -#endif - char buf[BSIZE_SP]; bool readinit = TRUE; bool istty = TRUE; @@ -1024,9 +1018,6 @@ main(int argc, char **argv) if_getparam = spif_getparam_special; #else if_getparam = nutif_getparam; - - if (optind == argc) /* No raw file */ - gdata = FALSE; #endif if ((!iflag && !istty) || ft_servermode) /* (batch and file) or server operation */ @@ -1316,6 +1307,11 @@ main(int argc, char **argv) } else { + bool gdata = TRUE; + + if (optind == argc) /* No raw file */ + gdata = FALSE; + cp_interactive = FALSE; if (gdata) {