X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmain.c;h=74208de753a7a92902309e5a6b9252d07da9bad6;hb=a060b769bbf5d6065ab8345427244d4abbbf08dc;hp=2b70712d130115a9eff111fc99f45d2b30346965;hpb=6457bd476178a8cac32638d2e5d6cf0977a88e69;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/main.c b/gdb/main.c index 2b70712d13..74208de753 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1,6 +1,8 @@ /* Top level stuff for GDB, the GNU debugger. - Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + + Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software + Foundation, Inc. This file is part of GDB. @@ -36,11 +38,8 @@ #include "event-loop.h" #include "ui-out.h" -#if defined (TUI) -/* FIXME: cagney/2000-01-31: This #include is to allow older code such - as that found in the TUI to continue to build. */ -#include "tui/tui-file.h" -#endif +#include "interps.h" +#include "main.h" /* If nonzero, display time usage both at startup and for each command. */ @@ -56,13 +55,10 @@ int display_space; processes UI events asynchronously. */ int event_loop_p = 1; -#ifdef UI_OUT -/* Has an interpreter been specified and if so, which. */ +/* The selected interpreter. This will be used as a set command + variable, so it should always be malloc'ed - since + do_setshow_command will free it. */ char *interpreter_p; -#endif - -/* Whether this is the command line version or not */ -int tui_version = 0; /* Whether xdb commands will be handled */ int xdb_commands = 0; @@ -70,6 +66,9 @@ int xdb_commands = 0; /* Whether dbx commands will be handled */ int dbx_commands = 0; +/* System root path, used to find libraries etc. */ +char *gdb_sysroot = 0; + struct ui_file *gdb_stdout; struct ui_file *gdb_stderr; struct ui_file *gdb_stdlog; @@ -87,24 +86,15 @@ static void print_gdb_help (struct ui_file *); /* These two are used to set the external editor commands when gdb is farming out files to be edited by another program. */ -extern int enable_external_editor; extern char *external_editor_command; -#ifdef __CYGWIN__ -#include /* for MAX_PATH */ -#include /* for cygwin32_conv_to_posix_path */ -#endif - /* Call command_loop. If it happens to return, pass that through as a non-zero return status. */ static int captured_command_loop (void *data) { - if (command_loop_hook == NULL) - command_loop (); - else - command_loop_hook (); + current_interp_command_loop (); /* FIXME: cagney/1999-11-05: A correct command_loop() implementaton would clean things up (restoring the cleanup chain) to the state they were just prior to the call. Technically, this means that @@ -121,12 +111,6 @@ captured_command_loop (void *data) return 1; } -struct captured_main_args - { - int argc; - char **argv; - }; - static int captured_main (void *data) { @@ -136,6 +120,7 @@ captured_main (void *data) int count; static int quiet = 0; static int batch = 0; + static int set_args = 0; /* Pointers to various arguments from command line. */ char *symarg = NULL; @@ -169,15 +154,19 @@ captured_main (void *data) long time_at_startup = get_run_time (); - START_PROGRESS (argv[0], 0); +#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) + setlocale (LC_MESSAGES, ""); +#endif +#if defined (HAVE_SETLOCALE) + setlocale (LC_CTYPE, ""); +#endif + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); -#ifdef MPW - /* Do all Mac-specific setup. */ - mac_init (); -#endif /* MPW */ + START_PROGRESS (argv[0], 0); /* This needs to happen before the first use of malloc. */ - init_malloc ((PTR) NULL); + init_malloc (NULL); #if defined (ALIGN_STACK_ON_STARTUP) i = (int) &count & 0x3; @@ -200,21 +189,48 @@ captured_main (void *data) getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)); current_directory = gdb_dirbuf; -#if defined (TUI) - gdb_stdout = tui_fileopen (stdout); - gdb_stderr = tui_fileopen (stderr); - gdb_stdlog = gdb_stdout; /* for moment */ - gdb_stdtarg = gdb_stderr; /* for moment */ -#else gdb_stdout = stdio_fileopen (stdout); gdb_stderr = stdio_fileopen (stderr); gdb_stdlog = gdb_stderr; /* for moment */ gdb_stdtarg = gdb_stderr; /* for moment */ -#endif /* initialize error() */ error_init (); + /* Set the sysroot path. */ +#ifdef TARGET_SYSTEM_ROOT_RELOCATABLE + gdb_sysroot = make_relative_prefix (argv[0], BINDIR, TARGET_SYSTEM_ROOT); + if (gdb_sysroot) + { + struct stat s; + int res = 0; + + if (stat (gdb_sysroot, &s) == 0) + if (S_ISDIR (s.st_mode)) + res = 1; + + if (res == 0) + { + xfree (gdb_sysroot); + gdb_sysroot = TARGET_SYSTEM_ROOT; + } + } + else + gdb_sysroot = TARGET_SYSTEM_ROOT; +#else +#if defined (TARGET_SYSTEM_ROOT) + gdb_sysroot = TARGET_SYSTEM_ROOT; +#else + gdb_sysroot = ""; +#endif +#endif + + /* There will always be an interpreter. Either the one passed into + this captured main, or one specified by the user at start up, or + the console. Initialize the interpreter to the one requested by + the application. */ + interpreter_p = xstrdup (context->interpreter_p); + /* Parse arguments and options. */ { int c; @@ -226,7 +242,7 @@ captured_main (void *data) {"async", no_argument, &event_loop_p, 1}, {"noasync", no_argument, &event_loop_p, 0}, #if defined(TUI) - {"tui", no_argument, &tui_version, 1}, + {"tui", no_argument, 0, 14}, #endif {"xdb", no_argument, &xdb_commands, 1}, {"dbx", no_argument, &dbx_commands, 1}, @@ -257,6 +273,8 @@ captured_main (void *data) {"e", required_argument, 0, 'e'}, {"core", required_argument, 0, 'c'}, {"c", required_argument, 0, 'c'}, + {"pid", required_argument, 0, 'p'}, + {"p", required_argument, 0, 'p'}, {"command", required_argument, 0, 'x'}, {"version", no_argument, &print_version, 1}, {"x", required_argument, 0, 'x'}, @@ -265,11 +283,9 @@ captured_main (void *data) {"enable-external-editor", no_argument, 0, 'y'}, {"editor-command", required_argument, 0, 'w'}, #endif -#ifdef UI_OUT {"ui", required_argument, 0, 'i'}, {"interpreter", required_argument, 0, 'i'}, {"i", required_argument, 0, 'i'}, -#endif {"directory", required_argument, 0, 'd'}, {"d", required_argument, 0, 'd'}, {"cd", required_argument, 0, 11}, @@ -282,10 +298,7 @@ captured_main (void *data) {"windows", no_argument, &use_windows, 1}, {"statistics", no_argument, 0, 13}, {"write", no_argument, &write_files, 1}, -/* Allow machine descriptions to add more options... */ -#ifdef ADDITIONAL_OPTIONS - ADDITIONAL_OPTIONS -#endif + {"args", no_argument, &set_args, 1}, {0, no_argument, 0, 0} }; @@ -295,7 +308,7 @@ captured_main (void *data) c = getopt_long_only (argc, argv, "", long_options, &option_index); - if (c == EOF) + if (c == EOF || set_args) break; /* Long option that takes an argument. */ @@ -323,6 +336,11 @@ captured_main (void *data) display_time = 1; display_space = 1; break; + case 14: + /* --tui is equivalent to -i=tui. */ + xfree (interpreter_p); + interpreter_p = xstrdup ("tui"); + break; case 'f': annotation_level = 1; /* We have probably been invoked from emacs. Disable window interface. */ @@ -337,6 +355,10 @@ captured_main (void *data) case 'c': corearg = optarg; break; + case 'p': + /* "corearg" is shared by "--core" and "--pid" */ + corearg = optarg; + break; case 'x': cmdarg[ncmd++] = optarg; if (ncmd >= cmdsize) @@ -352,39 +374,25 @@ captured_main (void *data) extern int gdbtk_test (char *); if (!gdbtk_test (optarg)) { - fprintf_unfiltered (gdb_stderr, "%s: unable to load tclcommand file \"%s\"", + fprintf_unfiltered (gdb_stderr, _("%s: unable to load tclcommand file \"%s\""), argv[0], optarg); exit (1); } break; } case 'y': - { - /* - * This enables the edit/button in the main window, even - * when IDE_ENABLED is set to false. In this case you must - * use --tclcommand to specify a tcl/script to be called, - * Tcl/Variable to store the edit/command is: - * external_editor - */ - enable_external_editor = 1; - break; - } + /* Backwards compatibility only. */ + break; case 'w': { - /* - * if editor command is enabled, both flags are set - */ - enable_external_editor = 1; external_editor_command = xstrdup (optarg); break; } #endif /* GDBTK */ -#ifdef UI_OUT case 'i': - interpreter_p = optarg; + xfree (interpreter_p); + interpreter_p = xstrdup (optarg); break; -#endif case 'd': dirarg[ndir++] = optarg; if (ndir >= dirsize) @@ -413,10 +421,11 @@ extern int gdbtk_test (char *); fprintf_unfiltered (gdb_stderr, - "warning: could not set baud rate to `%s'.\n", optarg); + _("warning: could not set baud rate to `%s'.\n"), optarg); else baud_rate = i; } + break; case 'l': { int i; @@ -430,18 +439,15 @@ extern int gdbtk_test (char *); fprintf_unfiltered (gdb_stderr, - "warning: could not set timeout limit to `%s'.\n", optarg); + _("warning: could not set timeout limit to `%s'.\n"), optarg); else remote_timeout = i; } break; -#ifdef ADDITIONAL_OPTION_CASES - ADDITIONAL_OPTION_CASES -#endif case '?': fprintf_unfiltered (gdb_stderr, - "Use `%s --help' for a complete list of options.\n", + _("Use `%s --help' for a complete list of options.\n"), argv[0]); exit (1); } @@ -451,54 +457,61 @@ extern int gdbtk_test (char *); if (print_help || print_version) { use_windows = 0; -#ifdef TUI - /* Disable the TUI as well. */ - tui_version = 0; -#endif } -#ifdef TUI - /* An explicit --tui flag overrides the default UI, which is the - window system. */ - if (tui_version) - use_windows = 0; -#endif - - /* OK, that's all the options. The other arguments are filenames. */ - count = 0; - for (; optind < argc; optind++) - switch (++count) - { - case 1: - symarg = argv[optind]; - execarg = argv[optind]; - break; - case 2: - /* FIXME: The documentation says this can be a "ProcID". as well. */ - corearg = argv[optind]; - break; - case 3: - fprintf_unfiltered (gdb_stderr, - "Excess command line arguments ignored. (%s%s)\n", - argv[optind], (optind == argc - 1) ? "" : " ..."); - break; - } + if (set_args) + { + /* The remaining options are the command-line options for the + inferior. The first one is the sym/exec file, and the rest + are arguments. */ + if (optind >= argc) + { + fprintf_unfiltered (gdb_stderr, + _("%s: `--args' specified but no program specified\n"), + argv[0]); + exit (1); + } + symarg = argv[optind]; + execarg = argv[optind]; + ++optind; + set_inferior_args_vector (argc - optind, &argv[optind]); + } + else + { + /* OK, that's all the options. The other arguments are filenames. */ + count = 0; + for (; optind < argc; optind++) + switch (++count) + { + case 1: + symarg = argv[optind]; + execarg = argv[optind]; + break; + case 2: + /* The documentation says this can be a "ProcID" as well. + We will try it as both a corefile and a pid. */ + corearg = argv[optind]; + break; + case 3: + fprintf_unfiltered (gdb_stderr, + _("Excess command line arguments ignored. (%s%s)\n"), + argv[optind], (optind == argc - 1) ? "" : " ..."); + break; + } + } if (batch) quiet = 1; } -#if defined(TUI) - /* Should this be moved to tui-top.c:_initialize_tui()? */ - if (tui_version) - init_ui_hook = tuiInit; -#endif - /* Initialize all files. Give the interpreter a chance to take control of the console via the init_ui_hook()) */ gdb_init (argv[0]); /* Do these (and anything which might call wrap_here or *_filtered) - after initialize_all_files. */ + after initialize_all_files() but before the interpreter has been + installed. Otherwize the help/version messages will be eaten by + the interpreter's output handler. */ + if (print_version) { print_gdb_version (gdb_stdout); @@ -514,7 +527,49 @@ extern int gdbtk_test (char *); exit (0); } - if (!quiet) + /* FIXME: cagney/2003-02-03: The big hack (part 1 of 2) that lets + GDB retain the old MI1 interpreter startup behavior. Output the + copyright message before the interpreter is installed. That way + it isn't encapsulated in MI output. */ + if (!quiet && strcmp (interpreter_p, INTERP_MI1) == 0) + { + /* Print all the junk at the top, with trailing "..." if we are about + to read a symbol file (possibly slowly). */ + print_gdb_version (gdb_stdout); + if (symarg) + printf_filtered (".."); + wrap_here (""); + gdb_flush (gdb_stdout); /* Force to screen during slow operations */ + } + + + /* Install the default UI. All the interpreters should have had a + look at things by now. Initialize the default interpreter. */ + + { + /* Find it. */ + struct interp *interp = interp_lookup (interpreter_p); + if (interp == NULL) + { + fprintf_unfiltered (gdb_stderr, "Interpreter `%s' unrecognized.\n", + interpreter_p); + exit (1); + } + /* Install it. */ + if (!interp_set (interp)) + { + fprintf_unfiltered (gdb_stderr, + "Interpreter `%s' failed to initialize.\n", + interpreter_p); + exit (1); + } + } + + /* FIXME: cagney/2003-02-03: The big hack (part 2 of 2) that lets + GDB retain the old MI1 interpreter startup behavior. Output the + copyright message after the interpreter is installed when it is + any sane interpreter. */ + if (!quiet && !current_interp_named_p (INTERP_MI1)) { /* Print all the junk at the top, with trailing "..." if we are about to read a symbol file (possibly slowly). */ @@ -529,27 +584,13 @@ extern int gdbtk_test (char *); quit_pre_print = error_pre_print; /* We may get more than one warning, don't double space all of them... */ - warning_pre_print = "\nwarning: "; + warning_pre_print = _("\nwarning: "); /* Read and execute $HOME/.gdbinit file, if it exists. This is done *before* all the command line arguments are processed; it sets global parameters, which are independent of what file you are debugging or what directory you are in. */ -#ifdef __CYGWIN32__ - { - char *tmp = getenv ("HOME"); - - if (tmp != NULL) - { - homedir = (char *) alloca (MAX_PATH + 1); - cygwin32_conv_to_posix_path (tmp, homedir); - } - else - homedir = NULL; - } -#else homedir = getenv ("HOME"); -#endif if (homedir) { homeinit = (char *) alloca (strlen (homedir) + @@ -588,7 +629,7 @@ extern int gdbtk_test (char *); if (execarg != NULL && symarg != NULL - && STREQ (execarg, symarg)) + && strcmp (execarg, symarg) == 0) { /* The exec file and the symbol-file are the same. If we can't open it, better only print one error message. @@ -611,29 +652,33 @@ extern int gdbtk_test (char *); printf_filtered ("\n"); error_pre_print = "\n"; quit_pre_print = error_pre_print; - warning_pre_print = "\nwarning: "; + warning_pre_print = _("\nwarning: "); if (corearg != NULL) { - if (catch_command_errors (core_file_command, corearg, !batch, RETURN_MASK_ALL) == 0) + /* corearg may be either a corefile or a pid. + If its first character is a digit, try attach first + and then corefile. Otherwise try corefile first. */ + + if (isdigit (corearg[0])) { - /* See if the core file is really a PID. */ - if (isdigit (corearg[0])) - catch_command_errors (attach_command, corearg, !batch, RETURN_MASK_ALL); + if (catch_command_errors (attach_command, corearg, + !batch, RETURN_MASK_ALL) == 0) + catch_command_errors (core_file_command, corearg, + !batch, RETURN_MASK_ALL); } + else /* Can't be a pid, better be a corefile. */ + catch_command_errors (core_file_command, corearg, + !batch, RETURN_MASK_ALL); } if (ttyarg != NULL) catch_command_errors (tty_command, ttyarg, !batch, RETURN_MASK_ALL); -#ifdef ADDITIONAL_OPTION_HANDLER - ADDITIONAL_OPTION_HANDLER; -#endif - /* Error messages should no longer be distinguished with extra output. */ error_pre_print = NULL; quit_pre_print = NULL; - warning_pre_print = "warning: "; + warning_pre_print = _("warning: "); /* Read the .gdbinit file in the current directory, *if* it isn't the same as the $HOME/.gdbinit file (it should exist, also). */ @@ -692,7 +737,7 @@ extern int gdbtk_test (char *); { long init_time = get_run_time () - time_at_startup; - printf_unfiltered ("Startup time: %ld.%06ld\n", + printf_unfiltered (_("Startup time: %ld.%06ld\n"), init_time / 1000000, init_time % 1000000); } @@ -702,18 +747,11 @@ extern int gdbtk_test (char *); extern char **environ; char *lim = (char *) sbrk (0); - printf_unfiltered ("Startup size: data size %ld\n", + printf_unfiltered (_("Startup size: data size %ld\n"), (long) (lim - (char *) &environ)); #endif } - /* The default command loop. - The WIN32 Gui calls this main to set up gdb's state, and - has its own command loop. */ -#if !defined _WIN32 || defined __GNUC__ - /* GUIs generally have their own command loop, mainloop, or - whatever. This is a good place to gain control because many - error conditions will end up here via longjmp(). */ #if 0 /* FIXME: cagney/1999-11-06: The original main loop was like: */ while (1) @@ -749,17 +787,14 @@ extern int gdbtk_test (char *); { catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL); } -#endif /* No exit -- exit is through quit_command. */ } int -main (int argc, char **argv) +gdb_main (struct captured_main_args *args) { - struct captured_main_args args; - args.argc = argc; - args.argv = argv; - catch_errors (captured_main, &args, "", RETURN_MASK_ALL); + use_windows = args->use_windows; + catch_errors (captured_main, args, "", RETURN_MASK_ALL); return 0; } @@ -771,64 +806,66 @@ main (int argc, char **argv) static void print_gdb_help (struct ui_file *stream) { - fputs_unfiltered ("\ + fputs_unfiltered (_("\ This is the GNU debugger. Usage:\n\n\ - gdb [options] [executable-file [core-file or process-id]]\n\n\ + gdb [options] [executable-file [core-file or process-id]]\n\ + gdb [options] --args executable-file [inferior-arguments ...]\n\n\ Options:\n\n\ -", stream); - fputs_unfiltered ("\ +"), stream); + fputs_unfiltered (_("\ + --args Arguments after executable-file are passed to inferior\n\ +"), stream); + fputs_unfiltered (_("\ --[no]async Enable (disable) asynchronous version of CLI\n\ -", stream); - fputs_unfiltered ("\ +"), stream); + fputs_unfiltered (_("\ -b BAUDRATE Set serial port baud rate used for remote debugging.\n\ --batch Exit after processing options.\n\ --cd=DIR Change current directory to DIR.\n\ --command=FILE Execute GDB commands from FILE.\n\ --core=COREFILE Analyze the core dump COREFILE.\n\ -", stream); - fputs_unfiltered ("\ + --pid=PID Attach to running process PID.\n\ +"), stream); + fputs_unfiltered (_("\ --dbx DBX compatibility mode.\n\ --directory=DIR Search for source files in DIR.\n\ --epoch Output information used by epoch emacs-GDB interface.\n\ --exec=EXECFILE Use EXECFILE as the executable.\n\ --fullname Output information used by emacs-GDB interface.\n\ --help Print this message.\n\ -", stream); - fputs_unfiltered ("\ +"), stream); + fputs_unfiltered (_("\ --interpreter=INTERP\n\ Select a specific interpreter / user interface\n\ -", stream); - fputs_unfiltered ("\ +"), stream); + fputs_unfiltered (_("\ --mapped Use mapped symbol files if supported on this system.\n\ --nw Do not use a window interface.\n\ - --nx Do not read ", stream); + --nx Do not read "), stream); fputs_unfiltered (gdbinit, stream); - fputs_unfiltered (" file.\n\ + fputs_unfiltered (_(" file.\n\ --quiet Do not print version number on startup.\n\ --readnow Fully read symbol files on first access.\n\ -", stream); - fputs_unfiltered ("\ +"), stream); + fputs_unfiltered (_("\ --se=FILE Use FILE as symbol file and executable file.\n\ --symbols=SYMFILE Read symbols from SYMFILE.\n\ --tty=TTY Use TTY for input/output by the program being debugged.\n\ -", stream); +"), stream); #if defined(TUI) - fputs_unfiltered ("\ + fputs_unfiltered (_("\ --tui Use a terminal user interface.\n\ -", stream); +"), stream); #endif - fputs_unfiltered ("\ + fputs_unfiltered (_("\ --version Print version information and then exit.\n\ -w Use a window interface.\n\ --write Set writing into executable and core files.\n\ --xdb XDB compatibility mode.\n\ -", stream); -#ifdef ADDITIONAL_OPTION_HELP - fputs_unfiltered (ADDITIONAL_OPTION_HELP, stream); -#endif - fputs_unfiltered ("\n\ +"), stream); + fputs_unfiltered (_("\n\ For more information, type \"help\" from within GDB, or consult the\n\ GDB manual (available as on-line info or a printed manual).\n\ Report bugs to \"bug-gdb@gnu.org\".\ -", stream); +"), stream); }