X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-win.c;h=cbeff1f3a2d0d693927edd1f8dc15a82e3da564e;hb=eb4c3f4aaae2ee1b27c210e951260a7e699133b4;hp=a97704db496fd4c9de292a9f5bd4eca9a467f41a;hpb=635c7e8a0521e985921ea3189ab2db5e05fdd41f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index a97704db49..cbeff1f3a2 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1,6 +1,6 @@ /* TUI window generic functions. - Copyright (C) 1998-2014 Free Software Foundation, Inc. + Copyright (C) 1998-2017 Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. @@ -32,8 +32,10 @@ #include "cli/cli-cmds.h" #include "top.h" #include "source.h" +#include "event-loop.h" #include "tui/tui.h" +#include "tui/tui-io.h" #include "tui/tui-data.h" #include "tui/tui-wingeneral.h" #include "tui/tui-stack.h" @@ -45,8 +47,6 @@ #include "tui/tui-win.h" #include "gdb_curses.h" - -#include #include #include "readline/readline.h" @@ -61,17 +61,16 @@ static void make_invisible_and_set_new_height (struct tui_win_info *, static enum tui_status tui_adjust_win_heights (struct tui_win_info *, int); static int new_height_ok (struct tui_win_info *, int); -static void tui_set_tab_width_command (char *, int); -static void tui_refresh_all_command (char *, int); -static void tui_set_win_height_command (char *, int); -static void tui_xdb_set_win_height_command (char *, int); -static void tui_all_windows_info (char *, int); -static void tui_set_focus_command (char *, int); -static void tui_scroll_forward_command (char *, int); -static void tui_scroll_backward_command (char *, int); -static void tui_scroll_left_command (char *, int); -static void tui_scroll_right_command (char *, int); -static void parse_scrolling_args (char *, +static void tui_set_tab_width_command (const char *, int); +static void tui_refresh_all_command (const char *, int); +static void tui_set_win_height_command (const char *, int); +static void tui_all_windows_info (const char *, int); +static void tui_set_focus_command (const char *, int); +static void tui_scroll_forward_command (const char *, int); +static void tui_scroll_backward_command (const char *, int); +static void tui_scroll_left_command (const char *, int); +static void tui_scroll_right_command (const char *, int); +static void parse_scrolling_args (const char *, struct tui_win_info **, int *); @@ -317,19 +316,19 @@ tui_update_variables (void) } static void -set_tui_cmd (char *args, int from_tty) +set_tui_cmd (const char *args, int from_tty) { } static void -show_tui_cmd (char *args, int from_tty) +show_tui_cmd (const char *args, int from_tty) { } static struct cmd_list_element *tuilist; static void -tui_command (char *args, int from_tty) +tui_command (const char *args, int from_tty) { printf_unfiltered (_("\"tui\" must be followed by the name of a " "tui command.\n")); @@ -346,17 +345,104 @@ tui_get_cmd_list (void) return &tuilist; } +/* The set_func hook of "set tui ..." commands that affect the window + borders on the TUI display. */ +void +tui_set_var_cmd (const char *null_args, + int from_tty, struct cmd_list_element *c) +{ + if (tui_update_variables () && tui_active) + tui_rehighlight_all (); +} + +/* Generic window name completion function. Complete window name pointed + to by TEXT and WORD. If INCLUDE_NEXT_PREV_P is true then the special + window names 'next' and 'prev' will also be considered as possible + completions of the window name. */ + +static void +window_name_completer (completion_tracker &tracker, + int include_next_prev_p, + const char *text, const char *word) +{ + VEC (const_char_ptr) *completion_name_vec = NULL; + int win_type; + + for (win_type = SRC_WIN; win_type < MAX_MAJOR_WINDOWS; win_type++) + { + const char *completion_name = NULL; + + /* We can't focus on an invisible window. */ + if (tui_win_list[win_type] == NULL + || !tui_win_list[win_type]->generic.is_visible) + continue; + + completion_name = tui_win_name (&tui_win_list [win_type]->generic); + gdb_assert (completion_name != NULL); + VEC_safe_push (const_char_ptr, completion_name_vec, completion_name); + } + + /* If no windows are considered visible then the TUI has not yet been + initialized. But still "focus src" and "focus cmd" will work because + invoking the focus command will entail initializing the TUI which sets the + default layout to SRC_COMMAND. */ + if (VEC_length (const_char_ptr, completion_name_vec) == 0) + { + VEC_safe_push (const_char_ptr, completion_name_vec, SRC_NAME); + VEC_safe_push (const_char_ptr, completion_name_vec, CMD_NAME); + } + + if (include_next_prev_p) + { + VEC_safe_push (const_char_ptr, completion_name_vec, "next"); + VEC_safe_push (const_char_ptr, completion_name_vec, "prev"); + } + + VEC_safe_push (const_char_ptr, completion_name_vec, NULL); + complete_on_enum (tracker, + VEC_address (const_char_ptr, completion_name_vec), + text, word); + + VEC_free (const_char_ptr, completion_name_vec); +} + +/* Complete possible window names to focus on. TEXT is the complete text + entered so far, WORD is the word currently being completed. */ + +static void +focus_completer (struct cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char *word) +{ + window_name_completer (tracker, 1, text, word); +} + +/* Complete possible window names for winheight command. TEXT is the + complete text entered so far, WORD is the word currently being + completed. */ + +static void +winheight_completer (struct cmd_list_element *ignore, + completion_tracker &tracker, + const char *text, const char *word) +{ + /* The first word is the window name. That we can complete. Subsequent + words can't be completed. */ + if (word != text) + return; + + window_name_completer (tracker, 0, text, word); +} + /* Function to initialize gdb commands, for tui window manipulation. */ -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_tui_win; - void _initialize_tui_win (void) { static struct cmd_list_element *tui_setlist; static struct cmd_list_element *tui_showlist; + struct cmd_list_element *cmd; /* Define the classes of commands. They will appear in the help list in the reverse of this order. */ @@ -371,13 +457,11 @@ _initialize_tui_win (void) add_com ("refresh", class_tui, tui_refresh_all_command, _("Refresh the terminal display.\n")); - if (xdb_commands) - add_com_alias ("U", "refresh", class_tui, 0); add_com ("tabset", class_tui, tui_set_tab_width_command, _("\ Set the width (in characters) of tab stops.\n\ Usage: tabset \n")); - add_com ("winheight", class_tui, tui_set_win_height_command, _("\ -Set the height of a specified window.\n\ + cmd = add_com ("winheight", class_tui, tui_set_win_height_command, _("\ +Set or modify the height of a specified window.\n\ Usage: winheight [+ | -] <#lines>\n\ Window names are:\n\ src : the source window\n\ @@ -385,9 +469,10 @@ cmd : the command window\n\ asm : the disassembly window\n\ regs : the register display\n")); add_com_alias ("wh", "winheight", class_tui, 0); + set_cmd_completer (cmd, winheight_completer); add_info ("win", tui_all_windows_info, _("List of all displayed windows.\n")); - add_com ("focus", class_tui, tui_set_focus_command, _("\ + cmd = add_com ("focus", class_tui, tui_set_focus_command, _("\ Set focus to named window or next/prev window.\n\ Usage: focus { | next | prev}\n\ Valid Window names are:\n\ @@ -396,6 +481,7 @@ asm : the disassembly window\n\ regs : the register display\n\ cmd : the command window\n")); add_com_alias ("fs", "focus", class_tui, 0); + set_cmd_completer (cmd, focus_completer); add_com ("+", class_tui, tui_scroll_forward_command, _("\ Scroll window forward.\n\ Usage: + [win] [n]\n")); @@ -403,15 +489,11 @@ Usage: + [win] [n]\n")); Scroll window backward.\n\ Usage: - [win] [n]\n")); add_com ("<", class_tui, tui_scroll_left_command, _("\ -Scroll window forward.\n\ +Scroll window text to the left.\n\ Usage: < [win] [n]\n")); add_com (">", class_tui, tui_scroll_right_command, _("\ -Scroll window backward.\n\ +Scroll window text to the right.\n\ Usage: > [win] [n]\n")); - if (xdb_commands) - add_com ("w", class_xdb, tui_xdb_set_win_height_command, _("\ -XDB compatibility command for setting the height of a command window.\n\ -Usage: w <#lines>\n")); /* Define the tui control variables. */ add_setshow_enum_cmd ("border-kind", no_class, tui_border_kind_enums, @@ -422,7 +504,7 @@ This variable controls the border of TUI windows:\n\ space use a white space\n\ ascii use ascii characters + - | for the border\n\ acs use the Alternate Character Set"), - NULL, + tui_set_var_cmd, show_tui_border_kind, &tui_setlist, &tui_showlist); @@ -438,7 +520,7 @@ half use half bright\n\ half-standout use half bright and standout mode\n\ bold use extra bright or bold\n\ bold-standout use extra bright or bold with standout mode"), - NULL, + tui_set_var_cmd, show_tui_border_mode, &tui_setlist, &tui_showlist); @@ -454,7 +536,7 @@ half use half bright\n\ half-standout use half bright and standout mode\n\ bold use extra bright or bold\n\ bold-standout use extra bright or bold with standout mode"), - NULL, + tui_set_var_cmd, show_tui_active_border_mode, &tui_setlist, &tui_showlist); } @@ -463,15 +545,20 @@ bold-standout use extra bright or bold with standout mode"), void tui_update_gdb_sizes (void) { - char cmd[50]; - - /* Set to TUI command window dimension or use readline values. */ - xsnprintf (cmd, sizeof (cmd), "set width %d", - tui_active ? TUI_CMD_WIN->generic.width : tui_term_width()); - execute_command (cmd, 0); - xsnprintf (cmd, sizeof (cmd), "set height %d", - tui_active ? TUI_CMD_WIN->generic.height : tui_term_height()); - execute_command (cmd, 0); + int width, height; + + if (tui_active) + { + width = TUI_CMD_WIN->generic.width; + height = TUI_CMD_WIN->generic.height; + } + else + { + width = tui_term_width (); + height = tui_term_height (); + } + + set_screen_width_and_height (width, height); } @@ -619,7 +706,7 @@ tui_scroll (enum tui_scroll_direction direction, void tui_refresh_all_win (void) { - enum tui_win_type type; + int type; clearok (curscr, TRUE); tui_refresh_all (tui_win_list); @@ -648,6 +735,14 @@ tui_refresh_all_win (void) tui_show_locator_content (); } +void +tui_rehighlight_all (void) +{ + int type; + + for (type = SRC_WIN; type < MAX_MAJOR_WINDOWS; type++) + tui_check_and_display_highlight_if_needed (tui_win_list[type]); +} /* Resize all the windows based on the terminal size. This function gets called from within the readline sinwinch handler. */ @@ -667,7 +762,7 @@ tui_resize_all (void) struct tui_win_info *first_win; struct tui_win_info *second_win; struct tui_gen_win_info *locator = tui_locator_win_info_ptr (); - enum tui_win_type win_type; + int win_type; int new_height, split_diff, cmd_split_diff, num_wins_displayed = 2; #ifdef HAVE_RESIZE_TERM @@ -803,7 +898,7 @@ tui_resize_all (void) && !tui_win_list[win_type]->generic.is_visible) { tui_free_window (tui_win_list[win_type]); - tui_win_list[win_type] = (struct tui_win_info *) NULL; + tui_win_list[win_type] = NULL; } } /* Turn keypad back on, unless focus is in the command @@ -814,32 +909,68 @@ tui_resize_all (void) } #ifdef SIGWINCH -/* SIGWINCH signal handler for the tui. This signal handler is always - called, even when the readline package clears signals because it is - set as the old_sigwinch() (TUI only). */ +/* Token for use by TUI's asynchronous SIGWINCH handler. */ +static struct async_signal_handler *tui_sigwinch_token; + +/* TUI's SIGWINCH signal handler. */ static void tui_sigwinch_handler (int signal) { - /* Say that a resize was done so that the readline can do it later - when appropriate. */ + mark_async_signal_handler (tui_sigwinch_token); tui_set_win_resized_to (TRUE); } + +/* Callback for asynchronously resizing TUI following a SIGWINCH signal. */ +static void +tui_async_resize_screen (gdb_client_data arg) +{ + rl_resize_terminal (); + + if (!tui_active) + { + int screen_height, screen_width; + + rl_get_screen_size (&screen_height, &screen_width); + set_screen_width_and_height (screen_width, screen_height); + + /* win_resized is left set so that the next call to tui_enable() + resizes the TUI windows. */ + } + else + { + tui_set_win_resized_to (FALSE); + tui_resize_all (); + tui_refresh_all_win (); + tui_update_gdb_sizes (); + tui_redisplay_readline (); + } +} #endif -/* Initializes SIGWINCH signal handler for the tui. */ +/* Initialize TUI's SIGWINCH signal handler. Note that the handler is not + uninstalled when we exit TUI, so the handler should not assume that TUI is + always active. */ void tui_initialize_win (void) { #ifdef SIGWINCH + tui_sigwinch_token + = create_async_signal_handler (tui_async_resize_screen, NULL); + + { #ifdef HAVE_SIGACTION - struct sigaction old_winch; + struct sigaction old_winch; - memset (&old_winch, 0, sizeof (old_winch)); - old_winch.sa_handler = &tui_sigwinch_handler; - sigaction (SIGWINCH, &old_winch, NULL); + memset (&old_winch, 0, sizeof (old_winch)); + old_winch.sa_handler = &tui_sigwinch_handler; +#ifdef SA_RESTART + old_winch.sa_flags = SA_RESTART; +#endif + sigaction (SIGWINCH, &old_winch, NULL); #else - signal (SIGWINCH, &tui_sigwinch_handler); + signal (SIGWINCH, &tui_sigwinch_handler); #endif + } #endif } @@ -850,7 +981,7 @@ tui_initialize_win (void) static void -tui_scroll_forward_command (char *arg, int from_tty) +tui_scroll_forward_command (const char *arg, int from_tty) { int num_to_scroll = 1; struct tui_win_info *win_to_scroll; @@ -866,7 +997,7 @@ tui_scroll_forward_command (char *arg, int from_tty) static void -tui_scroll_backward_command (char *arg, int from_tty) +tui_scroll_backward_command (const char *arg, int from_tty) { int num_to_scroll = 1; struct tui_win_info *win_to_scroll; @@ -882,7 +1013,7 @@ tui_scroll_backward_command (char *arg, int from_tty) static void -tui_scroll_left_command (char *arg, int from_tty) +tui_scroll_left_command (const char *arg, int from_tty) { int num_to_scroll; struct tui_win_info *win_to_scroll; @@ -895,7 +1026,7 @@ tui_scroll_left_command (char *arg, int from_tty) static void -tui_scroll_right_command (char *arg, int from_tty) +tui_scroll_right_command (const char *arg, int from_tty) { int num_to_scroll; struct tui_win_info *win_to_scroll; @@ -909,20 +1040,20 @@ tui_scroll_right_command (char *arg, int from_tty) /* Set focus to the window named by 'arg'. */ static void -tui_set_focus (char *arg, int from_tty) +tui_set_focus (const char *arg, int from_tty) { if (arg != (char *) NULL) { char *buf_ptr = (char *) xstrdup (arg); int i; - struct tui_win_info *win_info = (struct tui_win_info *) NULL; + struct tui_win_info *win_info = NULL; for (i = 0; (i < strlen (buf_ptr)); i++) - buf_ptr[i] = toupper (arg[i]); + buf_ptr[i] = tolower (arg[i]); - if (subset_compare (buf_ptr, "NEXT")) + if (subset_compare (buf_ptr, "next")) win_info = tui_next_win (tui_win_with_focus ()); - else if (subset_compare (buf_ptr, "PREV")) + else if (subset_compare (buf_ptr, "prev")) win_info = tui_prev_win (tui_win_with_focus ()); else win_info = tui_partial_win_by_name (buf_ptr); @@ -941,15 +1072,14 @@ The window name specified must be valid and visible.\n")); tui_refresh_data_win (); xfree (buf_ptr); printf_filtered (_("Focus set to %s window.\n"), - tui_win_name ((struct tui_gen_win_info *) - tui_win_with_focus ())); + tui_win_name (&tui_win_with_focus ()->generic)); } else warning (_("Incorrect Number of Arguments.\n%s"), FOCUS_USAGE); } static void -tui_set_focus_command (char *arg, int from_tty) +tui_set_focus_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); @@ -958,9 +1088,9 @@ tui_set_focus_command (char *arg, int from_tty) static void -tui_all_windows_info (char *arg, int from_tty) +tui_all_windows_info (const char *arg, int from_tty) { - enum tui_win_type type; + int type; struct tui_win_info *win_with_focus = tui_win_with_focus (); for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); type++) @@ -980,7 +1110,7 @@ tui_all_windows_info (char *arg, int from_tty) static void -tui_refresh_all_command (char *arg, int from_tty) +tui_refresh_all_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); @@ -989,9 +1119,9 @@ tui_refresh_all_command (char *arg, int from_tty) } -/* Set the height of the specified window. */ +/* Set the tab width of the specified window. */ static void -tui_set_tab_width_command (char *arg, int from_tty) +tui_set_tab_width_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); @@ -1001,7 +1131,27 @@ tui_set_tab_width_command (char *arg, int from_tty) ts = atoi (arg); if (ts > 0) - tui_set_default_tab_len (ts); + { + tui_set_default_tab_len (ts); + /* We don't really change the height of any windows, but + calling these 2 functions causes a complete regeneration + and redisplay of the window's contents, which will take + the new tab width into account. */ + if (tui_win_list[SRC_WIN] + && tui_win_list[SRC_WIN]->generic.is_visible) + { + make_invisible_and_set_new_height (TUI_SRC_WIN, + TUI_SRC_WIN->generic.height); + make_visible_with_new_height (TUI_SRC_WIN); + } + if (tui_win_list[DISASSEM_WIN] + && tui_win_list[DISASSEM_WIN]->generic.is_visible) + { + make_invisible_and_set_new_height (TUI_DISASM_WIN, + TUI_DISASM_WIN->generic.height); + make_visible_with_new_height (TUI_DISASM_WIN); + } + } else warning (_("Tab widths greater than 0 must be specified.")); } @@ -1010,15 +1160,16 @@ tui_set_tab_width_command (char *arg, int from_tty) /* Set the height of the specified window. */ static void -tui_set_win_height (char *arg, int from_tty) +tui_set_win_height (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); if (arg != (char *) NULL) { - char *buf = xstrdup (arg); + std::string copy = arg; + char *buf = ©[0]; char *buf_ptr = buf; - char *wname = (char *) NULL; + char *wname = NULL; int new_height, i; struct tui_win_info *win_info; @@ -1030,7 +1181,7 @@ tui_set_win_height (char *arg, int from_tty) /* Validate the window name. */ for (i = 0; i < strlen (wname); i++) - wname[i] = toupper (wname[i]); + wname[i] = tolower (wname[i]); win_info = tui_partial_win_by_name (wname); if (win_info == (struct tui_win_info *) NULL @@ -1083,9 +1234,6 @@ The window name specified must be valid and visible.\n")); } else printf_filtered (WIN_HEIGHT_USAGE); - - if (buf != (char *) NULL) - xfree (buf); } else printf_filtered (WIN_HEIGHT_USAGE); @@ -1093,52 +1241,13 @@ The window name specified must be valid and visible.\n")); /* Set the height of the specified window, with va_list. */ static void -tui_set_win_height_command (char *arg, int from_tty) +tui_set_win_height_command (const char *arg, int from_tty) { /* Make sure the curses mode is enabled. */ tui_enable (); tui_set_win_height (arg, from_tty); } - -/* XDB Compatibility command for setting the window height. This will - increase or decrease the command window by the specified - amount. */ -static void -tui_xdb_set_win_height (char *arg, int from_tty) -{ - /* Make sure the curses mode is enabled. */ - tui_enable (); - if (arg != (char *) NULL) - { - int input_no = atoi (arg); - - if (input_no > 0) - { /* Add 1 for the locator. */ - int new_height = tui_term_height () - (input_no + 1); - - if (!new_height_ok (tui_win_list[CMD_WIN], new_height) - || tui_adjust_win_heights (tui_win_list[CMD_WIN], - new_height) == TUI_FAILURE) - warning (_("Invalid window height specified.\n%s"), - XDBWIN_HEIGHT_USAGE); - } - else - warning (_("Invalid window height specified.\n%s"), - XDBWIN_HEIGHT_USAGE); - } - else - warning (_("Invalid window height specified.\n%s"), XDBWIN_HEIGHT_USAGE); -} - -/* Set the height of the specified window, with va_list. */ -static void -tui_xdb_set_win_height_command (char *arg, int from_tty) -{ - tui_xdb_set_win_height (arg, from_tty); -} - - /* Function to adjust all window heights around the primary. */ static enum tui_status tui_adjust_win_heights (struct tui_win_info *primary_win_info, @@ -1343,7 +1452,7 @@ make_invisible_and_set_new_height (struct tui_win_info *win_info, &((struct tui_win_element *) win_info->generic.content[i])->which_element.data_window; tui_delete_win (gen_win_info->handle); - gen_win_info->handle = (WINDOW *) NULL; + gen_win_info->handle = NULL; } break; default: @@ -1388,7 +1497,7 @@ make_visible_with_new_height (struct tui_win_info *win_info) struct frame_info *frame = deprecated_safe_get_selected_frame (); struct gdbarch *gdbarch = get_frame_arch (frame); - s = find_pc_symtab (get_frame_pc (frame)); + s = find_pc_line_symtab (get_frame_pc (frame)); if (win_info->generic.type == SRC_WIN) { line.loa = LOA_LINE; @@ -1411,8 +1520,6 @@ make_visible_with_new_height (struct tui_win_info *win_info) tui_display_all_data (); break; case CMD_WIN: - win_info->detail.command_info.cur_line = 0; - win_info->detail.command_info.curch = 0; #ifdef HAVE_WRESIZE wresize (TUI_CMD_WIN->generic.handle, TUI_CMD_WIN->generic.height, @@ -1421,9 +1528,7 @@ make_visible_with_new_height (struct tui_win_info *win_info) mvwin (TUI_CMD_WIN->generic.handle, TUI_CMD_WIN->generic.origin.y, TUI_CMD_WIN->generic.origin.x); - wmove (win_info->generic.handle, - win_info->detail.command_info.cur_line, - win_info->detail.command_info.curch); + wmove (win_info->generic.handle, 0, 0); break; default: break; @@ -1542,7 +1647,7 @@ new_height_ok (struct tui_win_info *primary_win_info, static void -parse_scrolling_args (char *arg, +parse_scrolling_args (const char *arg, struct tui_win_info **win_to_scroll, int *num_to_scroll) { @@ -1554,10 +1659,11 @@ parse_scrolling_args (char *arg, window name arg. */ if (arg != (char *) NULL) { - char *buf, *buf_ptr; + char *buf_ptr; /* Process the number of lines to scroll. */ - buf = buf_ptr = xstrdup (arg); + std::string copy = arg; + buf_ptr = ©[0]; if (isdigit (*buf_ptr)) { char *num_str; @@ -1578,8 +1684,7 @@ parse_scrolling_args (char *arg, /* Process the window name if one is specified. */ if (buf_ptr != (char *) NULL) { - char *wname; - int i; + const char *wname; if (*buf_ptr == ' ') while (*(++buf_ptr) == ' ') @@ -1587,11 +1692,11 @@ parse_scrolling_args (char *arg, if (*buf_ptr != (char) 0) { - wname = buf_ptr; - /* Validate the window name. */ - for (i = 0; i < strlen (wname); i++) - wname[i] = toupper (wname[i]); + for (char *p = buf_ptr; *p != '\0'; p++) + *p = tolower (*p); + + wname = buf_ptr; } else wname = "?"; @@ -1605,6 +1710,5 @@ The window name specified must be valid and visible.\n")); else if (*win_to_scroll == TUI_CMD_WIN) *win_to_scroll = (tui_source_windows ())->list[0]; } - xfree (buf); } }