X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fterminal-reader.c;h=141474a95bb9f77d18b5178403127cd8c2e5cbe9;hb=d849605f7d1abf4a881faec40572f536859d6c19;hp=96a69d7bc452ab6e934270d850168b264924907f;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp diff --git a/src/ui/terminal/terminal-reader.c b/src/ui/terminal/terminal-reader.c index 96a69d7bc4..141474a95b 100644 --- a/src/ui/terminal/terminal-reader.c +++ b/src/ui/terminal/terminal-reader.c @@ -52,7 +52,6 @@ static int rl_end; #include #include -#include "data/file-name.h" #include "data/settings.h" #include "language/command.h" #include "language/lexer/lexer.h" @@ -98,7 +97,7 @@ welcome (void) "it\nunder certain conditions; type \"show copying.\" to see the " "conditions.\nThere is ABSOLUTELY NO WARRANTY for PSPP; type \"show " "warranty.\" for details.\n", stdout); - puts (stat_version); + puts (announced_version); journal_init (); } @@ -256,15 +255,6 @@ readline_prompt (enum prompt_style style) static int pfd[2]; static bool sigint_received ; -static void -handler (int sig) -{ - rl_end = 0; - - write (pfd[1], "x", 1); - rl_echo_signal_char (sig); -} - /* A function similar to getc from stdio. @@ -320,6 +310,16 @@ interruptible_getc (FILE *fp) #if HAVE_READLINE +static void +handler (int sig) +{ + rl_end = 0; + + write (pfd[1], "x", 1); + rl_echo_signal_char (sig); +} + + static void readline_init (void) {