follow-up for issue #1512

The previous fix, while valid, still prompts for input during early
options processing if stdin is a tty. It really shouldn't be doing
that during early options such as --showpaths, so alter the placement
of the program_state.earlyoptions flag within *main().

sys/unix/unixmain.c

@@ -132,7 +132,6 @@ main(int argc, char *argv[])
     program_state.early_options = 1;
     /* handle -dalthackdir, -s <score stuff>, --version, --showpaths */
     early_options(&argc, &argv, &dir);
-    program_state.early_options = 0;
 #ifdef CHDIR
     /*
      * Change directories before we initialize the window system so
@@ -146,6 +145,7 @@ main(int argc, char *argv[])
 #ifdef __linux__
     check_linux_console();
 #endif
+    program_state.early_options = 0;
 
     initoptions();
 #ifdef PANICTRACE

sys/windows/windmain.c

@@ -219,6 +219,8 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
     //       windowtype = gc.chosen_windowtype;
     //   windowtype = gc.chosen_windowtype;
 
+    program_state.early_options = 1;
+
 #if !defined(MSWIN_GRAPHICS)
     nethack_enter_consoletty();
     consoletty_open(1);
@@ -254,12 +256,10 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
                    * which clears out gp.fqn_prefix[] */
     // iflags.windowtype_deferred = TRUE;
 
-    program_state.early_options = 1;
     /* if (GUILaunched || IsDebuggerPresent()) */
     early_options(&argc, &argv, &dir);
+
     program_state.early_options = 0;
-
-
     initoptions();
 #if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
     chdir(gf.fqn_prefix[HACKPREFIX]);

win/tty/wintty.c

@@ -766,7 +766,7 @@ getret(void)
 #if defined(MICRO) || defined(WIN32CON)
     getreturn("to continue");
 #else
-    if (!isatty(STDIN_FILENO))
+    if (!isatty(STDIN_FILENO) || program_state.early_options)
         return;
     HUPSKIP();
     xputs("\n");