224c3ddb89
Most allocation functions (if not all) return a void* pointing to the allocated memory. In C++, we need to add an explicit cast when assigning the result to a pointer to another type (which is the case more often than not). The content of this patch is taken from Pedro's branch, from commit "(mostly) auto-generated patch to insert casts needed for C++". I validated that the changes make sense and manually reflowed the code to make it respect the coding style. I also found multiple places where I could use XNEW/XNEWVEC/XRESIZEVEC/etc. Thanks a lot to whoever did that automated script to insert casts, doing it completely by hand would have taken a ridiculous amount of time. Only files built on x86 with --enable-targets=all are modified. This means that all other -nat.c files are untouched and will have to be dealt with later by using appropiate compilers. Or maybe we can try to build them with a regular g++ just to know where to add casts, I don't know. I built-tested this with --enable-targets=all and reg-tested. Here's the changelog entry, which was not too bad to make despite the size, thanks to David Malcom's script. I fixed some bits by hand, but there might be some wrong parts left (hopefully not). gdb/ChangeLog: * aarch64-linux-tdep.c (aarch64_stap_parse_special_token): Add cast to allocation result assignment. * ada-exp.y (write_object_renaming): Likewise. (write_ambiguous_var): Likewise. (ada_nget_field_index): Likewise. (write_var_or_type): Likewise. * ada-lang.c (ada_decode_symbol): Likewise. (ada_value_assign): Likewise. (value_pointer): Likewise. (cache_symbol): Likewise. (add_nonlocal_symbols): Likewise. (ada_name_for_lookup): Likewise. (symbol_completion_add): Likewise. (ada_to_fixed_type_1): Likewise. (ada_get_next_arg): Likewise. (defns_collected): Likewise. * ada-lex.l (processId): Likewise. (processString): Likewise. * ada-tasks.c (read_known_tasks_array): Likewise. (read_known_tasks_list): Likewise. * ada-typeprint.c (decoded_type_name): Likewise. * addrmap.c (addrmap_mutable_create_fixed): Likewise. * amd64-tdep.c (amd64_push_arguments): Likewise. (amd64_displaced_step_copy_insn): Likewise. (amd64_classify_insn_at): Likewise. (amd64_relocate_instruction): Likewise. * amd64obsd-tdep.c (amd64obsd_sigtramp_p): Likewise. * arch-utils.c (simple_displaced_step_copy_insn): Likewise. (initialize_current_architecture): Likewise. * arm-linux-tdep.c (arm_stap_parse_special_token): Likewise. * arm-symbian-tdep.c (arm_symbian_osabi_sniffer): Likewise. * arm-tdep.c (arm_exidx_new_objfile): Likewise. (arm_push_dummy_call): Likewise. (extend_buffer_earlier): Likewise. (arm_adjust_breakpoint_address): Likewise. (arm_skip_stub): Likewise. * auto-load.c (filename_is_in_pattern): Likewise. (maybe_add_script_file): Likewise. (maybe_add_script_text): Likewise. (auto_load_objfile_script_1): Likewise. * auxv.c (ld_so_xfer_auxv): Likewise. * ax-general.c (new_agent_expr): Likewise. (grow_expr): Likewise. (ax_reg_mask): Likewise. * bcache.c (bcache_full): Likewise. * breakpoint.c (program_breakpoint_here_p): Likewise. * btrace.c (parse_xml_raw): Likewise. * build-id.c (build_id_to_debug_bfd): Likewise. * buildsym.c (end_symtab_with_blockvector): Likewise. * c-exp.y (string_exp): Likewise. (qualified_name): Likewise. (write_destructor_name): Likewise. (operator_stoken): Likewise. (parse_number): Likewise. (scan_macro_expansion): Likewise. (yylex): Likewise. (c_print_token): Likewise. * c-lang.c (c_get_string): Likewise. (emit_numeric_character): Likewise. * charset.c (wchar_iterate): Likewise. * cli/cli-cmds.c (complete_command): Likewise. (make_command): Likewise. * cli/cli-dump.c (restore_section_callback): Likewise. (restore_binary_file): Likewise. * cli/cli-interp.c (cli_interpreter_exec): Likewise. * cli/cli-script.c (execute_control_command): Likewise. * cli/cli-setshow.c (do_set_command): Likewise. * coff-pe-read.c (add_pe_forwarded_sym): Likewise. (read_pe_exported_syms): Likewise. * coffread.c (coff_read_struct_type): Likewise. (coff_read_enum_type): Likewise. * common/btrace-common.c (btrace_data_append): Likewise. * common/buffer.c (buffer_grow): Likewise. * common/filestuff.c (gdb_fopen_cloexec): Likewise. * common/format.c (parse_format_string): Likewise. * common/gdb_vecs.c (delim_string_to_char_ptr_vec_append): Likewise. * common/xml-utils.c (xml_escape_text): Likewise. * compile/compile-object-load.c (copy_sections): Likewise. (compile_object_load): Likewise. * compile/compile-object-run.c (compile_object_run): Likewise. * completer.c (filename_completer): Likewise. * corefile.c (read_memory_typed_address): Likewise. (write_memory_unsigned_integer): Likewise. (write_memory_signed_integer): Likewise. (complete_set_gnutarget): Likewise. * corelow.c (get_core_register_section): Likewise. * cp-name-parser.y (d_grab): Likewise. (allocate_info): Likewise. (cp_new_demangle_parse_info): Likewise. * cp-namespace.c (cp_scan_for_anonymous_namespaces): Likewise. (cp_lookup_symbol_in_namespace): Likewise. (lookup_namespace_scope): Likewise. (find_symbol_in_baseclass): Likewise. (cp_lookup_nested_symbol): Likewise. (cp_lookup_transparent_type_loop): Likewise. * cp-support.c (copy_string_to_obstack): Likewise. (make_symbol_overload_list): Likewise. (make_symbol_overload_list_namespace): Likewise. (make_symbol_overload_list_adl_namespace): Likewise. (first_component_command): Likewise. * cp-valprint.c (cp_print_value): Likewise. * ctf.c (ctf_xfer_partial): Likewise. * d-exp.y (StringExp): Likewise. * d-namespace.c (d_lookup_symbol_in_module): Likewise. (lookup_module_scope): Likewise. (find_symbol_in_baseclass): Likewise. (d_lookup_nested_symbol): Likewise. * dbxread.c (find_stab_function_addr): Likewise. (read_dbx_symtab): Likewise. (dbx_end_psymtab): Likewise. (cp_set_block_scope): Likewise. * dcache.c (dcache_alloc): Likewise. * demangle.c (_initialize_demangler): Likewise. * dicos-tdep.c (dicos_load_module_p): Likewise. * dictionary.c (dict_create_hashed_expandable): Likewise. (dict_create_linear_expandable): Likewise. (expand_hashtable): Likewise. (add_symbol_linear_expandable): Likewise. * dwarf2-frame.c (add_cie): Likewise. (add_fde): Likewise. (dwarf2_build_frame_info): Likewise. * dwarf2expr.c (dwarf_expr_grow_stack): Likewise. (dwarf_expr_fetch_address): Likewise. (add_piece): Likewise. (execute_stack_op): Likewise. * dwarf2loc.c (chain_candidate): Likewise. (dwarf_entry_parameter_to_value): Likewise. (read_pieced_value): Likewise. (write_pieced_value): Likewise. * dwarf2read.c (dwarf2_read_section): Likewise. (add_type_unit): Likewise. (read_comp_units_from_section): Likewise. (fixup_go_packaging): Likewise. (dwarf2_compute_name): Likewise. (dwarf2_physname): Likewise. (create_dwo_unit_in_dwp_v1): Likewise. (create_dwo_unit_in_dwp_v2): Likewise. (read_func_scope): Likewise. (read_call_site_scope): Likewise. (dwarf2_attach_fields_to_type): Likewise. (process_structure_scope): Likewise. (mark_common_block_symbol_computed): Likewise. (read_common_block): Likewise. (abbrev_table_read_table): Likewise. (guess_partial_die_structure_name): Likewise. (fixup_partial_die): Likewise. (add_file_name): Likewise. (dwarf2_const_value_data): Likewise. (dwarf2_const_value_attr): Likewise. (build_error_marker_type): Likewise. (guess_full_die_structure_name): Likewise. (anonymous_struct_prefix): Likewise. (typename_concat): Likewise. (dwarf2_canonicalize_name): Likewise. (dwarf2_name): Likewise. (write_constant_as_bytes): Likewise. (dwarf2_fetch_constant_bytes): Likewise. (copy_string): Likewise. (parse_macro_definition): Likewise. * elfread.c (elf_symfile_segments): Likewise. (elf_rel_plt_read): Likewise. (elf_gnu_ifunc_resolve_by_cache): Likewise. (elf_gnu_ifunc_resolve_by_got): Likewise. (elf_read_minimal_symbols): Likewise. (elf_gnu_ifunc_record_cache): Likewise. * event-top.c (top_level_prompt): Likewise. (command_line_handler): Likewise. * exec.c (resize_section_table): Likewise. * expprint.c (print_subexp_standard): Likewise. * fbsd-tdep.c (fbsd_collect_regset_section_cb): Likewise. * findcmd.c (parse_find_args): Likewise. * findvar.c (address_from_register): Likewise. * frame.c (get_prev_frame_always): Likewise. * gdb_bfd.c (gdb_bfd_ref): Likewise. (get_section_descriptor): Likewise. * gdb_obstack.c (obconcat): Likewise. (obstack_strdup): Likewise. * gdbtypes.c (lookup_function_type_with_arguments): Likewise. (create_set_type): Likewise. (lookup_unsigned_typename): Likewise. (lookup_signed_typename): Likewise. (resolve_dynamic_union): Likewise. (resolve_dynamic_struct): Likewise. (add_dyn_prop): Likewise. (copy_dynamic_prop_list): Likewise. (arch_flags_type): Likewise. (append_composite_type_field_raw): Likewise. * gdbtypes.h (INIT_FUNC_SPECIFIC): Likewise. * gnu-v3-abi.c (gnuv3_rtti_type): Likewise. * go-exp.y (string_exp): Likewise. * go-lang.c (go_demangle): Likewise. * guile/guile.c (compute_scheme_string): Likewise. * guile/scm-cmd.c (gdbscm_parse_command_name): Likewise. (gdbscm_canonicalize_command_name): Likewise. * guile/scm-ports.c (ioscm_init_stdio_buffers): Likewise. (ioscm_init_memory_port): Likewise. (ioscm_reinit_memory_port): Likewise. * guile/scm-utils.c (gdbscm_gc_xstrdup): Likewise. (gdbscm_gc_dup_argv): Likewise. * h8300-tdep.c (h8300_push_dummy_call): Likewise. * hppa-tdep.c (internalize_unwinds): Likewise. (read_unwind_info): Likewise. * i386-cygwin-tdep.c (core_process_module_section): Likewise. (windows_core_xfer_shared_libraries): Likewise. * i386-tdep.c (i386_displaced_step_copy_insn): Likewise. (i386_stap_parse_special_token_triplet): Likewise. (i386_stap_parse_special_token_three_arg_disp): Likewise. * i386obsd-tdep.c (i386obsd_sigtramp_p): Likewise. * inf-child.c (inf_child_fileio_readlink): Likewise. * inf-ptrace.c (inf_ptrace_fetch_register): Likewise. (inf_ptrace_store_register): Likewise. * infrun.c (follow_exec): Likewise. (displaced_step_prepare_throw): Likewise. (save_stop_context): Likewise. (save_infcall_suspend_state): Likewise. * jit.c (jit_read_descriptor): Likewise. (jit_read_code_entry): Likewise. (jit_symtab_line_mapping_add_impl): Likewise. (finalize_symtab): Likewise. (jit_unwind_reg_get_impl): Likewise. * jv-exp.y (QualifiedName): Likewise. * jv-lang.c (get_java_utf8_name): Likewise. (type_from_class): Likewise. (java_demangle_type_signature): Likewise. (java_class_name_from_physname): Likewise. * jv-typeprint.c (java_type_print_base): Likewise. * jv-valprint.c (java_value_print): Likewise. * language.c (add_language): Likewise. * linespec.c (add_sal_to_sals_basic): Likewise. (add_sal_to_sals): Likewise. (decode_objc): Likewise. (find_linespec_symbols): Likewise. * linux-fork.c (fork_save_infrun_state): Likewise. * linux-nat.c (linux_nat_detach): Likewise. (linux_nat_fileio_readlink): Likewise. * linux-record.c (record_linux_sockaddr): Likewise. (record_linux_msghdr): Likewise. (Do): Likewise. * linux-tdep.c (linux_core_info_proc_mappings): Likewise. (linux_collect_regset_section_cb): Likewise. (linux_get_siginfo_data): Likewise. * linux-thread-db.c (try_thread_db_load_from_pdir_1): Likewise. (try_thread_db_load_from_dir): Likewise. (thread_db_load_search): Likewise. (info_auto_load_libthread_db): Likewise. * m32c-tdep.c (m32c_m16c_address_to_pointer): Likewise. (m32c_m16c_pointer_to_address): Likewise. * m68hc11-tdep.c (m68hc11_pseudo_register_write): Likewise. * m68k-tdep.c (m68k_get_longjmp_target): Likewise. * machoread.c (macho_check_dsym): Likewise. * macroexp.c (resize_buffer): Likewise. (gather_arguments): Likewise. (maybe_expand): Likewise. * macrotab.c (new_macro_key): Likewise. (new_source_file): Likewise. (new_macro_definition): Likewise. * mdebugread.c (parse_symbol): Likewise. (parse_type): Likewise. (parse_partial_symbols): Likewise. (psymtab_to_symtab_1): Likewise. * mem-break.c (default_memory_insert_breakpoint): Likewise. * mi/mi-cmd-break.c (mi_argv_to_format): Likewise. * mi/mi-main.c (mi_cmd_data_read_memory): Likewise. (mi_cmd_data_read_memory_bytes): Likewise. (mi_cmd_data_write_memory_bytes): Likewise. (mi_cmd_trace_frame_collected): Likewise. * mi/mi-parse.c (mi_parse_argv): Likewise. (mi_parse): Likewise. * minidebug.c (lzma_open): Likewise. (lzma_pread): Likewise. * mips-tdep.c (mips_read_fp_register_single): Likewise. (mips_print_fp_register): Likewise. * mipsnbsd-tdep.c (mipsnbsd_get_longjmp_target): Likewise. * mipsread.c (read_alphacoff_dynamic_symtab): Likewise. * mt-tdep.c (mt_register_name): Likewise. (mt_registers_info): Likewise. (mt_push_dummy_call): Likewise. * namespace.c (add_using_directive): Likewise. * nat/linux-btrace.c (perf_event_read): Likewise. (linux_enable_bts): Likewise. * nat/linux-osdata.c (linux_common_core_of_thread): Likewise. * nat/linux-ptrace.c (linux_ptrace_test_ret_to_nx): Likewise. * nto-tdep.c (nto_find_and_open_solib): Likewise. (nto_parse_redirection): Likewise. * objc-lang.c (objc_demangle): Likewise. (find_methods): Likewise. * objfiles.c (get_objfile_bfd_data): Likewise. (set_objfile_main_name): Likewise. (allocate_objfile): Likewise. (objfile_relocate): Likewise. (update_section_map): Likewise. * osabi.c (generic_elf_osabi_sniff_abi_tag_sections): Likewise. * p-exp.y (exp): Likewise. (yylex): Likewise. * p-valprint.c (pascal_object_print_value): Likewise. * parse.c (initialize_expout): Likewise. (mark_completion_tag): Likewise. (copy_name): Likewise. (parse_float): Likewise. (type_stack_reserve): Likewise. * ppc-linux-tdep.c (ppc_stap_parse_special_token): Likewise. (ppu2spu_prev_register): Likewise. * ppc-ravenscar-thread.c (supply_register_at_address): Likewise. * printcmd.c (printf_wide_c_string): Likewise. (printf_pointer): Likewise. * probe.c (parse_probes): Likewise. * python/py-cmd.c (gdbpy_parse_command_name): Likewise. (cmdpy_init): Likewise. * python/py-gdb-readline.c (gdbpy_readline_wrapper): Likewise. * python/py-symtab.c (set_sal): Likewise. * python/py-unwind.c (pyuw_sniffer): Likewise. * python/python.c (python_interactive_command): Likewise. (compute_python_string): Likewise. * ravenscar-thread.c (get_running_thread_id): Likewise. * record-full.c (record_full_exec_insn): Likewise. (record_full_core_open_1): Likewise. * regcache.c (regcache_raw_read_signed): Likewise. (regcache_raw_read_unsigned): Likewise. (regcache_cooked_read_signed): Likewise. (regcache_cooked_read_unsigned): Likewise. * remote-fileio.c (remote_fileio_func_open): Likewise. (remote_fileio_func_rename): Likewise. (remote_fileio_func_unlink): Likewise. (remote_fileio_func_stat): Likewise. (remote_fileio_func_system): Likewise. * remote-mips.c (mips_xfer_memory): Likewise. (mips_load_srec): Likewise. (pmon_end_download): Likewise. * remote.c (new_remote_state): Likewise. (map_regcache_remote_table): Likewise. (remote_register_number_and_offset): Likewise. (init_remote_state): Likewise. (get_memory_packet_size): Likewise. (remote_pass_signals): Likewise. (remote_program_signals): Likewise. (remote_start_remote): Likewise. (remote_check_symbols): Likewise. (remote_query_supported): Likewise. (extended_remote_attach): Likewise. (process_g_packet): Likewise. (store_registers_using_G): Likewise. (putpkt_binary): Likewise. (read_frame): Likewise. (compare_sections_command): Likewise. (remote_hostio_pread): Likewise. (remote_hostio_readlink): Likewise. (remote_file_put): Likewise. (remote_file_get): Likewise. (remote_pid_to_exec_file): Likewise. (_initialize_remote): Likewise. * rs6000-aix-tdep.c (rs6000_aix_ld_info_to_xml): Likewise. (rs6000_aix_core_xfer_shared_libraries_aix): Likewise. * rs6000-tdep.c (ppc_displaced_step_copy_insn): Likewise. (bfd_uses_spe_extensions): Likewise. * s390-linux-tdep.c (s390_displaced_step_copy_insn): Likewise. * score-tdep.c (score7_malloc_and_get_memblock): Likewise. * solib-dsbt.c (decode_loadmap): Likewise. (fetch_loadmap): Likewise. (scan_dyntag): Likewise. (enable_break): Likewise. (dsbt_relocate_main_executable): Likewise. * solib-frv.c (fetch_loadmap): Likewise. (enable_break2): Likewise. (frv_relocate_main_executable): Likewise. * solib-spu.c (spu_relocate_main_executable): Likewise. (spu_bfd_open): Likewise. * solib-svr4.c (lm_info_read): Likewise. (read_program_header): Likewise. (find_program_interpreter): Likewise. (scan_dyntag): Likewise. (elf_locate_base): Likewise. (open_symbol_file_object): Likewise. (read_program_headers_from_bfd): Likewise. (svr4_relocate_main_executable): Likewise. * solib-target.c (solib_target_relocate_section_addresses): Likewise. * solib.c (solib_find_1): Likewise. (exec_file_find): Likewise. (solib_find): Likewise. * source.c (openp): Likewise. (print_source_lines_base): Likewise. (forward_search_command): Likewise. * sparc-ravenscar-thread.c (supply_register_at_address): Likewise. * spu-tdep.c (spu2ppu_prev_register): Likewise. (spu_get_overlay_table): Likewise. * stabsread.c (patch_block_stabs): Likewise. (define_symbol): Likewise. (again:): Likewise. (read_member_functions): Likewise. (read_one_struct_field): Likewise. (read_enum_type): Likewise. (common_block_start): Likewise. * stack.c (read_frame_arg): Likewise. (backtrace_command): Likewise. * stap-probe.c (stap_parse_register_operand): Likewise. * symfile.c (syms_from_objfile_1): Likewise. (find_separate_debug_file): Likewise. (load_command): Likewise. (load_progress): Likewise. (load_section_callback): Likewise. (reread_symbols): Likewise. (add_filename_language): Likewise. (allocate_compunit_symtab): Likewise. (read_target_long_array): Likewise. (simple_read_overlay_table): Likewise. * symtab.c (symbol_set_names): Likewise. (resize_symbol_cache): Likewise. (rbreak_command): Likewise. (completion_list_add_name): Likewise. (completion_list_objc_symbol): Likewise. (add_filename_to_list): Likewise. * target-descriptions.c (maint_print_c_tdesc_cmd): Likewise. * target-memory.c (target_write_memory_blocks): Likewise. * target.c (target_read_string): Likewise. (read_whatever_is_readable): Likewise. (target_read_alloc_1): Likewise. (simple_search_memory): Likewise. (target_fileio_read_alloc_1): Likewise. * tilegx-tdep.c (tilegx_push_dummy_call): Likewise. * top.c (command_line_input): Likewise. * tracefile-tfile.c (tfile_fetch_registers): Likewise. * tracefile.c (tracefile_fetch_registers): Likewise. * tracepoint.c (add_memrange): Likewise. (init_collection_list): Likewise. (add_aexpr): Likewise. (trace_dump_actions): Likewise. (parse_trace_status): Likewise. (parse_tracepoint_definition): Likewise. (parse_tsv_definition): Likewise. (parse_static_tracepoint_marker_definition): Likewise. * tui/tui-file.c (tui_sfileopen): Likewise. (tui_file_adjust_strbuf): Likewise. * tui/tui-io.c (tui_expand_tabs): Likewise. * tui/tui-source.c (tui_set_source_content): Likewise. * typeprint.c (find_global_typedef): Likewise. * ui-file.c (do_ui_file_xstrdup): Likewise. (ui_file_obsavestring): Likewise. (mem_file_write): Likewise. * utils.c (make_hex_string): Likewise. (get_regcomp_error): Likewise. (puts_filtered_tabular): Likewise. (gdb_realpath_keepfile): Likewise. (ldirname): Likewise. (gdb_bfd_errmsg): Likewise. (substitute_path_component): Likewise. * valops.c (search_struct_method): Likewise. (find_oload_champ_namespace_loop): Likewise. * valprint.c (print_decimal_chars): Likewise. (read_string): Likewise. (generic_emit_char): Likewise. * varobj.c (varobj_delete): Likewise. (varobj_value_get_print_value): Likewise. * vaxobsd-tdep.c (vaxobsd_sigtramp_sniffer): Likewise. * windows-tdep.c (display_one_tib): Likewise. * xcoffread.c (read_xcoff_symtab): Likewise. (process_xcoff_symbol): Likewise. (swap_sym): Likewise. (scan_xcoff_symtab): Likewise. (xcoff_initial_scan): Likewise. * xml-support.c (gdb_xml_end_element): Likewise. (xml_process_xincludes): Likewise. (xml_fetch_content_from_file): Likewise. * xml-syscall.c (xml_list_of_syscalls): Likewise. * xstormy16-tdep.c (xstormy16_push_dummy_call): Likewise. gdb/gdbserver/ChangeLog: * ax.c (gdb_parse_agent_expr): Add cast to allocation result assignment. (gdb_unparse_agent_expr): Likewise. * hostio.c (require_data): Likewise. (handle_pread): Likewise. * linux-low.c (disable_regset): Likewise. (fetch_register): Likewise. (store_register): Likewise. (get_dynamic): Likewise. (linux_qxfer_libraries_svr4): Likewise. * mem-break.c (delete_fast_tracepoint_jump): Likewise. (set_fast_tracepoint_jump): Likewise. (uninsert_fast_tracepoint_jumps_at): Likewise. (reinsert_fast_tracepoint_jumps_at): Likewise. (validate_inserted_breakpoint): Likewise. (clone_agent_expr): Likewise. * regcache.c (init_register_cache): Likewise. * remote-utils.c (putpkt_binary_1): Likewise. (decode_M_packet): Likewise. (decode_X_packet): Likewise. (look_up_one_symbol): Likewise. (relocate_instruction): Likewise. (monitor_output): Likewise. * server.c (handle_search_memory): Likewise. (handle_qxfer_exec_file): Likewise. (handle_qxfer_libraries): Likewise. (handle_qxfer): Likewise. (handle_query): Likewise. (handle_v_cont): Likewise. (handle_v_run): Likewise. (captured_main): Likewise. * target.c (write_inferior_memory): Likewise. * thread-db.c (try_thread_db_load_from_dir): Likewise. * tracepoint.c (init_trace_buffer): Likewise. (add_tracepoint_action): Likewise. (add_traceframe): Likewise. (add_traceframe_block): Likewise. (cmd_qtdpsrc): Likewise. (cmd_qtdv): Likewise. (cmd_qtstatus): Likewise. (response_source): Likewise. (response_tsv): Likewise. (cmd_qtnotes): Likewise. (gdb_collect): Likewise. (initialize_tracepoint): Likewise.
700 lines
19 KiB
C
700 lines
19 KiB
C
/* TUI support I/O functions.
|
|
|
|
Copyright (C) 1998-2015 Free Software Foundation, Inc.
|
|
|
|
Contributed by Hewlett-Packard Company.
|
|
|
|
This file is part of GDB.
|
|
|
|
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
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "target.h"
|
|
#include "event-loop.h"
|
|
#include "event-top.h"
|
|
#include "command.h"
|
|
#include "top.h"
|
|
#include "tui/tui.h"
|
|
#include "tui/tui-data.h"
|
|
#include "tui/tui-io.h"
|
|
#include "tui/tui-command.h"
|
|
#include "tui/tui-win.h"
|
|
#include "tui/tui-wingeneral.h"
|
|
#include "tui/tui-file.h"
|
|
#include "ui-out.h"
|
|
#include "cli-out.h"
|
|
#include <fcntl.h>
|
|
#include <signal.h>
|
|
#include "filestuff.h"
|
|
#include "completer.h"
|
|
#include "gdb_curses.h"
|
|
|
|
/* This redefines CTRL if it is not already defined, so it must come
|
|
after terminal state releated include files like <term.h> and
|
|
"gdb_curses.h". */
|
|
#include "readline/readline.h"
|
|
|
|
int
|
|
key_is_start_sequence (int ch)
|
|
{
|
|
return (ch == 27);
|
|
}
|
|
|
|
int
|
|
key_is_end_sequence (int ch)
|
|
{
|
|
return (ch == 126);
|
|
}
|
|
|
|
int
|
|
key_is_backspace (int ch)
|
|
{
|
|
return (ch == 8);
|
|
}
|
|
|
|
/* Use definition from readline 4.3. */
|
|
#undef CTRL_CHAR
|
|
#define CTRL_CHAR(c) \
|
|
((c) < control_character_threshold && (((c) & 0x80) == 0))
|
|
|
|
/* This file controls the IO interactions between gdb and curses.
|
|
When the TUI is enabled, gdb has two modes a curses and a standard
|
|
mode.
|
|
|
|
In curses mode, the gdb outputs are made in a curses command
|
|
window. For this, the gdb_stdout and gdb_stderr are redirected to
|
|
the specific ui_file implemented by TUI. The output is handled by
|
|
tui_puts(). The input is also controlled by curses with
|
|
tui_getc(). The readline library uses this function to get its
|
|
input. Several readline hooks are installed to redirect readline
|
|
output to the TUI (see also the note below).
|
|
|
|
In normal mode, the gdb outputs are restored to their origin, that
|
|
is as if TUI is not used. Readline also uses its original getc()
|
|
function with stdin.
|
|
|
|
Note SCz/2001-07-21: the current readline is not clean in its
|
|
management of the output. Even if we install a redisplay handler,
|
|
it sometimes writes on a stdout file. It is important to redirect
|
|
every output produced by readline, otherwise the curses window will
|
|
be garbled. This is implemented with a pipe that TUI reads and
|
|
readline writes to. A gdb input handler is created so that reading
|
|
the pipe is handled automatically. This will probably not work on
|
|
non-Unix platforms. The best fix is to make readline clean enougth
|
|
so that is never write on stdout.
|
|
|
|
Note SCz/2002-09-01: we now use more readline hooks and it seems
|
|
that with them we don't need the pipe anymore (verified by creating
|
|
the pipe and closing its end so that write causes a SIGPIPE). The
|
|
old pipe code is still there and can be conditionally removed by
|
|
#undef TUI_USE_PIPE_FOR_READLINE. */
|
|
|
|
/* For gdb 5.3, prefer to continue the pipe hack as a backup wheel. */
|
|
#ifdef HAVE_PIPE
|
|
#define TUI_USE_PIPE_FOR_READLINE
|
|
#endif
|
|
/* #undef TUI_USE_PIPE_FOR_READLINE */
|
|
|
|
/* TUI output files. */
|
|
static struct ui_file *tui_stdout;
|
|
static struct ui_file *tui_stderr;
|
|
struct ui_out *tui_out;
|
|
|
|
/* GDB output files in non-curses mode. */
|
|
static struct ui_file *tui_old_stdout;
|
|
static struct ui_file *tui_old_stderr;
|
|
struct ui_out *tui_old_uiout;
|
|
|
|
/* Readline previous hooks. */
|
|
static rl_getc_func_t *tui_old_rl_getc_function;
|
|
static rl_voidfunc_t *tui_old_rl_redisplay_function;
|
|
static rl_vintfunc_t *tui_old_rl_prep_terminal;
|
|
static rl_voidfunc_t *tui_old_rl_deprep_terminal;
|
|
static rl_compdisp_func_t *tui_old_rl_display_matches_hook;
|
|
static int tui_old_rl_echoing_p;
|
|
|
|
/* Readline output stream.
|
|
Should be removed when readline is clean. */
|
|
static FILE *tui_rl_outstream;
|
|
static FILE *tui_old_rl_outstream;
|
|
#ifdef TUI_USE_PIPE_FOR_READLINE
|
|
static int tui_readline_pipe[2];
|
|
#endif
|
|
|
|
/* The last gdb prompt that was registered in readline.
|
|
This may be the main gdb prompt or a secondary prompt. */
|
|
static char *tui_rl_saved_prompt;
|
|
|
|
static void
|
|
tui_putc (char c)
|
|
{
|
|
char buf[2];
|
|
|
|
buf[0] = c;
|
|
buf[1] = 0;
|
|
tui_puts (buf);
|
|
}
|
|
|
|
/* Print the string in the curses command window.
|
|
The output is buffered. It is up to the caller to refresh the screen
|
|
if necessary. */
|
|
|
|
void
|
|
tui_puts (const char *string)
|
|
{
|
|
static int tui_skip_line = -1;
|
|
char c;
|
|
WINDOW *w;
|
|
|
|
w = TUI_CMD_WIN->generic.handle;
|
|
while ((c = *string++) != 0)
|
|
{
|
|
/* Catch annotation and discard them. We need two \032 and
|
|
discard until a \n is seen. */
|
|
if (c == '\032')
|
|
{
|
|
tui_skip_line++;
|
|
}
|
|
else if (tui_skip_line != 1)
|
|
{
|
|
tui_skip_line = -1;
|
|
/* Expand TABs, since ncurses on MS-Windows doesn't. */
|
|
if (c == '\t')
|
|
{
|
|
int line, col;
|
|
|
|
getyx (w, line, col);
|
|
do
|
|
{
|
|
waddch (w, ' ');
|
|
col++;
|
|
} while ((col % 8) != 0);
|
|
}
|
|
else
|
|
waddch (w, c);
|
|
}
|
|
else if (c == '\n')
|
|
tui_skip_line = -1;
|
|
}
|
|
TUI_CMD_WIN->detail.command_info.start_line = getcury (w);
|
|
}
|
|
|
|
/* Readline callback.
|
|
Redisplay the command line with its prompt after readline has
|
|
changed the edited text. */
|
|
void
|
|
tui_redisplay_readline (void)
|
|
{
|
|
int prev_col;
|
|
int height;
|
|
int col, line;
|
|
int c_pos;
|
|
int c_line;
|
|
int in;
|
|
WINDOW *w;
|
|
char *prompt;
|
|
int start_line;
|
|
|
|
/* Detect when we temporarily left SingleKey and now the readline
|
|
edit buffer is empty, automatically restore the SingleKey
|
|
mode. The restore must only be done if the command has finished.
|
|
The command could call prompt_for_continue and we must not
|
|
restore SingleKey so that the prompt and normal keymap are used. */
|
|
if (tui_current_key_mode == TUI_ONE_COMMAND_MODE && rl_end == 0
|
|
&& immediate_quit == 0)
|
|
tui_set_key_mode (TUI_SINGLE_KEY_MODE);
|
|
|
|
if (tui_current_key_mode == TUI_SINGLE_KEY_MODE)
|
|
prompt = "";
|
|
else
|
|
prompt = tui_rl_saved_prompt;
|
|
|
|
c_pos = -1;
|
|
c_line = -1;
|
|
w = TUI_CMD_WIN->generic.handle;
|
|
start_line = TUI_CMD_WIN->detail.command_info.start_line;
|
|
wmove (w, start_line, 0);
|
|
prev_col = 0;
|
|
height = 1;
|
|
for (in = 0; prompt && prompt[in]; in++)
|
|
{
|
|
waddch (w, prompt[in]);
|
|
getyx (w, line, col);
|
|
if (col <= prev_col)
|
|
height++;
|
|
prev_col = col;
|
|
}
|
|
for (in = 0; in <= rl_end; in++)
|
|
{
|
|
unsigned char c;
|
|
|
|
if (in == rl_point)
|
|
{
|
|
getyx (w, c_line, c_pos);
|
|
}
|
|
|
|
if (in == rl_end)
|
|
break;
|
|
|
|
c = (unsigned char) rl_line_buffer[in];
|
|
if (CTRL_CHAR (c) || c == RUBOUT)
|
|
{
|
|
waddch (w, '^');
|
|
waddch (w, CTRL_CHAR (c) ? UNCTRL (c) : '?');
|
|
}
|
|
else if (c == '\t')
|
|
{
|
|
/* Expand TABs, since ncurses on MS-Windows doesn't. */
|
|
getyx (w, line, col);
|
|
do
|
|
{
|
|
waddch (w, ' ');
|
|
col++;
|
|
} while ((col % 8) != 0);
|
|
}
|
|
else
|
|
{
|
|
waddch (w, c);
|
|
}
|
|
if (c == '\n')
|
|
TUI_CMD_WIN->detail.command_info.start_line = getcury (w);
|
|
getyx (w, line, col);
|
|
if (col < prev_col)
|
|
height++;
|
|
prev_col = col;
|
|
}
|
|
wclrtobot (w);
|
|
TUI_CMD_WIN->detail.command_info.start_line = getcury (w);
|
|
if (c_line >= 0)
|
|
wmove (w, c_line, c_pos);
|
|
TUI_CMD_WIN->detail.command_info.start_line -= height - 1;
|
|
|
|
wrefresh (w);
|
|
fflush(stdout);
|
|
}
|
|
|
|
/* Readline callback to prepare the terminal. It is called once each
|
|
time we enter readline. Terminal is already setup in curses
|
|
mode. */
|
|
static void
|
|
tui_prep_terminal (int notused1)
|
|
{
|
|
/* Save the prompt registered in readline to correctly display it.
|
|
(we can't use gdb_prompt() due to secondary prompts and can't use
|
|
rl_prompt because it points to an alloca buffer). */
|
|
xfree (tui_rl_saved_prompt);
|
|
tui_rl_saved_prompt = rl_prompt != NULL ? xstrdup (rl_prompt) : NULL;
|
|
}
|
|
|
|
/* Readline callback to restore the terminal. It is called once each
|
|
time we leave readline. There is nothing to do in curses mode. */
|
|
static void
|
|
tui_deprep_terminal (void)
|
|
{
|
|
}
|
|
|
|
#ifdef TUI_USE_PIPE_FOR_READLINE
|
|
/* Read readline output pipe and feed the command window with it.
|
|
Should be removed when readline is clean. */
|
|
static void
|
|
tui_readline_output (int error, gdb_client_data data)
|
|
{
|
|
int size;
|
|
char buf[256];
|
|
|
|
size = read (tui_readline_pipe[0], buf, sizeof (buf) - 1);
|
|
if (size > 0 && tui_active)
|
|
{
|
|
buf[size] = 0;
|
|
tui_puts (buf);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
/* TUI version of displayer.crlf. */
|
|
|
|
static void
|
|
tui_mld_crlf (const struct match_list_displayer *displayer)
|
|
{
|
|
tui_putc ('\n');
|
|
}
|
|
|
|
/* TUI version of displayer.putch. */
|
|
|
|
static void
|
|
tui_mld_putch (const struct match_list_displayer *displayer, int ch)
|
|
{
|
|
tui_putc (ch);
|
|
}
|
|
|
|
/* TUI version of displayer.puts. */
|
|
|
|
static void
|
|
tui_mld_puts (const struct match_list_displayer *displayer, const char *s)
|
|
{
|
|
tui_puts (s);
|
|
}
|
|
|
|
/* TUI version of displayer.flush. */
|
|
|
|
static void
|
|
tui_mld_flush (const struct match_list_displayer *displayer)
|
|
{
|
|
wrefresh (TUI_CMD_WIN->generic.handle);
|
|
}
|
|
|
|
/* TUI version of displayer.erase_entire_line. */
|
|
|
|
static void
|
|
tui_mld_erase_entire_line (const struct match_list_displayer *displayer)
|
|
{
|
|
WINDOW *w = TUI_CMD_WIN->generic.handle;
|
|
int cur_y = getcury (w);
|
|
|
|
wmove (w, cur_y, 0);
|
|
wclrtoeol (w);
|
|
wmove (w, cur_y, 0);
|
|
}
|
|
|
|
/* TUI version of displayer.beep. */
|
|
|
|
static void
|
|
tui_mld_beep (const struct match_list_displayer *displayer)
|
|
{
|
|
beep ();
|
|
}
|
|
|
|
/* Helper function for tui_mld_read_key.
|
|
This temporarily replaces tui_getc for use during tab-completion
|
|
match list display. */
|
|
|
|
static int
|
|
tui_mld_getc (FILE *fp)
|
|
{
|
|
WINDOW *w = TUI_CMD_WIN->generic.handle;
|
|
int c = wgetch (w);
|
|
|
|
return c;
|
|
}
|
|
|
|
/* TUI version of displayer.read_key. */
|
|
|
|
static int
|
|
tui_mld_read_key (const struct match_list_displayer *displayer)
|
|
{
|
|
rl_getc_func_t *prev = rl_getc_function;
|
|
int c;
|
|
|
|
/* We can't use tui_getc as we need NEWLINE to not get emitted. */
|
|
rl_getc_function = tui_mld_getc;
|
|
c = rl_read_key ();
|
|
rl_getc_function = prev;
|
|
return c;
|
|
}
|
|
|
|
/* TUI version of rl_completion_display_matches_hook.
|
|
See gdb_display_match_list for a description of the arguments. */
|
|
|
|
static void
|
|
tui_rl_display_match_list (char **matches, int len, int max)
|
|
{
|
|
struct match_list_displayer displayer;
|
|
|
|
rl_get_screen_size (&displayer.height, &displayer.width);
|
|
displayer.crlf = tui_mld_crlf;
|
|
displayer.putch = tui_mld_putch;
|
|
displayer.puts = tui_mld_puts;
|
|
displayer.flush = tui_mld_flush;
|
|
displayer.erase_entire_line = tui_mld_erase_entire_line;
|
|
displayer.beep = tui_mld_beep;
|
|
displayer.read_key = tui_mld_read_key;
|
|
|
|
gdb_display_match_list (matches, len, max, &displayer);
|
|
}
|
|
|
|
/* Setup the IO for curses or non-curses mode.
|
|
- In non-curses mode, readline and gdb use the standard input and
|
|
standard output/error directly.
|
|
- In curses mode, the standard output/error is controlled by TUI
|
|
with the tui_stdout and tui_stderr. The output is redirected in
|
|
the curses command window. Several readline callbacks are installed
|
|
so that readline asks for its input to the curses command window
|
|
with wgetch(). */
|
|
void
|
|
tui_setup_io (int mode)
|
|
{
|
|
extern int _rl_echoing_p;
|
|
|
|
if (mode)
|
|
{
|
|
/* Redirect readline to TUI. */
|
|
tui_old_rl_redisplay_function = rl_redisplay_function;
|
|
tui_old_rl_deprep_terminal = rl_deprep_term_function;
|
|
tui_old_rl_prep_terminal = rl_prep_term_function;
|
|
tui_old_rl_getc_function = rl_getc_function;
|
|
tui_old_rl_display_matches_hook = rl_completion_display_matches_hook;
|
|
tui_old_rl_outstream = rl_outstream;
|
|
tui_old_rl_echoing_p = _rl_echoing_p;
|
|
rl_redisplay_function = tui_redisplay_readline;
|
|
rl_deprep_term_function = tui_deprep_terminal;
|
|
rl_prep_term_function = tui_prep_terminal;
|
|
rl_getc_function = tui_getc;
|
|
_rl_echoing_p = 0;
|
|
rl_outstream = tui_rl_outstream;
|
|
rl_prompt = 0;
|
|
rl_completion_display_matches_hook = tui_rl_display_match_list;
|
|
rl_already_prompted = 0;
|
|
|
|
/* Keep track of previous gdb output. */
|
|
tui_old_stdout = gdb_stdout;
|
|
tui_old_stderr = gdb_stderr;
|
|
tui_old_uiout = current_uiout;
|
|
|
|
/* Reconfigure gdb output. */
|
|
gdb_stdout = tui_stdout;
|
|
gdb_stderr = tui_stderr;
|
|
gdb_stdlog = gdb_stdout; /* for moment */
|
|
gdb_stdtarg = gdb_stderr; /* for moment */
|
|
gdb_stdtargerr = gdb_stderr; /* for moment */
|
|
current_uiout = tui_out;
|
|
|
|
/* Save tty for SIGCONT. */
|
|
savetty ();
|
|
}
|
|
else
|
|
{
|
|
/* Restore gdb output. */
|
|
gdb_stdout = tui_old_stdout;
|
|
gdb_stderr = tui_old_stderr;
|
|
gdb_stdlog = gdb_stdout; /* for moment */
|
|
gdb_stdtarg = gdb_stderr; /* for moment */
|
|
gdb_stdtargerr = gdb_stderr; /* for moment */
|
|
current_uiout = tui_old_uiout;
|
|
|
|
/* Restore readline. */
|
|
rl_redisplay_function = tui_old_rl_redisplay_function;
|
|
rl_deprep_term_function = tui_old_rl_deprep_terminal;
|
|
rl_prep_term_function = tui_old_rl_prep_terminal;
|
|
rl_getc_function = tui_old_rl_getc_function;
|
|
rl_completion_display_matches_hook = tui_old_rl_display_matches_hook;
|
|
rl_outstream = tui_old_rl_outstream;
|
|
_rl_echoing_p = tui_old_rl_echoing_p;
|
|
rl_already_prompted = 0;
|
|
|
|
/* Save tty for SIGCONT. */
|
|
savetty ();
|
|
}
|
|
}
|
|
|
|
#ifdef SIGCONT
|
|
/* Catch SIGCONT to restore the terminal and refresh the screen. */
|
|
static void
|
|
tui_cont_sig (int sig)
|
|
{
|
|
if (tui_active)
|
|
{
|
|
/* Restore the terminal setting because another process (shell)
|
|
might have changed it. */
|
|
resetty ();
|
|
|
|
/* Force a refresh of the screen. */
|
|
tui_refresh_all_win ();
|
|
|
|
wrefresh (TUI_CMD_WIN->generic.handle);
|
|
}
|
|
signal (sig, tui_cont_sig);
|
|
}
|
|
#endif
|
|
|
|
/* Initialize the IO for gdb in curses mode. */
|
|
void
|
|
tui_initialize_io (void)
|
|
{
|
|
#ifdef SIGCONT
|
|
signal (SIGCONT, tui_cont_sig);
|
|
#endif
|
|
|
|
/* Create tui output streams. */
|
|
tui_stdout = tui_fileopen (stdout);
|
|
tui_stderr = tui_fileopen (stderr);
|
|
tui_out = tui_out_new (tui_stdout);
|
|
|
|
/* Create the default UI. */
|
|
tui_old_uiout = cli_out_new (gdb_stdout);
|
|
|
|
#ifdef TUI_USE_PIPE_FOR_READLINE
|
|
/* Temporary solution for readline writing to stdout: redirect
|
|
readline output in a pipe, read that pipe and output the content
|
|
in the curses command window. */
|
|
if (gdb_pipe_cloexec (tui_readline_pipe) != 0)
|
|
error (_("Cannot create pipe for readline"));
|
|
|
|
tui_rl_outstream = fdopen (tui_readline_pipe[1], "w");
|
|
if (tui_rl_outstream == 0)
|
|
error (_("Cannot redirect readline output"));
|
|
|
|
setvbuf (tui_rl_outstream, (char*) NULL, _IOLBF, 0);
|
|
|
|
#ifdef O_NONBLOCK
|
|
(void) fcntl (tui_readline_pipe[0], F_SETFL, O_NONBLOCK);
|
|
#else
|
|
#ifdef O_NDELAY
|
|
(void) fcntl (tui_readline_pipe[0], F_SETFL, O_NDELAY);
|
|
#endif
|
|
#endif
|
|
add_file_handler (tui_readline_pipe[0], tui_readline_output, 0);
|
|
#else
|
|
tui_rl_outstream = stdout;
|
|
#endif
|
|
}
|
|
|
|
/* Get a character from the command window. This is called from the
|
|
readline package. */
|
|
int
|
|
tui_getc (FILE *fp)
|
|
{
|
|
int ch;
|
|
WINDOW *w;
|
|
|
|
w = TUI_CMD_WIN->generic.handle;
|
|
|
|
#ifdef TUI_USE_PIPE_FOR_READLINE
|
|
/* Flush readline output. */
|
|
tui_readline_output (0, 0);
|
|
#endif
|
|
|
|
ch = wgetch (w);
|
|
|
|
/* The \n must be echoed because it will not be printed by
|
|
readline. */
|
|
if (ch == '\n')
|
|
{
|
|
/* When hitting return with an empty input, gdb executes the last
|
|
command. If we emit a newline, this fills up the command window
|
|
with empty lines with gdb prompt at beginning. Instead of that,
|
|
stay on the same line but provide a visual effect to show the
|
|
user we recognized the command. */
|
|
if (rl_end == 0 && !gdb_in_secondary_prompt_p ())
|
|
{
|
|
wmove (w, getcury (w), 0);
|
|
|
|
/* Clear the line. This will blink the gdb prompt since
|
|
it will be redrawn at the same line. */
|
|
wclrtoeol (w);
|
|
wrefresh (w);
|
|
napms (20);
|
|
}
|
|
else
|
|
{
|
|
/* Move cursor to the end of the command line before emitting the
|
|
newline. We need to do so because when ncurses outputs a newline
|
|
it truncates any text that appears past the end of the cursor. */
|
|
int px, py;
|
|
getyx (w, py, px);
|
|
px += rl_end - rl_point;
|
|
py += px / TUI_CMD_WIN->generic.width;
|
|
px %= TUI_CMD_WIN->generic.width;
|
|
wmove (w, py, px);
|
|
tui_putc ('\n');
|
|
}
|
|
}
|
|
|
|
/* Handle prev/next/up/down here. */
|
|
ch = tui_dispatch_ctrl_char (ch);
|
|
|
|
if (ch == KEY_BACKSPACE)
|
|
return '\b';
|
|
|
|
if (async_command_editing_p && key_is_start_sequence (ch))
|
|
{
|
|
int ch_pending;
|
|
|
|
nodelay (w, TRUE);
|
|
ch_pending = wgetch (w);
|
|
nodelay (w, FALSE);
|
|
|
|
/* If we have pending input following a start sequence, call the stdin
|
|
event handler again because ncurses may have already read and stored
|
|
the input into its internal buffer, meaning that we won't get an stdin
|
|
event for it. If we don't compensate for this missed stdin event, key
|
|
sequences as Alt_F (^[f) will not behave promptly.
|
|
|
|
(We only compensates for the missed 2nd byte of a key sequence because
|
|
2-byte sequences are by far the most commonly used. ncurses may have
|
|
buffered a larger, 3+-byte key sequence though it remains to be seen
|
|
whether it is useful to compensate for all the bytes of such
|
|
sequences.) */
|
|
if (ch_pending != ERR)
|
|
{
|
|
ungetch (ch_pending);
|
|
call_stdin_event_handler_again_p = 1;
|
|
}
|
|
}
|
|
|
|
return ch;
|
|
}
|
|
|
|
/* Utility function to expand TABs in a STRING into spaces. STRING
|
|
will be displayed starting at column COL, and is assumed to include
|
|
no newlines. The returned expanded string is malloc'ed. */
|
|
|
|
char *
|
|
tui_expand_tabs (const char *string, int col)
|
|
{
|
|
int n_adjust, ncol;
|
|
const char *s;
|
|
char *ret, *q;
|
|
|
|
/* 1. How many additional characters do we need? */
|
|
for (ncol = col, n_adjust = 0, s = string; s; )
|
|
{
|
|
s = strpbrk (s, "\t");
|
|
if (s)
|
|
{
|
|
ncol += (s - string) + n_adjust;
|
|
/* Adjustment for the next tab stop, minus one for the TAB
|
|
we replace with spaces. */
|
|
n_adjust += 8 - (ncol % 8) - 1;
|
|
s++;
|
|
}
|
|
}
|
|
|
|
/* Allocate the copy. */
|
|
ret = q = (char *) xmalloc (strlen (string) + n_adjust + 1);
|
|
|
|
/* 2. Copy the original string while replacing TABs with spaces. */
|
|
for (ncol = col, s = string; s; )
|
|
{
|
|
const char *s1 = strpbrk (s, "\t");
|
|
if (s1)
|
|
{
|
|
if (s1 > s)
|
|
{
|
|
strncpy (q, s, s1 - s);
|
|
q += s1 - s;
|
|
ncol += s1 - s;
|
|
}
|
|
do {
|
|
*q++ = ' ';
|
|
ncol++;
|
|
} while ((ncol % 8) != 0);
|
|
s1++;
|
|
}
|
|
else
|
|
strcpy (q, s);
|
|
s = s1;
|
|
}
|
|
|
|
return ret;
|
|
}
|