mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
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.
1089 lines
29 KiB
C
1089 lines
29 KiB
C
/* Helper routines for parsing XML using Expat.
|
||
|
||
Copyright (C) 2006-2015 Free Software Foundation, Inc.
|
||
|
||
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 "gdbcmd.h"
|
||
#include "xml-support.h"
|
||
#include "filestuff.h"
|
||
#include "safe-ctype.h"
|
||
|
||
/* Debugging flag. */
|
||
static int debug_xml;
|
||
|
||
/* The contents of this file are only useful if XML support is
|
||
available. */
|
||
#ifdef HAVE_LIBEXPAT
|
||
|
||
#include "gdb_expat.h"
|
||
|
||
/* The maximum depth of <xi:include> nesting. No need to be miserly,
|
||
we just want to avoid running out of stack on loops. */
|
||
#define MAX_XINCLUDE_DEPTH 30
|
||
|
||
/* Simplified XML parser infrastructure. */
|
||
|
||
/* A parsing level -- used to keep track of the current element
|
||
nesting. */
|
||
struct scope_level
|
||
{
|
||
/* Elements we allow at this level. */
|
||
const struct gdb_xml_element *elements;
|
||
|
||
/* The element which we are within. */
|
||
const struct gdb_xml_element *element;
|
||
|
||
/* Mask of which elements we've seen at this level (used for
|
||
optional and repeatable checking). */
|
||
unsigned int seen;
|
||
|
||
/* Body text accumulation. */
|
||
struct obstack *body;
|
||
};
|
||
typedef struct scope_level scope_level_s;
|
||
DEF_VEC_O(scope_level_s);
|
||
|
||
/* The parser itself, and our additional state. */
|
||
struct gdb_xml_parser
|
||
{
|
||
XML_Parser expat_parser; /* The underlying expat parser. */
|
||
|
||
const char *name; /* Name of this parser. */
|
||
void *user_data; /* The user's callback data, for handlers. */
|
||
|
||
VEC(scope_level_s) *scopes; /* Scoping stack. */
|
||
|
||
struct gdb_exception error; /* A thrown error, if any. */
|
||
int last_line; /* The line of the thrown error, or 0. */
|
||
|
||
const char *dtd_name; /* The name of the expected / default DTD,
|
||
if specified. */
|
||
int is_xinclude; /* Are we the special <xi:include> parser? */
|
||
};
|
||
|
||
/* Process some body text. We accumulate the text for later use; it's
|
||
wrong to do anything with it immediately, because a single block of
|
||
text might be broken up into multiple calls to this function. */
|
||
|
||
static void
|
||
gdb_xml_body_text (void *data, const XML_Char *text, int length)
|
||
{
|
||
struct gdb_xml_parser *parser = data;
|
||
struct scope_level *scope = VEC_last (scope_level_s, parser->scopes);
|
||
|
||
if (parser->error.reason < 0)
|
||
return;
|
||
|
||
if (scope->body == NULL)
|
||
{
|
||
scope->body = XCNEW (struct obstack);
|
||
obstack_init (scope->body);
|
||
}
|
||
|
||
obstack_grow (scope->body, text, length);
|
||
}
|
||
|
||
/* Issue a debugging message from one of PARSER's handlers. */
|
||
|
||
void
|
||
gdb_xml_debug (struct gdb_xml_parser *parser, const char *format, ...)
|
||
{
|
||
int line = XML_GetCurrentLineNumber (parser->expat_parser);
|
||
va_list ap;
|
||
char *message;
|
||
|
||
if (!debug_xml)
|
||
return;
|
||
|
||
va_start (ap, format);
|
||
message = xstrvprintf (format, ap);
|
||
if (line)
|
||
fprintf_unfiltered (gdb_stderr, "%s (line %d): %s\n",
|
||
parser->name, line, message);
|
||
else
|
||
fprintf_unfiltered (gdb_stderr, "%s: %s\n",
|
||
parser->name, message);
|
||
xfree (message);
|
||
}
|
||
|
||
/* Issue an error message from one of PARSER's handlers, and stop
|
||
parsing. */
|
||
|
||
void
|
||
gdb_xml_error (struct gdb_xml_parser *parser, const char *format, ...)
|
||
{
|
||
int line = XML_GetCurrentLineNumber (parser->expat_parser);
|
||
va_list ap;
|
||
|
||
parser->last_line = line;
|
||
va_start (ap, format);
|
||
throw_verror (XML_PARSE_ERROR, format, ap);
|
||
}
|
||
|
||
/* Find the attribute named NAME in the set of parsed attributes
|
||
ATTRIBUTES. Returns NULL if not found. */
|
||
|
||
struct gdb_xml_value *
|
||
xml_find_attribute (VEC(gdb_xml_value_s) *attributes, const char *name)
|
||
{
|
||
struct gdb_xml_value *value;
|
||
int ix;
|
||
|
||
for (ix = 0; VEC_iterate (gdb_xml_value_s, attributes, ix, value); ix++)
|
||
if (strcmp (value->name, name) == 0)
|
||
return value;
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* Clean up a vector of parsed attribute values. */
|
||
|
||
static void
|
||
gdb_xml_values_cleanup (void *data)
|
||
{
|
||
VEC(gdb_xml_value_s) **values = data;
|
||
struct gdb_xml_value *value;
|
||
int ix;
|
||
|
||
for (ix = 0; VEC_iterate (gdb_xml_value_s, *values, ix, value); ix++)
|
||
xfree (value->value);
|
||
VEC_free (gdb_xml_value_s, *values);
|
||
}
|
||
|
||
/* Handle the start of an element. DATA is our local XML parser, NAME
|
||
is the element, and ATTRS are the names and values of this
|
||
element's attributes. */
|
||
|
||
static void
|
||
gdb_xml_start_element (void *data, const XML_Char *name,
|
||
const XML_Char **attrs)
|
||
{
|
||
struct gdb_xml_parser *parser = data;
|
||
struct scope_level *scope;
|
||
struct scope_level new_scope;
|
||
const struct gdb_xml_element *element;
|
||
const struct gdb_xml_attribute *attribute;
|
||
VEC(gdb_xml_value_s) *attributes = NULL;
|
||
unsigned int seen;
|
||
struct cleanup *back_to;
|
||
|
||
/* Push an error scope. If we return or throw an exception before
|
||
filling this in, it will tell us to ignore children of this
|
||
element. */
|
||
VEC_reserve (scope_level_s, parser->scopes, 1);
|
||
scope = VEC_last (scope_level_s, parser->scopes);
|
||
memset (&new_scope, 0, sizeof (new_scope));
|
||
VEC_quick_push (scope_level_s, parser->scopes, &new_scope);
|
||
|
||
gdb_xml_debug (parser, _("Entering element <%s>"), name);
|
||
|
||
/* Find this element in the list of the current scope's allowed
|
||
children. Record that we've seen it. */
|
||
|
||
seen = 1;
|
||
for (element = scope->elements; element && element->name;
|
||
element++, seen <<= 1)
|
||
if (strcmp (element->name, name) == 0)
|
||
break;
|
||
|
||
if (element == NULL || element->name == NULL)
|
||
{
|
||
/* If we're working on XInclude, <xi:include> can be the child
|
||
of absolutely anything. Copy the previous scope's element
|
||
list into the new scope even if there was no match. */
|
||
if (parser->is_xinclude)
|
||
{
|
||
struct scope_level *unknown_scope;
|
||
|
||
XML_DefaultCurrent (parser->expat_parser);
|
||
|
||
unknown_scope = VEC_last (scope_level_s, parser->scopes);
|
||
unknown_scope->elements = scope->elements;
|
||
return;
|
||
}
|
||
|
||
gdb_xml_debug (parser, _("Element <%s> unknown"), name);
|
||
return;
|
||
}
|
||
|
||
if (!(element->flags & GDB_XML_EF_REPEATABLE) && (seen & scope->seen))
|
||
gdb_xml_error (parser, _("Element <%s> only expected once"), name);
|
||
|
||
scope->seen |= seen;
|
||
|
||
back_to = make_cleanup (gdb_xml_values_cleanup, &attributes);
|
||
|
||
for (attribute = element->attributes;
|
||
attribute != NULL && attribute->name != NULL;
|
||
attribute++)
|
||
{
|
||
const char *val = NULL;
|
||
const XML_Char **p;
|
||
void *parsed_value;
|
||
struct gdb_xml_value new_value;
|
||
|
||
for (p = attrs; *p != NULL; p += 2)
|
||
if (!strcmp (attribute->name, p[0]))
|
||
{
|
||
val = p[1];
|
||
break;
|
||
}
|
||
|
||
if (*p != NULL && val == NULL)
|
||
{
|
||
gdb_xml_debug (parser, _("Attribute \"%s\" missing a value"),
|
||
attribute->name);
|
||
continue;
|
||
}
|
||
|
||
if (*p == NULL && !(attribute->flags & GDB_XML_AF_OPTIONAL))
|
||
{
|
||
gdb_xml_error (parser, _("Required attribute \"%s\" of "
|
||
"<%s> not specified"),
|
||
attribute->name, element->name);
|
||
continue;
|
||
}
|
||
|
||
if (*p == NULL)
|
||
continue;
|
||
|
||
gdb_xml_debug (parser, _("Parsing attribute %s=\"%s\""),
|
||
attribute->name, val);
|
||
|
||
if (attribute->handler)
|
||
parsed_value = attribute->handler (parser, attribute, val);
|
||
else
|
||
parsed_value = xstrdup (val);
|
||
|
||
new_value.name = attribute->name;
|
||
new_value.value = parsed_value;
|
||
VEC_safe_push (gdb_xml_value_s, attributes, &new_value);
|
||
}
|
||
|
||
/* Check for unrecognized attributes. */
|
||
if (debug_xml)
|
||
{
|
||
const XML_Char **p;
|
||
|
||
for (p = attrs; *p != NULL; p += 2)
|
||
{
|
||
for (attribute = element->attributes;
|
||
attribute != NULL && attribute->name != NULL;
|
||
attribute++)
|
||
if (strcmp (attribute->name, *p) == 0)
|
||
break;
|
||
|
||
if (attribute == NULL || attribute->name == NULL)
|
||
gdb_xml_debug (parser, _("Ignoring unknown attribute %s"), *p);
|
||
}
|
||
}
|
||
|
||
/* Call the element handler if there is one. */
|
||
if (element->start_handler)
|
||
element->start_handler (parser, element, parser->user_data, attributes);
|
||
|
||
/* Fill in a new scope level. */
|
||
scope = VEC_last (scope_level_s, parser->scopes);
|
||
scope->element = element;
|
||
scope->elements = element->children;
|
||
|
||
do_cleanups (back_to);
|
||
}
|
||
|
||
/* Wrapper for gdb_xml_start_element, to prevent throwing exceptions
|
||
through expat. */
|
||
|
||
static void
|
||
gdb_xml_start_element_wrapper (void *data, const XML_Char *name,
|
||
const XML_Char **attrs)
|
||
{
|
||
struct gdb_xml_parser *parser = data;
|
||
|
||
if (parser->error.reason < 0)
|
||
return;
|
||
|
||
TRY
|
||
{
|
||
gdb_xml_start_element (data, name, attrs);
|
||
}
|
||
CATCH (ex, RETURN_MASK_ALL)
|
||
{
|
||
parser->error = ex;
|
||
#ifdef HAVE_XML_STOPPARSER
|
||
XML_StopParser (parser->expat_parser, XML_FALSE);
|
||
#endif
|
||
}
|
||
END_CATCH
|
||
}
|
||
|
||
/* Handle the end of an element. DATA is our local XML parser, and
|
||
NAME is the current element. */
|
||
|
||
static void
|
||
gdb_xml_end_element (void *data, const XML_Char *name)
|
||
{
|
||
struct gdb_xml_parser *parser = data;
|
||
struct scope_level *scope = VEC_last (scope_level_s, parser->scopes);
|
||
const struct gdb_xml_element *element;
|
||
unsigned int seen;
|
||
|
||
gdb_xml_debug (parser, _("Leaving element <%s>"), name);
|
||
|
||
for (element = scope->elements, seen = 1;
|
||
element != NULL && element->name != NULL;
|
||
element++, seen <<= 1)
|
||
if ((scope->seen & seen) == 0
|
||
&& (element->flags & GDB_XML_EF_OPTIONAL) == 0)
|
||
gdb_xml_error (parser, _("Required element <%s> is missing"),
|
||
element->name);
|
||
|
||
/* Call the element processor. */
|
||
if (scope->element != NULL && scope->element->end_handler)
|
||
{
|
||
char *body;
|
||
|
||
if (scope->body == NULL)
|
||
body = "";
|
||
else
|
||
{
|
||
int length;
|
||
|
||
length = obstack_object_size (scope->body);
|
||
obstack_1grow (scope->body, '\0');
|
||
body = (char *) obstack_finish (scope->body);
|
||
|
||
/* Strip leading and trailing whitespace. */
|
||
while (length > 0 && ISSPACE (body[length-1]))
|
||
body[--length] = '\0';
|
||
while (*body && ISSPACE (*body))
|
||
body++;
|
||
}
|
||
|
||
scope->element->end_handler (parser, scope->element, parser->user_data,
|
||
body);
|
||
}
|
||
else if (scope->element == NULL)
|
||
XML_DefaultCurrent (parser->expat_parser);
|
||
|
||
/* Pop the scope level. */
|
||
if (scope->body)
|
||
{
|
||
obstack_free (scope->body, NULL);
|
||
xfree (scope->body);
|
||
}
|
||
VEC_pop (scope_level_s, parser->scopes);
|
||
}
|
||
|
||
/* Wrapper for gdb_xml_end_element, to prevent throwing exceptions
|
||
through expat. */
|
||
|
||
static void
|
||
gdb_xml_end_element_wrapper (void *data, const XML_Char *name)
|
||
{
|
||
struct gdb_xml_parser *parser = data;
|
||
|
||
if (parser->error.reason < 0)
|
||
return;
|
||
|
||
TRY
|
||
{
|
||
gdb_xml_end_element (data, name);
|
||
}
|
||
CATCH (ex, RETURN_MASK_ALL)
|
||
{
|
||
parser->error = ex;
|
||
#ifdef HAVE_XML_STOPPARSER
|
||
XML_StopParser (parser->expat_parser, XML_FALSE);
|
||
#endif
|
||
}
|
||
END_CATCH
|
||
}
|
||
|
||
/* Free a parser and all its associated state. */
|
||
|
||
static void
|
||
gdb_xml_cleanup (void *arg)
|
||
{
|
||
struct gdb_xml_parser *parser = arg;
|
||
struct scope_level *scope;
|
||
int ix;
|
||
|
||
XML_ParserFree (parser->expat_parser);
|
||
|
||
/* Clean up the scopes. */
|
||
for (ix = 0; VEC_iterate (scope_level_s, parser->scopes, ix, scope); ix++)
|
||
if (scope->body)
|
||
{
|
||
obstack_free (scope->body, NULL);
|
||
xfree (scope->body);
|
||
}
|
||
VEC_free (scope_level_s, parser->scopes);
|
||
|
||
xfree (parser);
|
||
}
|
||
|
||
/* Initialize a parser and store it to *PARSER_RESULT. Register a
|
||
cleanup to destroy the parser. */
|
||
|
||
static struct cleanup *
|
||
gdb_xml_create_parser_and_cleanup (const char *name,
|
||
const struct gdb_xml_element *elements,
|
||
void *user_data,
|
||
struct gdb_xml_parser **parser_result)
|
||
{
|
||
struct gdb_xml_parser *parser;
|
||
struct scope_level start_scope;
|
||
struct cleanup *result;
|
||
|
||
/* Initialize the parser. */
|
||
parser = XCNEW (struct gdb_xml_parser);
|
||
parser->expat_parser = XML_ParserCreateNS (NULL, '!');
|
||
if (parser->expat_parser == NULL)
|
||
{
|
||
xfree (parser);
|
||
malloc_failure (0);
|
||
}
|
||
|
||
parser->name = name;
|
||
|
||
parser->user_data = user_data;
|
||
XML_SetUserData (parser->expat_parser, parser);
|
||
|
||
/* Set the callbacks. */
|
||
XML_SetElementHandler (parser->expat_parser, gdb_xml_start_element_wrapper,
|
||
gdb_xml_end_element_wrapper);
|
||
XML_SetCharacterDataHandler (parser->expat_parser, gdb_xml_body_text);
|
||
|
||
/* Initialize the outer scope. */
|
||
memset (&start_scope, 0, sizeof (start_scope));
|
||
start_scope.elements = elements;
|
||
VEC_safe_push (scope_level_s, parser->scopes, &start_scope);
|
||
|
||
*parser_result = parser;
|
||
return make_cleanup (gdb_xml_cleanup, parser);
|
||
}
|
||
|
||
/* External entity handler. The only external entities we support
|
||
are those compiled into GDB (we do not fetch entities from the
|
||
target). */
|
||
|
||
static int XMLCALL
|
||
gdb_xml_fetch_external_entity (XML_Parser expat_parser,
|
||
const XML_Char *context,
|
||
const XML_Char *base,
|
||
const XML_Char *systemId,
|
||
const XML_Char *publicId)
|
||
{
|
||
struct gdb_xml_parser *parser = XML_GetUserData (expat_parser);
|
||
XML_Parser entity_parser;
|
||
const char *text;
|
||
enum XML_Status status;
|
||
|
||
if (systemId == NULL)
|
||
{
|
||
text = fetch_xml_builtin (parser->dtd_name);
|
||
if (text == NULL)
|
||
internal_error (__FILE__, __LINE__,
|
||
_("could not locate built-in DTD %s"),
|
||
parser->dtd_name);
|
||
}
|
||
else
|
||
{
|
||
text = fetch_xml_builtin (systemId);
|
||
if (text == NULL)
|
||
return XML_STATUS_ERROR;
|
||
}
|
||
|
||
entity_parser = XML_ExternalEntityParserCreate (expat_parser, context, NULL);
|
||
|
||
/* Don't use our handlers for the contents of the DTD. Just let expat
|
||
process it. */
|
||
XML_SetElementHandler (entity_parser, NULL, NULL);
|
||
XML_SetDoctypeDeclHandler (entity_parser, NULL, NULL);
|
||
XML_SetXmlDeclHandler (entity_parser, NULL);
|
||
XML_SetDefaultHandler (entity_parser, NULL);
|
||
XML_SetUserData (entity_parser, NULL);
|
||
|
||
status = XML_Parse (entity_parser, text, strlen (text), 1);
|
||
|
||
XML_ParserFree (entity_parser);
|
||
return status;
|
||
}
|
||
|
||
/* Associate DTD_NAME, which must be the name of a compiled-in DTD,
|
||
with PARSER. */
|
||
|
||
void
|
||
gdb_xml_use_dtd (struct gdb_xml_parser *parser, const char *dtd_name)
|
||
{
|
||
enum XML_Error err;
|
||
|
||
parser->dtd_name = dtd_name;
|
||
|
||
XML_SetParamEntityParsing (parser->expat_parser,
|
||
XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE);
|
||
XML_SetExternalEntityRefHandler (parser->expat_parser,
|
||
gdb_xml_fetch_external_entity);
|
||
|
||
/* Even if no DTD is provided, use the built-in DTD anyway. */
|
||
err = XML_UseForeignDTD (parser->expat_parser, XML_TRUE);
|
||
if (err != XML_ERROR_NONE)
|
||
internal_error (__FILE__, __LINE__,
|
||
_("XML_UseForeignDTD failed: %s"),
|
||
XML_ErrorString (err));
|
||
}
|
||
|
||
/* Invoke PARSER on BUFFER. BUFFER is the data to parse, which
|
||
should be NUL-terminated.
|
||
|
||
The return value is 0 for success or -1 for error. It may throw,
|
||
but only if something unexpected goes wrong during parsing; parse
|
||
errors will be caught, warned about, and reported as failure. */
|
||
|
||
int
|
||
gdb_xml_parse (struct gdb_xml_parser *parser, const char *buffer)
|
||
{
|
||
enum XML_Status status;
|
||
const char *error_string;
|
||
|
||
gdb_xml_debug (parser, _("Starting:\n%s"), buffer);
|
||
|
||
status = XML_Parse (parser->expat_parser, buffer, strlen (buffer), 1);
|
||
|
||
if (status == XML_STATUS_OK && parser->error.reason == 0)
|
||
return 0;
|
||
|
||
if (parser->error.reason == RETURN_ERROR
|
||
&& parser->error.error == XML_PARSE_ERROR)
|
||
{
|
||
gdb_assert (parser->error.message != NULL);
|
||
error_string = parser->error.message;
|
||
}
|
||
else if (status == XML_STATUS_ERROR)
|
||
{
|
||
enum XML_Error err = XML_GetErrorCode (parser->expat_parser);
|
||
|
||
error_string = XML_ErrorString (err);
|
||
}
|
||
else
|
||
{
|
||
gdb_assert (parser->error.reason < 0);
|
||
throw_exception (parser->error);
|
||
}
|
||
|
||
if (parser->last_line != 0)
|
||
warning (_("while parsing %s (at line %d): %s"), parser->name,
|
||
parser->last_line, error_string);
|
||
else
|
||
warning (_("while parsing %s: %s"), parser->name, error_string);
|
||
|
||
return -1;
|
||
}
|
||
|
||
int
|
||
gdb_xml_parse_quick (const char *name, const char *dtd_name,
|
||
const struct gdb_xml_element *elements,
|
||
const char *document, void *user_data)
|
||
{
|
||
struct gdb_xml_parser *parser;
|
||
struct cleanup *back_to;
|
||
int result;
|
||
|
||
back_to = gdb_xml_create_parser_and_cleanup (name, elements,
|
||
user_data, &parser);
|
||
if (dtd_name != NULL)
|
||
gdb_xml_use_dtd (parser, dtd_name);
|
||
result = gdb_xml_parse (parser, document);
|
||
|
||
do_cleanups (back_to);
|
||
|
||
return result;
|
||
}
|
||
|
||
/* Parse a field VALSTR that we expect to contain an integer value.
|
||
The integer is returned in *VALP. The string is parsed with an
|
||
equivalent to strtoul.
|
||
|
||
Returns 0 for success, -1 for error. */
|
||
|
||
static int
|
||
xml_parse_unsigned_integer (const char *valstr, ULONGEST *valp)
|
||
{
|
||
const char *endptr;
|
||
ULONGEST result;
|
||
|
||
if (*valstr == '\0')
|
||
return -1;
|
||
|
||
result = strtoulst (valstr, &endptr, 0);
|
||
if (*endptr != '\0')
|
||
return -1;
|
||
|
||
*valp = result;
|
||
return 0;
|
||
}
|
||
|
||
/* Parse an integer string into a ULONGEST and return it, or call
|
||
gdb_xml_error if it could not be parsed. */
|
||
|
||
ULONGEST
|
||
gdb_xml_parse_ulongest (struct gdb_xml_parser *parser, const char *value)
|
||
{
|
||
ULONGEST result;
|
||
|
||
if (xml_parse_unsigned_integer (value, &result) != 0)
|
||
gdb_xml_error (parser, _("Can't convert \"%s\" to an integer"), value);
|
||
|
||
return result;
|
||
}
|
||
|
||
/* Parse an integer attribute into a ULONGEST. */
|
||
|
||
void *
|
||
gdb_xml_parse_attr_ulongest (struct gdb_xml_parser *parser,
|
||
const struct gdb_xml_attribute *attribute,
|
||
const char *value)
|
||
{
|
||
ULONGEST result;
|
||
void *ret;
|
||
|
||
if (xml_parse_unsigned_integer (value, &result) != 0)
|
||
gdb_xml_error (parser, _("Can't convert %s=\"%s\" to an integer"),
|
||
attribute->name, value);
|
||
|
||
ret = XNEW (ULONGEST);
|
||
memcpy (ret, &result, sizeof (result));
|
||
return ret;
|
||
}
|
||
|
||
/* A handler_data for yes/no boolean values. */
|
||
|
||
const struct gdb_xml_enum gdb_xml_enums_boolean[] = {
|
||
{ "yes", 1 },
|
||
{ "no", 0 },
|
||
{ NULL, 0 }
|
||
};
|
||
|
||
/* Map NAME to VALUE. A struct gdb_xml_enum * should be saved as the
|
||
value of handler_data when using gdb_xml_parse_attr_enum to parse a
|
||
fixed list of possible strings. The list is terminated by an entry
|
||
with NAME == NULL. */
|
||
|
||
void *
|
||
gdb_xml_parse_attr_enum (struct gdb_xml_parser *parser,
|
||
const struct gdb_xml_attribute *attribute,
|
||
const char *value)
|
||
{
|
||
const struct gdb_xml_enum *enums = attribute->handler_data;
|
||
void *ret;
|
||
|
||
for (enums = attribute->handler_data; enums->name != NULL; enums++)
|
||
if (strcasecmp (enums->name, value) == 0)
|
||
break;
|
||
|
||
if (enums->name == NULL)
|
||
gdb_xml_error (parser, _("Unknown attribute value %s=\"%s\""),
|
||
attribute->name, value);
|
||
|
||
ret = xmalloc (sizeof (enums->value));
|
||
memcpy (ret, &enums->value, sizeof (enums->value));
|
||
return ret;
|
||
}
|
||
|
||
|
||
/* XInclude processing. This is done as a separate step from actually
|
||
parsing the document, so that we can produce a single combined XML
|
||
document - e.g. to hand to a front end or to simplify comparing two
|
||
documents. We make extensive use of XML_DefaultCurrent, to pass
|
||
input text directly into the output without reformatting or
|
||
requoting it.
|
||
|
||
We output the DOCTYPE declaration for the first document unchanged,
|
||
if present, and discard DOCTYPEs from included documents. Only the
|
||
one we pass through here is used when we feed the result back to
|
||
expat. The XInclude standard explicitly does not discuss
|
||
validation of the result; we choose to apply the same DTD applied
|
||
to the outermost document.
|
||
|
||
We can not simply include the external DTD subset in the document
|
||
as an internal subset, because <!IGNORE> and <!INCLUDE> are valid
|
||
only in external subsets. But if we do not pass the DTD into the
|
||
output at all, default values will not be filled in.
|
||
|
||
We don't pass through any <?xml> declaration because we generate
|
||
UTF-8, not whatever the input encoding was. */
|
||
|
||
struct xinclude_parsing_data
|
||
{
|
||
/* The obstack to build the output in. */
|
||
struct obstack obstack;
|
||
|
||
/* A count indicating whether we are in an element whose
|
||
children should not be copied to the output, and if so,
|
||
how deep we are nested. This is used for anything inside
|
||
an xi:include, and for the DTD. */
|
||
int skip_depth;
|
||
|
||
/* The number of <xi:include> elements currently being processed,
|
||
to detect loops. */
|
||
int include_depth;
|
||
|
||
/* A function to call to obtain additional features, and its
|
||
baton. */
|
||
xml_fetch_another fetcher;
|
||
void *fetcher_baton;
|
||
};
|
||
|
||
static void
|
||
xinclude_start_include (struct gdb_xml_parser *parser,
|
||
const struct gdb_xml_element *element,
|
||
void *user_data, VEC(gdb_xml_value_s) *attributes)
|
||
{
|
||
struct xinclude_parsing_data *data = user_data;
|
||
char *href = xml_find_attribute (attributes, "href")->value;
|
||
struct cleanup *back_to;
|
||
char *text, *output;
|
||
|
||
gdb_xml_debug (parser, _("Processing XInclude of \"%s\""), href);
|
||
|
||
if (data->include_depth > MAX_XINCLUDE_DEPTH)
|
||
gdb_xml_error (parser, _("Maximum XInclude depth (%d) exceeded"),
|
||
MAX_XINCLUDE_DEPTH);
|
||
|
||
text = data->fetcher (href, data->fetcher_baton);
|
||
if (text == NULL)
|
||
gdb_xml_error (parser, _("Could not load XML document \"%s\""), href);
|
||
back_to = make_cleanup (xfree, text);
|
||
|
||
output = xml_process_xincludes (parser->name, text, data->fetcher,
|
||
data->fetcher_baton,
|
||
data->include_depth + 1);
|
||
if (output == NULL)
|
||
gdb_xml_error (parser, _("Parsing \"%s\" failed"), href);
|
||
|
||
obstack_grow (&data->obstack, output, strlen (output));
|
||
xfree (output);
|
||
|
||
do_cleanups (back_to);
|
||
|
||
data->skip_depth++;
|
||
}
|
||
|
||
static void
|
||
xinclude_end_include (struct gdb_xml_parser *parser,
|
||
const struct gdb_xml_element *element,
|
||
void *user_data, const char *body_text)
|
||
{
|
||
struct xinclude_parsing_data *data = user_data;
|
||
|
||
data->skip_depth--;
|
||
}
|
||
|
||
static void XMLCALL
|
||
xml_xinclude_default (void *data_, const XML_Char *s, int len)
|
||
{
|
||
struct gdb_xml_parser *parser = data_;
|
||
struct xinclude_parsing_data *data = parser->user_data;
|
||
|
||
/* If we are inside of e.g. xi:include or the DTD, don't save this
|
||
string. */
|
||
if (data->skip_depth)
|
||
return;
|
||
|
||
/* Otherwise just add it to the end of the document we're building
|
||
up. */
|
||
obstack_grow (&data->obstack, s, len);
|
||
}
|
||
|
||
static void XMLCALL
|
||
xml_xinclude_start_doctype (void *data_, const XML_Char *doctypeName,
|
||
const XML_Char *sysid, const XML_Char *pubid,
|
||
int has_internal_subset)
|
||
{
|
||
struct gdb_xml_parser *parser = data_;
|
||
struct xinclude_parsing_data *data = parser->user_data;
|
||
|
||
/* Don't print out the doctype, or the contents of the DTD internal
|
||
subset, if any. */
|
||
data->skip_depth++;
|
||
}
|
||
|
||
static void XMLCALL
|
||
xml_xinclude_end_doctype (void *data_)
|
||
{
|
||
struct gdb_xml_parser *parser = data_;
|
||
struct xinclude_parsing_data *data = parser->user_data;
|
||
|
||
data->skip_depth--;
|
||
}
|
||
|
||
static void XMLCALL
|
||
xml_xinclude_xml_decl (void *data_, const XML_Char *version,
|
||
const XML_Char *encoding, int standalone)
|
||
{
|
||
/* Do nothing - this function prevents the default handler from
|
||
being called, thus suppressing the XML declaration from the
|
||
output. */
|
||
}
|
||
|
||
static void
|
||
xml_xinclude_cleanup (void *data_)
|
||
{
|
||
struct xinclude_parsing_data *data = data_;
|
||
|
||
obstack_free (&data->obstack, NULL);
|
||
xfree (data);
|
||
}
|
||
|
||
const struct gdb_xml_attribute xinclude_attributes[] = {
|
||
{ "href", GDB_XML_AF_NONE, NULL, NULL },
|
||
{ NULL, GDB_XML_AF_NONE, NULL, NULL }
|
||
};
|
||
|
||
const struct gdb_xml_element xinclude_elements[] = {
|
||
{ "http://www.w3.org/2001/XInclude!include", xinclude_attributes, NULL,
|
||
GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE,
|
||
xinclude_start_include, xinclude_end_include },
|
||
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
|
||
};
|
||
|
||
/* The main entry point for <xi:include> processing. */
|
||
|
||
char *
|
||
xml_process_xincludes (const char *name, const char *text,
|
||
xml_fetch_another fetcher, void *fetcher_baton,
|
||
int depth)
|
||
{
|
||
struct gdb_xml_parser *parser;
|
||
struct xinclude_parsing_data *data;
|
||
struct cleanup *back_to;
|
||
char *result = NULL;
|
||
|
||
data = XCNEW (struct xinclude_parsing_data);
|
||
obstack_init (&data->obstack);
|
||
back_to = make_cleanup (xml_xinclude_cleanup, data);
|
||
|
||
gdb_xml_create_parser_and_cleanup (name, xinclude_elements,
|
||
data, &parser);
|
||
parser->is_xinclude = 1;
|
||
|
||
data->include_depth = depth;
|
||
data->fetcher = fetcher;
|
||
data->fetcher_baton = fetcher_baton;
|
||
|
||
XML_SetCharacterDataHandler (parser->expat_parser, NULL);
|
||
XML_SetDefaultHandler (parser->expat_parser, xml_xinclude_default);
|
||
|
||
/* Always discard the XML version declarations; the only important
|
||
thing this provides is encoding, and our result will have been
|
||
converted to UTF-8. */
|
||
XML_SetXmlDeclHandler (parser->expat_parser, xml_xinclude_xml_decl);
|
||
|
||
if (depth > 0)
|
||
/* Discard the doctype for included documents. */
|
||
XML_SetDoctypeDeclHandler (parser->expat_parser,
|
||
xml_xinclude_start_doctype,
|
||
xml_xinclude_end_doctype);
|
||
|
||
gdb_xml_use_dtd (parser, "xinclude.dtd");
|
||
|
||
if (gdb_xml_parse (parser, text) == 0)
|
||
{
|
||
obstack_1grow (&data->obstack, '\0');
|
||
result = xstrdup ((const char *) obstack_finish (&data->obstack));
|
||
|
||
if (depth == 0)
|
||
gdb_xml_debug (parser, _("XInclude processing succeeded."));
|
||
}
|
||
else
|
||
result = NULL;
|
||
|
||
do_cleanups (back_to);
|
||
return result;
|
||
}
|
||
#endif /* HAVE_LIBEXPAT */
|
||
|
||
|
||
/* Return an XML document which was compiled into GDB, from
|
||
the given FILENAME, or NULL if the file was not compiled in. */
|
||
|
||
const char *
|
||
fetch_xml_builtin (const char *filename)
|
||
{
|
||
const char *(*p)[2];
|
||
|
||
for (p = xml_builtin; (*p)[0]; p++)
|
||
if (strcmp ((*p)[0], filename) == 0)
|
||
return (*p)[1];
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* A to_xfer_partial helper function which reads XML files which were
|
||
compiled into GDB. The target may call this function from its own
|
||
to_xfer_partial handler, after converting object and annex to the
|
||
appropriate filename. */
|
||
|
||
LONGEST
|
||
xml_builtin_xfer_partial (const char *filename,
|
||
gdb_byte *readbuf, const gdb_byte *writebuf,
|
||
ULONGEST offset, LONGEST len)
|
||
{
|
||
const char *buf;
|
||
LONGEST len_avail;
|
||
|
||
gdb_assert (readbuf != NULL && writebuf == NULL);
|
||
gdb_assert (filename != NULL);
|
||
|
||
buf = fetch_xml_builtin (filename);
|
||
if (buf == NULL)
|
||
return -1;
|
||
|
||
len_avail = strlen (buf);
|
||
if (offset >= len_avail)
|
||
return 0;
|
||
|
||
if (len > len_avail - offset)
|
||
len = len_avail - offset;
|
||
memcpy (readbuf, buf + offset, len);
|
||
return len;
|
||
}
|
||
|
||
|
||
static void
|
||
show_debug_xml (struct ui_file *file, int from_tty,
|
||
struct cmd_list_element *c, const char *value)
|
||
{
|
||
fprintf_filtered (file, _("XML debugging is %s.\n"), value);
|
||
}
|
||
|
||
void
|
||
obstack_xml_printf (struct obstack *obstack, const char *format, ...)
|
||
{
|
||
va_list ap;
|
||
const char *f;
|
||
const char *prev;
|
||
int percent = 0;
|
||
|
||
va_start (ap, format);
|
||
|
||
prev = format;
|
||
for (f = format; *f; f++)
|
||
{
|
||
if (percent)
|
||
{
|
||
switch (*f)
|
||
{
|
||
case 's':
|
||
{
|
||
char *p;
|
||
char *a = va_arg (ap, char *);
|
||
|
||
obstack_grow (obstack, prev, f - prev - 1);
|
||
p = xml_escape_text (a);
|
||
obstack_grow_str (obstack, p);
|
||
xfree (p);
|
||
prev = f + 1;
|
||
}
|
||
break;
|
||
}
|
||
percent = 0;
|
||
}
|
||
else if (*f == '%')
|
||
percent = 1;
|
||
}
|
||
|
||
obstack_grow_str (obstack, prev);
|
||
va_end (ap);
|
||
}
|
||
|
||
char *
|
||
xml_fetch_content_from_file (const char *filename, void *baton)
|
||
{
|
||
const char *dirname = baton;
|
||
FILE *file;
|
||
struct cleanup *back_to;
|
||
char *text;
|
||
size_t len, offset;
|
||
|
||
if (dirname && *dirname)
|
||
{
|
||
char *fullname = concat (dirname, "/", filename, (char *) NULL);
|
||
|
||
if (fullname == NULL)
|
||
malloc_failure (0);
|
||
file = gdb_fopen_cloexec (fullname, FOPEN_RT);
|
||
xfree (fullname);
|
||
}
|
||
else
|
||
file = gdb_fopen_cloexec (filename, FOPEN_RT);
|
||
|
||
if (file == NULL)
|
||
return NULL;
|
||
|
||
back_to = make_cleanup_fclose (file);
|
||
|
||
/* Read in the whole file, one chunk at a time. */
|
||
len = 4096;
|
||
offset = 0;
|
||
text = (char *) xmalloc (len);
|
||
make_cleanup (free_current_contents, &text);
|
||
while (1)
|
||
{
|
||
size_t bytes_read;
|
||
|
||
/* Continue reading where the last read left off. Leave at least
|
||
one byte so that we can NUL-terminate the result. */
|
||
bytes_read = fread (text + offset, 1, len - offset - 1, file);
|
||
if (ferror (file))
|
||
{
|
||
warning (_("Read error from \"%s\""), filename);
|
||
do_cleanups (back_to);
|
||
return NULL;
|
||
}
|
||
|
||
offset += bytes_read;
|
||
|
||
if (feof (file))
|
||
break;
|
||
|
||
len = len * 2;
|
||
text = (char *) xrealloc (text, len);
|
||
}
|
||
|
||
fclose (file);
|
||
discard_cleanups (back_to);
|
||
|
||
text[offset] = '\0';
|
||
return text;
|
||
}
|
||
|
||
void _initialize_xml_support (void);
|
||
|
||
void
|
||
_initialize_xml_support (void)
|
||
{
|
||
add_setshow_boolean_cmd ("xml", class_maintenance, &debug_xml,
|
||
_("Set XML parser debugging."),
|
||
_("Show XML parser debugging."),
|
||
_("When set, debugging messages for XML parsers "
|
||
"are displayed."),
|
||
NULL, show_debug_xml,
|
||
&setdebuglist, &showdebuglist);
|
||
}
|