X-Git-Url: http://git.jankratochvil.net/?p=gdbmicli.git;a=blobdiff_plain;f=main.c;h=2ac00a719fe2d980582e3054d10cb1539a1d5109;hp=2980031ed7e7eccabbf267240a6b9be5e550e71c;hb=HEAD;hpb=1970724b758aecc45c18cfd90c0dc44782b75b68 diff --git a/main.c b/main.c index 2980031..2ac00a7 100644 --- a/main.c +++ b/main.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "ansidecl.h" #include "mi_gdb.h" @@ -82,10 +83,107 @@ xstrprintf (const char *fmt, ...) return retval; } +static jmp_buf gdb_readline_jmp_buf; + +static void +gdb_readline_sigint_handler (int signum) +{ + gdb_assert (signum == SIGINT); + longjmp (gdb_readline_jmp_buf, 1); +} + +static char * +gdb_readline (const char *prompt) +{ + char *retval; + sighandler_t saved_handler; + sigset_t mask; + int i; + + i = sigprocmask (SIG_SETMASK, NULL, &mask); + assert (i == 0); + saved_handler = signal (SIGINT, gdb_readline_sigint_handler); + if (setjmp (gdb_readline_jmp_buf) != 0) + { + rl_free_line_state (); + rl_cleanup_after_signal (); + + /* GDB prints this. */ + puts ("Quit"); + + i = sigprocmask (SIG_SETMASK, &mask, NULL); + assert (i == 0); + } + retval = readline (prompt); + saved_handler = signal (SIGINT, saved_handler); + gdb_assert (saved_handler == gdb_readline_sigint_handler); + return retval; +} + +static int console_cb_rows, console_cb_columns, console_cb_row, console_cb_column; +static bool console_cb_drop; + static void console_cb (const char *str, void *data) { - fputs (str, stdout); + const char *cs; + + if (console_cb_drop) + return; + if (console_cb_rows == 0) + { + fputs (str, stdout); + return; + } + + while (*str != '\0') + { + int columns; + size_t size; + char *answer; + + cs = strchr (str, '\n'); + if (cs == NULL) + cs = &str[strlen (str)]; + columns = min (cs - str, console_cb_columns - console_cb_column); + if (columns > 0) + { + size = fwrite (str, 1, columns, stdout); + gdb_assert (size == columns); + str += columns; + console_cb_column += columns; + continue; + } + if (*str == '\n') + str++; + else if (console_cb_column < console_cb_columns) + gdb_assert_not_reached ("we should not get here"); + putchar ('\n'); + console_cb_row++; + console_cb_column = 0; + if (console_cb_row < console_cb_rows - 1) + continue; + answer = gdb_readline (_("---Type to continue, " + "or q to quit---")); + for (cs = answer; isspace (*cs); cs++); + if (*cs == 'q') + { + xfree (answer); + puts ("Quit"); + console_cb_drop = true; + return; + } + xfree (answer); + console_cb_row = 0; + } +} + +static int +time_out_cb (void *data) +{ + fatal ("GDB response has timed out"); + /* NOTREACHED */ + return 0; } static ATTRIBUTE_UNUSED void @@ -117,16 +215,11 @@ history_save (int rc, void *arg) } static void -quit_command (mi_h *h, const char *cmd) -{ - exit (EXIT_SUCCESS); -} - -static void default_command (mi_h *h, const char *cmd) { int count = 1; + gdb_assert (strchr (cmd, '\n') == 0); mi_send (h, "-interpreter-exec console \"%s\"\n", cmd); while (count > 0) @@ -161,16 +254,139 @@ default_command (mi_h *h, const char *cmd) } } +static void +quit_command (mi_h *h, const char *cmd) +{ + exit (EXIT_SUCCESS); +} + +static char * +mi_escape (const char *cs) +{ + char *d, *retval = xmalloc (strlen (cs) * 2 + 1); + + d = retval; + while (*cs) + { + if (*cs == '"' || *cs == '\\') + *d++ = '\\'; + *d++ = *cs++; + } + *d = '\0'; + return retval; +} + +static void +gdb_done (mi_h *h, const char *command) +{ + mi_output *res; + + mi_send (h, "%s\n", command); + res = mi_get_response_blk (h); + gdb_assert (res != NULL && res->next == NULL && res->tclass == MI_CL_DONE + && res->c == NULL); + mi_free_output (res); +} + +static void +commands_command_console_cb (const char *str, void *data) +{ + char **strptr = data; + + gdb_assert (*strptr == NULL); + *strptr = xstrdup (str); +} + +static void +commands_command (mi_h *h, const char *cmd_param) +{ + char *cmd = xstrdup (""); + size_t cmd_len = 0; + mi_output *res; + char *bpnum = NULL; + int nesting; + + if (*cmd_param == '\0') + { + mi_set_console_cb (h, commands_command_console_cb, &bpnum); + gdb_done (h, "output $bpnum"); + mi_set_console_cb (h, console_cb, NULL); + gdb_assert (bpnum != NULL); + cmd_param = bpnum; + } + + printf (_("Type commands for breakpoint(s) %s, one per line.\n" + "End with a line saying just \"end\".\n"), cmd_param); + + nesting = 0; + while (nesting >= 0) + { + char *prompt, *data, *data2, *start, *end; + size_t data2_len; + int do_nest = 0; + + prompt = xstrprintf ("%*s>", (int) nesting); + data = gdb_readline (prompt); + xfree (prompt); + if (data == NULL) + data = xstrdup ("end"); + + for (start = data; isspace (*start); start++); + for (end = data + strlen (data); end > start && isspace (end[-1]); end--); + data2 = xmalloc (end - start + 1); + memcpy (data2, start, end - start); + data2[end - start] = '\0'; + if (strcmp (data2, "python") == 0) + do_nest = 1; + if (strcmp (data2, "end") == 0) + do_nest = -1; + for (end = data2; *end && !isspace (*end); end++); + *end = '\0'; + + /* Here is a bug in GDB, it does not recognize command shortcuts. */ + if (strcmp (data2, "while") == 0 || strcmp (data2, "if") == 0 + || strcmp (data2, "commands") == 0 + || strcmp (data2, "while-stepping") == 0 + || strcmp (data2, "stepping") == 0 || strcmp (data2, "ws") == 0) + do_nest = 1; + xfree (data2); + + nesting += do_nest; + if (nesting < 0) + break; + + data2 = mi_escape (data); + xfree (data); + data2_len = strlen (data2); + cmd = xrealloc (cmd, cmd_len + 2 + data2_len + 2); + cmd[cmd_len] = ' '; + cmd[cmd_len + 1] = '"'; + memcpy (&cmd[cmd_len + 2], data2, data2_len); + cmd[cmd_len + 2 + data2_len] = '"'; + cmd[cmd_len + 2 + data2_len + 1] = '\0'; + cmd_len += 2 + data2_len + 1; + xfree (data2); + } + + mi_send (h, "-break-commands %s%s\n", cmd_param, cmd); + xfree (cmd); + xfree (bpnum); + + res = mi_get_response_blk (h); + gdb_assert (res != NULL && res->next == NULL && res->tclass == MI_CL_DONE + && res->c == NULL); + mi_free_output (res); +} + static const struct cmd { const char *name; + int min_shortcut; void (*func) (mi_h *h, const char *cmd); } cmds[] = { - { "q", quit_command }, - { "qu", quit_command }, - { "qui", quit_command }, - { "quit", quit_command }, + { "quit", 1, quit_command }, + { "commands", 4, commands_command }, }; static void @@ -186,28 +402,18 @@ executecommand (mi_h *h, const char *cmd) while (isalnum (*cs)) cs++; end = cs; + while (isspace (*cs)) + cs++; for (cmdp = cmds; cmdp < &cmds[LENGTH (cmds)]; cmdp++) - if (strlen (cmdp->name) == end - start - && strncmp (cmd, cmdp->name, end - start) == 0) - return cmdp->func (h, cmd); + if (cmdp->min_shortcut <= end - start && end - start <= strlen (cmdp->name) + && strncmp (start, cmdp->name, end - start) == 0) + return cmdp->func (h, cs); return default_command (h, cmd); } static void -gdb_done (mi_h *h, const char *command) -{ - mi_output *res; - - mi_send (h, "%s\n", command); - res = mi_get_response_blk (h); - gdb_assert (res != NULL && res->next == NULL && res->tclass == MI_CL_DONE - && res->c == NULL); - mi_free_output (res); -} - -static void gdb_set_string (mi_h *h, const char *setting, const char *value) { char *cmd = xstrprintf ("-gdb-set %s %s", setting, value); @@ -357,6 +563,8 @@ start_hook (mi_h *h) { on_exit (h_disconnect, h); mi_set_console_cb (h, console_cb, NULL); + mi_set_time_out_cb (h, time_out_cb, NULL); + // mi_set_to_gdb_cb (h, to_gdb_cb, NULL); // mi_set_from_gdb_cb (h, from_gdb_cb, NULL); } @@ -404,7 +612,19 @@ main (int argc, char **argv) for (;;) { - char *cmd = readline ("(gdb) "); + char *prompt, *cmd; + + prompt = gdb_show_string (h, "prompt"); + cmd = gdb_readline (prompt); + xfree (prompt); + + /* FIXME: -ex commands do not have pagination set. */ + if (!gdb_show_bool (h, "pagination")) + console_cb_rows = 0; + else + rl_get_screen_size (&console_cb_rows, &console_cb_columns); + console_cb_drop = false; + console_cb_row = console_cb_column = 0; if (cmd == NULL) cmd = xstrdup ("quit");