X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fterminal%2Fmain.c;h=c30b5f85bc02bd82259ce8aeadb6e7910ea6af02;hb=bbe1233f0ed396751b3311f9468dc6e774ed6416;hp=c19a1c78eaade7c0c40e72cfe736d1ac7849b60a;hpb=e195fccfab97205acb29f90fd1168488d49f1573;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index c19a1c78ea..c30b5f85bc 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2006-2007, 2009-2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,12 +49,10 @@ #include "math/random.h" #include "output/driver.h" #include "output/message-item.h" -#include "ui/debugger.h" #include "ui/source-init-opts.h" #include "ui/terminal/terminal-opts.h" #include "ui/terminal/terminal-reader.h" #include "ui/terminal/terminal.h" -#include "ui/terminal/terminal-opts.h" #include "gl/fatal-signal.h" #include "gl/progname.h" @@ -98,7 +96,7 @@ main (int argc, char **argv) random_init (); lexer = lex_create (); - the_session = session_create (); + the_session = session_create (NULL); dataset_create (the_session, ""); parser = argv_parser_create (); @@ -149,7 +147,7 @@ main (int argc, char **argv) lex_discard_noninteractive (lexer); } else if (result == CMD_CASCADING_FAILURE - && lex_get_error_mode (lexer) != LEX_ERROR_INTERACTIVE) + && lex_get_error_mode (lexer) != LEX_ERROR_TERMINAL) { msg (SE, _("Stopping syntax file processing here to avoid " "a cascade of dependent command failures.")); @@ -195,9 +193,6 @@ bug_handler(int sig) recurse. */ signal (sig, SIG_DFL); -#if DEBUGGING - connect_debugger (); -#endif switch (sig) { case SIGABRT: