6c2659886f
I'd like to enable the -Wmissing-declarations warning. However, it warns for every _initialize function, for example: CXX dcache.o /home/smarchi/src/binutils-gdb/gdb/dcache.c: In function ‘void _initialize_dcache()’: /home/smarchi/src/binutils-gdb/gdb/dcache.c:688:1: error: no previous declaration for ‘void _initialize_dcache()’ [-Werror=missing-declarations] _initialize_dcache (void) ^~~~~~~~~~~~~~~~~~ The only practical way forward I found is to add back the declarations, which were removed by this commit: commit 481695ed5f6e0a8a9c9c50bfac1cdd2b3151e6c9 Author: John Baldwin <jhb@FreeBSD.org> Date: Sat Sep 9 11:02:37 2017 -0700 Remove unnecessary function prototypes. I don't think it's a big problem to have the declarations for these functions, but if anybody has a better solution for this, I'll be happy to use it. gdb/ChangeLog: * aarch64-fbsd-nat.c (_initialize_aarch64_fbsd_nat): Add declaration. * aarch64-fbsd-tdep.c (_initialize_aarch64_fbsd_tdep): Add declaration. * aarch64-linux-nat.c (_initialize_aarch64_linux_nat): Add declaration. * aarch64-linux-tdep.c (_initialize_aarch64_linux_tdep): Add declaration. * aarch64-newlib-tdep.c (_initialize_aarch64_newlib_tdep): Add declaration. * aarch64-tdep.c (_initialize_aarch64_tdep): Add declaration. * ada-exp.y (_initialize_ada_exp): Add declaration. * ada-lang.c (_initialize_ada_language): Add declaration. * ada-tasks.c (_initialize_tasks): Add declaration. * agent.c (_initialize_agent): Add declaration. * aix-thread.c (_initialize_aix_thread): Add declaration. * alpha-bsd-nat.c (_initialize_alphabsd_nat): Add declaration. * alpha-linux-nat.c (_initialize_alpha_linux_nat): Add declaration. * alpha-linux-tdep.c (_initialize_alpha_linux_tdep): Add declaration. * alpha-nbsd-tdep.c (_initialize_alphanbsd_tdep): Add declaration. * alpha-obsd-tdep.c (_initialize_alphaobsd_tdep): Add declaration. * alpha-tdep.c (_initialize_alpha_tdep): Add declaration. * amd64-darwin-tdep.c (_initialize_amd64_darwin_tdep): Add declaration. * amd64-dicos-tdep.c (_initialize_amd64_dicos_tdep): Add declaration. * amd64-fbsd-nat.c (_initialize_amd64fbsd_nat): Add declaration. * amd64-fbsd-tdep.c (_initialize_amd64fbsd_tdep): Add declaration. * amd64-linux-nat.c (_initialize_amd64_linux_nat): Add declaration. * amd64-linux-tdep.c (_initialize_amd64_linux_tdep): Add declaration. * amd64-nbsd-nat.c (_initialize_amd64nbsd_nat): Add declaration. * amd64-nbsd-tdep.c (_initialize_amd64nbsd_tdep): Add declaration. * amd64-obsd-nat.c (_initialize_amd64obsd_nat): Add declaration. * amd64-obsd-tdep.c (_initialize_amd64obsd_tdep): Add declaration. * amd64-sol2-tdep.c (_initialize_amd64_sol2_tdep): Add declaration. * amd64-tdep.c (_initialize_amd64_tdep): Add declaration. * amd64-windows-nat.c (_initialize_amd64_windows_nat): Add declaration. * amd64-windows-tdep.c (_initialize_amd64_windows_tdep): Add declaration. * annotate.c (_initialize_annotate): Add declaration. * arc-newlib-tdep.c (_initialize_arc_newlib_tdep): Add declaration. * arc-tdep.c (_initialize_arc_tdep): Add declaration. * arch-utils.c (_initialize_gdbarch_utils): Add declaration. * arm-fbsd-nat.c (_initialize_arm_fbsd_nat): Add declaration. * arm-fbsd-tdep.c (_initialize_arm_fbsd_tdep): Add declaration. * arm-linux-nat.c (_initialize_arm_linux_nat): Add declaration. * arm-linux-tdep.c (_initialize_arm_linux_tdep): Add declaration. * arm-nbsd-nat.c (_initialize_arm_netbsd_nat): Add declaration. * arm-nbsd-tdep.c (_initialize_arm_netbsd_tdep): Add declaration. * arm-obsd-tdep.c (_initialize_armobsd_tdep): Add declaration. * arm-pikeos-tdep.c (_initialize_arm_pikeos_tdep): Add declaration. * arm-symbian-tdep.c (_initialize_arm_symbian_tdep): Add declaration. * arm-tdep.c (_initialize_arm_tdep): Add declaration. * arm-wince-tdep.c (_initialize_arm_wince_tdep): Add declaration. * auto-load.c (_initialize_auto_load): Add declaration. * auxv.c (_initialize_auxv): Add declaration. * avr-tdep.c (_initialize_avr_tdep): Add declaration. * ax-gdb.c (_initialize_ax_gdb): Add declaration. * bfin-linux-tdep.c (_initialize_bfin_linux_tdep): Add declaration. * bfin-tdep.c (_initialize_bfin_tdep): Add declaration. * break-catch-sig.c (_initialize_break_catch_sig): Add declaration. * break-catch-syscall.c (_initialize_break_catch_syscall): Add declaration. * break-catch-throw.c (_initialize_break_catch_throw): Add declaration. * breakpoint.c (_initialize_breakpoint): Add declaration. * bsd-uthread.c (_initialize_bsd_uthread): Add declaration. * btrace.c (_initialize_btrace): Add declaration. * charset.c (_initialize_charset): Add declaration. * cli/cli-cmds.c (_initialize_cli_cmds): Add declaration. * cli/cli-dump.c (_initialize_cli_dump): Add declaration. * cli/cli-interp.c (_initialize_cli_interp): Add declaration. * cli/cli-logging.c (_initialize_cli_logging): Add declaration. * cli/cli-script.c (_initialize_cli_script): Add declaration. * cli/cli-style.c (_initialize_cli_style): Add declaration. * coff-pe-read.c (_initialize_coff_pe_read): Add declaration. * coffread.c (_initialize_coffread): Add declaration. * compile/compile-cplus-types.c (_initialize_compile_cplus_types): Add declaration. * compile/compile.c (_initialize_compile): Add declaration. * complaints.c (_initialize_complaints): Add declaration. * completer.c (_initialize_completer): Add declaration. * copying.c (_initialize_copying): Add declaration. * corefile.c (_initialize_core): Add declaration. * corelow.c (_initialize_corelow): Add declaration. * cp-abi.c (_initialize_cp_abi): Add declaration. * cp-namespace.c (_initialize_cp_namespace): Add declaration. * cp-support.c (_initialize_cp_support): Add declaration. * cp-valprint.c (_initialize_cp_valprint): Add declaration. * cris-linux-tdep.c (_initialize_cris_linux_tdep): Add declaration. * cris-tdep.c (_initialize_cris_tdep): Add declaration. * csky-linux-tdep.c (_initialize_csky_linux_tdep): Add declaration. * csky-tdep.c (_initialize_csky_tdep): Add declaration. * ctfread.c (_initialize_ctfread): Add declaration. * d-lang.c (_initialize_d_language): Add declaration. * darwin-nat-info.c (_initialize_darwin_info_commands): Add declaration. * darwin-nat.c (_initialize_darwin_nat): Add declaration. * dbxread.c (_initialize_dbxread): Add declaration. * dcache.c (_initialize_dcache): Add declaration. * disasm-selftests.c (_initialize_disasm_selftests): Add declaration. * disasm.c (_initialize_disasm): Add declaration. * dtrace-probe.c (_initialize_dtrace_probe): Add declaration. * dummy-frame.c (_initialize_dummy_frame): Add declaration. * dwarf-index-cache.c (_initialize_index_cache): Add declaration. * dwarf-index-write.c (_initialize_dwarf_index_write): Add declaration. * dwarf2-frame-tailcall.c (_initialize_tailcall_frame): Add declaration. * dwarf2-frame.c (_initialize_dwarf2_frame): Add declaration. * dwarf2expr.c (_initialize_dwarf2expr): Add declaration. * dwarf2loc.c (_initialize_dwarf2loc): Add declaration. * dwarf2read.c (_initialize_dwarf2_read): Add declaration. * elfread.c (_initialize_elfread): Add declaration. * exec.c (_initialize_exec): Add declaration. * extension.c (_initialize_extension): Add declaration. * f-lang.c (_initialize_f_language): Add declaration. * f-valprint.c (_initialize_f_valprint): Add declaration. * fbsd-nat.c (_initialize_fbsd_nat): Add declaration. * fbsd-tdep.c (_initialize_fbsd_tdep): Add declaration. * filesystem.c (_initialize_filesystem): Add declaration. * findcmd.c (_initialize_mem_search): Add declaration. * findvar.c (_initialize_findvar): Add declaration. * fork-child.c (_initialize_fork_child): Add declaration. * frame-base.c (_initialize_frame_base): Add declaration. * frame-unwind.c (_initialize_frame_unwind): Add declaration. * frame.c (_initialize_frame): Add declaration. * frv-linux-tdep.c (_initialize_frv_linux_tdep): Add declaration. * frv-tdep.c (_initialize_frv_tdep): Add declaration. * ft32-tdep.c (_initialize_ft32_tdep): Add declaration. * gcore.c (_initialize_gcore): Add declaration. * gdb-demangle.c (_initialize_gdb_demangle): Add declaration. * gdb_bfd.c (_initialize_gdb_bfd): Add declaration. * gdbarch-selftests.c (_initialize_gdbarch_selftests): Add declaration. * gdbarch.c (_initialize_gdbarch): Add declaration. * gdbtypes.c (_initialize_gdbtypes): Add declaration. * gnu-nat.c (_initialize_gnu_nat): Add declaration. * gnu-v2-abi.c (_initialize_gnu_v2_abi): Add declaration. * gnu-v3-abi.c (_initialize_gnu_v3_abi): Add declaration. * go-lang.c (_initialize_go_language): Add declaration. * go32-nat.c (_initialize_go32_nat): Add declaration. * guile/guile.c (_initialize_guile): Add declaration. * h8300-tdep.c (_initialize_h8300_tdep): Add declaration. * hppa-linux-nat.c (_initialize_hppa_linux_nat): Add declaration. * hppa-linux-tdep.c (_initialize_hppa_linux_tdep): Add declaration. * hppa-nbsd-nat.c (_initialize_hppanbsd_nat): Add declaration. * hppa-nbsd-tdep.c (_initialize_hppanbsd_tdep): Add declaration. * hppa-obsd-nat.c (_initialize_hppaobsd_nat): Add declaration. * hppa-obsd-tdep.c (_initialize_hppabsd_tdep): Add declaration. * hppa-tdep.c (_initialize_hppa_tdep): Add declaration. * i386-bsd-nat.c (_initialize_i386bsd_nat): Add declaration. * i386-cygwin-tdep.c (_initialize_i386_cygwin_tdep): Add declaration. * i386-darwin-nat.c (_initialize_i386_darwin_nat): Add declaration. * i386-darwin-tdep.c (_initialize_i386_darwin_tdep): Add declaration. * i386-dicos-tdep.c (_initialize_i386_dicos_tdep): Add declaration. * i386-fbsd-nat.c (_initialize_i386fbsd_nat): Add declaration. * i386-fbsd-tdep.c (_initialize_i386fbsd_tdep): Add declaration. * i386-gnu-nat.c (_initialize_i386gnu_nat): Add declaration. * i386-gnu-tdep.c (_initialize_i386gnu_tdep): Add declaration. * i386-go32-tdep.c (_initialize_i386_go32_tdep): Add declaration. * i386-linux-nat.c (_initialize_i386_linux_nat): Add declaration. * i386-linux-tdep.c (_initialize_i386_linux_tdep): Add declaration. * i386-nbsd-nat.c (_initialize_i386nbsd_nat): Add declaration. * i386-nbsd-tdep.c (_initialize_i386nbsd_tdep): Add declaration. * i386-nto-tdep.c (_initialize_i386nto_tdep): Add declaration. * i386-obsd-nat.c (_initialize_i386obsd_nat): Add declaration. * i386-obsd-tdep.c (_initialize_i386obsd_tdep): Add declaration. * i386-sol2-nat.c (_initialize_amd64_sol2_nat): Add declaration. * i386-sol2-tdep.c (_initialize_i386_sol2_tdep): Add declaration. * i386-tdep.c (_initialize_i386_tdep): Add declaration. * i386-windows-nat.c (_initialize_i386_windows_nat): Add declaration. * ia64-libunwind-tdep.c (_initialize_libunwind_frame): Add declaration. * ia64-linux-nat.c (_initialize_ia64_linux_nat): Add declaration. * ia64-linux-tdep.c (_initialize_ia64_linux_tdep): Add declaration. * ia64-tdep.c (_initialize_ia64_tdep): Add declaration. * ia64-vms-tdep.c (_initialize_ia64_vms_tdep): Add declaration. * infcall.c (_initialize_infcall): Add declaration. * infcmd.c (_initialize_infcmd): Add declaration. * inflow.c (_initialize_inflow): Add declaration. * infrun.c (_initialize_infrun): Add declaration. * interps.c (_initialize_interpreter): Add declaration. * iq2000-tdep.c (_initialize_iq2000_tdep): Add declaration. * jit.c (_initialize_jit): Add declaration. * language.c (_initialize_language): Add declaration. * linux-fork.c (_initialize_linux_fork): Add declaration. * linux-nat.c (_initialize_linux_nat): Add declaration. * linux-tdep.c (_initialize_linux_tdep): Add declaration. * linux-thread-db.c (_initialize_thread_db): Add declaration. * lm32-tdep.c (_initialize_lm32_tdep): Add declaration. * m2-lang.c (_initialize_m2_language): Add declaration. * m32c-tdep.c (_initialize_m32c_tdep): Add declaration. * m32r-linux-nat.c (_initialize_m32r_linux_nat): Add declaration. * m32r-linux-tdep.c (_initialize_m32r_linux_tdep): Add declaration. * m32r-tdep.c (_initialize_m32r_tdep): Add declaration. * m68hc11-tdep.c (_initialize_m68hc11_tdep): Add declaration. * m68k-bsd-nat.c (_initialize_m68kbsd_nat): Add declaration. * m68k-bsd-tdep.c (_initialize_m68kbsd_tdep): Add declaration. * m68k-linux-nat.c (_initialize_m68k_linux_nat): Add declaration. * m68k-linux-tdep.c (_initialize_m68k_linux_tdep): Add declaration. * m68k-tdep.c (_initialize_m68k_tdep): Add declaration. * machoread.c (_initialize_machoread): Add declaration. * macrocmd.c (_initialize_macrocmd): Add declaration. * macroscope.c (_initialize_macroscope): Add declaration. * maint-test-options.c (_initialize_maint_test_options): Add declaration. * maint-test-settings.c (_initialize_maint_test_settings): Add declaration. * maint.c (_initialize_maint_cmds): Add declaration. * mdebugread.c (_initialize_mdebugread): Add declaration. * memattr.c (_initialize_mem): Add declaration. * mep-tdep.c (_initialize_mep_tdep): Add declaration. * mi/mi-cmd-env.c (_initialize_mi_cmd_env): Add declaration. * mi/mi-cmds.c (_initialize_mi_cmds): Add declaration. * mi/mi-interp.c (_initialize_mi_interp): Add declaration. * mi/mi-main.c (_initialize_mi_main): Add declaration. * microblaze-linux-tdep.c (_initialize_microblaze_linux_tdep): Add declaration. * microblaze-tdep.c (_initialize_microblaze_tdep): Add declaration. * mips-fbsd-nat.c (_initialize_mips_fbsd_nat): Add declaration. * mips-fbsd-tdep.c (_initialize_mips_fbsd_tdep): Add declaration. * mips-linux-nat.c (_initialize_mips_linux_nat): Add declaration. * mips-linux-tdep.c (_initialize_mips_linux_tdep): Add declaration. * mips-nbsd-nat.c (_initialize_mipsnbsd_nat): Add declaration. * mips-nbsd-tdep.c (_initialize_mipsnbsd_tdep): Add declaration. * mips-sde-tdep.c (_initialize_mips_sde_tdep): Add declaration. * mips-tdep.c (_initialize_mips_tdep): Add declaration. * mips64-obsd-nat.c (_initialize_mips64obsd_nat): Add declaration. * mips64-obsd-tdep.c (_initialize_mips64obsd_tdep): Add declaration. * mipsread.c (_initialize_mipsread): Add declaration. * mn10300-linux-tdep.c (_initialize_mn10300_linux_tdep): Add declaration. * mn10300-tdep.c (_initialize_mn10300_tdep): Add declaration. * moxie-tdep.c (_initialize_moxie_tdep): Add declaration. * msp430-tdep.c (_initialize_msp430_tdep): Add declaration. * nds32-tdep.c (_initialize_nds32_tdep): Add declaration. * nios2-linux-tdep.c (_initialize_nios2_linux_tdep): Add declaration. * nios2-tdep.c (_initialize_nios2_tdep): Add declaration. * nto-procfs.c (_initialize_procfs): Add declaration. * objc-lang.c (_initialize_objc_language): Add declaration. * observable.c (_initialize_observer): Add declaration. * opencl-lang.c (_initialize_opencl_language): Add declaration. * or1k-linux-tdep.c (_initialize_or1k_linux_tdep): Add declaration. * or1k-tdep.c (_initialize_or1k_tdep): Add declaration. * osabi.c (_initialize_gdb_osabi): Add declaration. * osdata.c (_initialize_osdata): Add declaration. * p-valprint.c (_initialize_pascal_valprint): Add declaration. * parse.c (_initialize_parse): Add declaration. * ppc-fbsd-nat.c (_initialize_ppcfbsd_nat): Add declaration. * ppc-fbsd-tdep.c (_initialize_ppcfbsd_tdep): Add declaration. * ppc-linux-nat.c (_initialize_ppc_linux_nat): Add declaration. * ppc-linux-tdep.c (_initialize_ppc_linux_tdep): Add declaration. * ppc-nbsd-nat.c (_initialize_ppcnbsd_nat): Add declaration. * ppc-nbsd-tdep.c (_initialize_ppcnbsd_tdep): Add declaration. * ppc-obsd-nat.c (_initialize_ppcobsd_nat): Add declaration. * ppc-obsd-tdep.c (_initialize_ppcobsd_tdep): Add declaration. * printcmd.c (_initialize_printcmd): Add declaration. * probe.c (_initialize_probe): Add declaration. * proc-api.c (_initialize_proc_api): Add declaration. * proc-events.c (_initialize_proc_events): Add declaration. * proc-service.c (_initialize_proc_service): Add declaration. * procfs.c (_initialize_procfs): Add declaration. * producer.c (_initialize_producer): Add declaration. * psymtab.c (_initialize_psymtab): Add declaration. * python/python.c (_initialize_python): Add declaration. * ravenscar-thread.c (_initialize_ravenscar): Add declaration. * record-btrace.c (_initialize_record_btrace): Add declaration. * record-full.c (_initialize_record_full): Add declaration. * record.c (_initialize_record): Add declaration. * regcache-dump.c (_initialize_regcache_dump): Add declaration. * regcache.c (_initialize_regcache): Add declaration. * reggroups.c (_initialize_reggroup): Add declaration. * remote-notif.c (_initialize_notif): Add declaration. * remote-sim.c (_initialize_remote_sim): Add declaration. * remote.c (_initialize_remote): Add declaration. * reverse.c (_initialize_reverse): Add declaration. * riscv-fbsd-nat.c (_initialize_riscv_fbsd_nat): Add declaration. * riscv-fbsd-tdep.c (_initialize_riscv_fbsd_tdep): Add declaration. * riscv-linux-nat.c (_initialize_riscv_linux_nat): Add declaration. * riscv-linux-tdep.c (_initialize_riscv_linux_tdep): Add declaration. * riscv-tdep.c (_initialize_riscv_tdep): Add declaration. * rl78-tdep.c (_initialize_rl78_tdep): Add declaration. * rs6000-aix-tdep.c (_initialize_rs6000_aix_tdep): Add declaration. * rs6000-lynx178-tdep.c (_initialize_rs6000_lynx178_tdep): Add declaration. * rs6000-nat.c (_initialize_rs6000_nat): Add declaration. * rs6000-tdep.c (_initialize_rs6000_tdep): Add declaration. * run-on-main-thread.c (_initialize_run_on_main_thread): Add declaration. * rust-exp.y (_initialize_rust_exp): Add declaration. * rx-tdep.c (_initialize_rx_tdep): Add declaration. * s12z-tdep.c (_initialize_s12z_tdep): Add declaration. * s390-linux-nat.c (_initialize_s390_nat): Add declaration. * s390-linux-tdep.c (_initialize_s390_linux_tdep): Add declaration. * s390-tdep.c (_initialize_s390_tdep): Add declaration. * score-tdep.c (_initialize_score_tdep): Add declaration. * ser-go32.c (_initialize_ser_dos): Add declaration. * ser-mingw.c (_initialize_ser_windows): Add declaration. * ser-pipe.c (_initialize_ser_pipe): Add declaration. * ser-tcp.c (_initialize_ser_tcp): Add declaration. * ser-uds.c (_initialize_ser_socket): Add declaration. * ser-unix.c (_initialize_ser_hardwire): Add declaration. * serial.c (_initialize_serial): Add declaration. * sh-linux-tdep.c (_initialize_sh_linux_tdep): Add declaration. * sh-nbsd-nat.c (_initialize_shnbsd_nat): Add declaration. * sh-nbsd-tdep.c (_initialize_shnbsd_tdep): Add declaration. * sh-tdep.c (_initialize_sh_tdep): Add declaration. * skip.c (_initialize_step_skip): Add declaration. * sol-thread.c (_initialize_sol_thread): Add declaration. * solib-aix.c (_initialize_solib_aix): Add declaration. * solib-darwin.c (_initialize_darwin_solib): Add declaration. * solib-dsbt.c (_initialize_dsbt_solib): Add declaration. * solib-frv.c (_initialize_frv_solib): Add declaration. * solib-svr4.c (_initialize_svr4_solib): Add declaration. * solib-target.c (_initialize_solib_target): Add declaration. * solib.c (_initialize_solib): Add declaration. * source-cache.c (_initialize_source_cache): Add declaration. * source.c (_initialize_source): Add declaration. * sparc-linux-nat.c (_initialize_sparc_linux_nat): Add declaration. * sparc-linux-tdep.c (_initialize_sparc_linux_tdep): Add declaration. * sparc-nat.c (_initialize_sparc_nat): Add declaration. * sparc-nbsd-nat.c (_initialize_sparcnbsd_nat): Add declaration. * sparc-nbsd-tdep.c (_initialize_sparcnbsd_tdep): Add declaration. * sparc-obsd-tdep.c (_initialize_sparc32obsd_tdep): Add declaration. * sparc-sol2-tdep.c (_initialize_sparc_sol2_tdep): Add declaration. * sparc-tdep.c (_initialize_sparc_tdep): Add declaration. * sparc64-fbsd-nat.c (_initialize_sparc64fbsd_nat): Add declaration. * sparc64-fbsd-tdep.c (_initialize_sparc64fbsd_tdep): Add declaration. * sparc64-linux-nat.c (_initialize_sparc64_linux_nat): Add declaration. * sparc64-linux-tdep.c (_initialize_sparc64_linux_tdep): Add declaration. * sparc64-nat.c (_initialize_sparc64_nat): Add declaration. * sparc64-nbsd-nat.c (_initialize_sparc64nbsd_nat): Add declaration. * sparc64-nbsd-tdep.c (_initialize_sparc64nbsd_tdep): Add declaration. * sparc64-obsd-nat.c (_initialize_sparc64obsd_nat): Add declaration. * sparc64-obsd-tdep.c (_initialize_sparc64obsd_tdep): Add declaration. * sparc64-sol2-tdep.c (_initialize_sparc64_sol2_tdep): Add declaration. * sparc64-tdep.c (_initialize_sparc64_adi_tdep): Add declaration. * stabsread.c (_initialize_stabsread): Add declaration. * stack.c (_initialize_stack): Add declaration. * stap-probe.c (_initialize_stap_probe): Add declaration. * std-regs.c (_initialize_frame_reg): Add declaration. * symfile-debug.c (_initialize_symfile_debug): Add declaration. * symfile-mem.c (_initialize_symfile_mem): Add declaration. * symfile.c (_initialize_symfile): Add declaration. * symmisc.c (_initialize_symmisc): Add declaration. * symtab.c (_initialize_symtab): Add declaration. * target.c (_initialize_target): Add declaration. * target-connection.c (_initialize_target_connection): Add declaration. * target-dcache.c (_initialize_target_dcache): Add declaration. * target-descriptions.c (_initialize_target_descriptions): Add declaration. * thread.c (_initialize_thread): Add declaration. * tic6x-linux-tdep.c (_initialize_tic6x_linux_tdep): Add declaration. * tic6x-tdep.c (_initialize_tic6x_tdep): Add declaration. * tilegx-linux-nat.c (_initialize_tile_linux_nat): Add declaration. * tilegx-linux-tdep.c (_initialize_tilegx_linux_tdep): Add declaration. * tilegx-tdep.c (_initialize_tilegx_tdep): Add declaration. * tracectf.c (_initialize_ctf): Add declaration. * tracefile-tfile.c (_initialize_tracefile_tfile): Add declaration. * tracefile.c (_initialize_tracefile): Add declaration. * tracepoint.c (_initialize_tracepoint): Add declaration. * tui/tui-hooks.c (_initialize_tui_hooks): Add declaration. * tui/tui-interp.c (_initialize_tui_interp): Add declaration. * tui/tui-layout.c (_initialize_tui_layout): Add declaration. * tui/tui-regs.c (_initialize_tui_regs): Add declaration. * tui/tui-stack.c (_initialize_tui_stack): Add declaration. * tui/tui-win.c (_initialize_tui_win): Add declaration. * tui/tui.c (_initialize_tui): Add declaration. * typeprint.c (_initialize_typeprint): Add declaration. * ui-style.c (_initialize_ui_style): Add declaration. * unittests/array-view-selftests.c (_initialize_array_view_selftests): Add declaration. * unittests/child-path-selftests.c (_initialize_child_path_selftests): Add declaration. * unittests/cli-utils-selftests.c (_initialize_cli_utils_selftests): Add declaration. * unittests/common-utils-selftests.c (_initialize_common_utils_selftests): Add declaration. * unittests/copy_bitwise-selftests.c (_initialize_copy_bitwise_utils_selftests): Add declaration. * unittests/environ-selftests.c (_initialize_environ_selftests): Add declaration. * unittests/filtered_iterator-selftests.c (_initialize_filtered_iterator_selftests): Add declaration. * unittests/format_pieces-selftests.c (_initialize_format_pieces_selftests): Add declaration. * unittests/function-view-selftests.c (_initialize_function_view_selftests): Add declaration. * unittests/help-doc-selftests.c (_initialize_help_doc_selftests): Add declaration. * unittests/lookup_name_info-selftests.c (_initialize_lookup_name_info_selftests): Add declaration. * unittests/main-thread-selftests.c (_initialize_main_thread_selftests): Add declaration. * unittests/memory-map-selftests.c (_initialize_memory_map_selftests): Add declaration. * unittests/memrange-selftests.c (_initialize_memrange_selftests): Add declaration. * unittests/mkdir-recursive-selftests.c (_initialize_mkdir_recursive_selftests): Add declaration. * unittests/observable-selftests.c (_initialize_observer_selftest): Add declaration. * unittests/offset-type-selftests.c (_initialize_offset_type_selftests): Add declaration. * unittests/optional-selftests.c (_initialize_optional_selftests): Add declaration. * unittests/parse-connection-spec-selftests.c (_initialize_parse_connection_spec_selftests): Add declaration. * unittests/rsp-low-selftests.c (_initialize_rsp_low_selftests): Add declaration. * unittests/scoped_fd-selftests.c (_initialize_scoped_fd_selftests): Add declaration. * unittests/scoped_mmap-selftests.c (_initialize_scoped_mmap_selftests): Add declaration. * unittests/scoped_restore-selftests.c (_initialize_scoped_restore_selftests): Add declaration. * unittests/string_view-selftests.c (_initialize_string_view_selftests): Add declaration. * unittests/style-selftests.c (_initialize_style_selftest): Add declaration. * unittests/tracepoint-selftests.c (_initialize_tracepoint_selftests): Add declaration. * unittests/tui-selftests.c (_initialize_tui_selftest): Add declaration. * unittests/unpack-selftests.c (_initialize_unpack_selftests): Add declaration. * unittests/utils-selftests.c (_initialize_utils_selftests): Add declaration. * unittests/vec-utils-selftests.c (_initialize_vec_utils_selftests): Add declaration. * unittests/xml-utils-selftests.c (_initialize_xml_utils): Add declaration. * user-regs.c (_initialize_user_regs): Add declaration. * utils.c (_initialize_utils): Add declaration. * v850-tdep.c (_initialize_v850_tdep): Add declaration. * valops.c (_initialize_valops): Add declaration. * valprint.c (_initialize_valprint): Add declaration. * value.c (_initialize_values): Add declaration. * varobj.c (_initialize_varobj): Add declaration. * vax-bsd-nat.c (_initialize_vaxbsd_nat): Add declaration. * vax-nbsd-tdep.c (_initialize_vaxnbsd_tdep): Add declaration. * vax-tdep.c (_initialize_vax_tdep): Add declaration. * windows-nat.c (_initialize_windows_nat): Add declaration. (_initialize_check_for_gdb_ini): Add declaration. (_initialize_loadable): Add declaration. * windows-tdep.c (_initialize_windows_tdep): Add declaration. * x86-bsd-nat.c (_initialize_x86_bsd_nat): Add declaration. * x86-linux-nat.c (_initialize_x86_linux_nat): Add declaration. * xcoffread.c (_initialize_xcoffread): Add declaration. * xml-support.c (_initialize_xml_support): Add declaration. * xstormy16-tdep.c (_initialize_xstormy16_tdep): Add declaration. * xtensa-linux-nat.c (_initialize_xtensa_linux_nat): Add declaration. * xtensa-linux-tdep.c (_initialize_xtensa_linux_tdep): Add declaration. * xtensa-tdep.c (_initialize_xtensa_tdep): Add declaration. Change-Id: I13eec7e0ed2b3c427377a7bdb055cf46da64def9
1024 lines
27 KiB
C
1024 lines
27 KiB
C
/* Helper routines for parsing XML using Expat.
|
||
|
||
Copyright (C) 2006-2020 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-builtin.h"
|
||
#include "xml-support.h"
|
||
#include "gdbsupport/filestuff.h"
|
||
#include "safe-ctype.h"
|
||
#include <vector>
|
||
#include <string>
|
||
|
||
/* Debugging flag. */
|
||
static bool 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
|
||
{
|
||
explicit scope_level (const gdb_xml_element *elements_ = NULL)
|
||
: elements (elements_),
|
||
element (NULL),
|
||
seen (0)
|
||
{}
|
||
|
||
/* 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. */
|
||
std::string body;
|
||
};
|
||
|
||
/* The parser itself, and our additional state. */
|
||
struct gdb_xml_parser
|
||
{
|
||
gdb_xml_parser (const char *name,
|
||
const gdb_xml_element *elements,
|
||
void *user_data);
|
||
~gdb_xml_parser();
|
||
|
||
/* Associate DTD_NAME, which must be the name of a compiled-in DTD,
|
||
with the parser. */
|
||
void use_dtd (const char *dtd_name);
|
||
|
||
/* Return the name of the expected / default DTD, if specified. */
|
||
const char *dtd_name ()
|
||
{ return m_dtd_name; }
|
||
|
||
/* Invoke the 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 parse (const char *buffer);
|
||
|
||
/* Issue a debugging message. */
|
||
void vdebug (const char *format, va_list ap)
|
||
ATTRIBUTE_PRINTF (2, 0);
|
||
|
||
/* Issue an error message, and stop parsing. */
|
||
void verror (const char *format, va_list ap)
|
||
ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (2, 0);
|
||
|
||
void body_text (const XML_Char *text, int length);
|
||
void start_element (const XML_Char *name, const XML_Char **attrs);
|
||
void end_element (const XML_Char *name);
|
||
|
||
/* Return the name of this parser. */
|
||
const char *name ()
|
||
{ return m_name; }
|
||
|
||
/* Return the user's callback data, for handlers. */
|
||
void *user_data ()
|
||
{ return m_user_data; };
|
||
|
||
/* Are we the special <xi:include> parser? */
|
||
void set_is_xinclude (bool is_xinclude)
|
||
{ m_is_xinclude = is_xinclude; }
|
||
|
||
/* A thrown error, if any. */
|
||
void set_error (gdb_exception &&error)
|
||
{
|
||
m_error = std::move (error);
|
||
#ifdef HAVE_XML_STOPPARSER
|
||
XML_StopParser (m_expat_parser, XML_FALSE);
|
||
#endif
|
||
}
|
||
|
||
/* Return the underlying expat parser. */
|
||
XML_Parser expat_parser ()
|
||
{ return m_expat_parser; }
|
||
|
||
private:
|
||
/* The underlying expat parser. */
|
||
XML_Parser m_expat_parser;
|
||
|
||
/* Name of this parser. */
|
||
const char *m_name;
|
||
|
||
/* The user's callback data, for handlers. */
|
||
void *m_user_data;
|
||
|
||
/* Scoping stack. */
|
||
std::vector<scope_level> m_scopes;
|
||
|
||
/* A thrown error, if any. */
|
||
struct gdb_exception m_error;
|
||
|
||
/* The line of the thrown error, or 0. */
|
||
int m_last_line;
|
||
|
||
/* The name of the expected / default DTD, if specified. */
|
||
const char *m_dtd_name;
|
||
|
||
/* Are we the special <xi:include> parser? */
|
||
bool m_is_xinclude;
|
||
};
|
||
|
||
/* 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. */
|
||
|
||
void
|
||
gdb_xml_parser::body_text (const XML_Char *text, int length)
|
||
{
|
||
if (m_error.reason < 0)
|
||
return;
|
||
|
||
scope_level &scope = m_scopes.back ();
|
||
scope.body.append (text, length);
|
||
}
|
||
|
||
static void
|
||
gdb_xml_body_text (void *data, const XML_Char *text, int length)
|
||
{
|
||
struct gdb_xml_parser *parser = (struct gdb_xml_parser *) data;
|
||
|
||
parser->body_text (text, length);
|
||
}
|
||
|
||
/* Issue a debugging message from one of PARSER's handlers. */
|
||
|
||
void
|
||
gdb_xml_parser::vdebug (const char *format, va_list ap)
|
||
{
|
||
int line = XML_GetCurrentLineNumber (m_expat_parser);
|
||
|
||
std::string message = string_vprintf (format, ap);
|
||
if (line)
|
||
fprintf_unfiltered (gdb_stderr, "%s (line %d): %s\n",
|
||
m_name, line, message.c_str ());
|
||
else
|
||
fprintf_unfiltered (gdb_stderr, "%s: %s\n",
|
||
m_name, message.c_str ());
|
||
}
|
||
|
||
void
|
||
gdb_xml_debug (struct gdb_xml_parser *parser, const char *format, ...)
|
||
{
|
||
if (!debug_xml)
|
||
return;
|
||
|
||
va_list ap;
|
||
va_start (ap, format);
|
||
parser->vdebug (format, ap);
|
||
va_end (ap);
|
||
}
|
||
|
||
/* Issue an error message from one of PARSER's handlers, and stop
|
||
parsing. */
|
||
|
||
void
|
||
gdb_xml_parser::verror (const char *format, va_list ap)
|
||
{
|
||
int line = XML_GetCurrentLineNumber (m_expat_parser);
|
||
|
||
m_last_line = line;
|
||
throw_verror (XML_PARSE_ERROR, format, ap);
|
||
}
|
||
|
||
void
|
||
gdb_xml_error (struct gdb_xml_parser *parser, const char *format, ...)
|
||
{
|
||
va_list ap;
|
||
va_start (ap, format);
|
||
parser->verror (format, ap);
|
||
va_end (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 (std::vector<gdb_xml_value> &attributes,
|
||
const char *name)
|
||
{
|
||
for (gdb_xml_value &value : attributes)
|
||
if (strcmp (value.name, name) == 0)
|
||
return &value;
|
||
|
||
return NULL;
|
||
}
|
||
|
||
/* Handle the start of an element. NAME is the element, and ATTRS are
|
||
the names and values of this element's attributes. */
|
||
|
||
void
|
||
gdb_xml_parser::start_element (const XML_Char *name,
|
||
const XML_Char **attrs)
|
||
{
|
||
if (m_error.reason < 0)
|
||
return;
|
||
|
||
const struct gdb_xml_element *element;
|
||
const struct gdb_xml_attribute *attribute;
|
||
unsigned int seen;
|
||
|
||
/* 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. Note we don't take a reference to the element yet
|
||
because further below we'll process the element which may recurse
|
||
back here and push more elements to the vector. When the
|
||
recursion unrolls all such elements will have been popped back
|
||
already, but if one of those pushes reallocates the vector,
|
||
previous element references will be invalidated. */
|
||
m_scopes.emplace_back ();
|
||
|
||
/* Get a reference to the current scope. */
|
||
scope_level &scope = m_scopes[m_scopes.size () - 2];
|
||
|
||
gdb_xml_debug (this, _("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 (m_is_xinclude)
|
||
{
|
||
XML_DefaultCurrent (m_expat_parser);
|
||
|
||
scope_level &unknown_scope = m_scopes.back ();
|
||
unknown_scope.elements = scope.elements;
|
||
return;
|
||
}
|
||
|
||
gdb_xml_debug (this, _("Element <%s> unknown"), name);
|
||
return;
|
||
}
|
||
|
||
if (!(element->flags & GDB_XML_EF_REPEATABLE) && (seen & scope.seen))
|
||
gdb_xml_error (this, _("Element <%s> only expected once"), name);
|
||
|
||
scope.seen |= seen;
|
||
|
||
std::vector<gdb_xml_value> attributes;
|
||
|
||
for (attribute = element->attributes;
|
||
attribute != NULL && attribute->name != NULL;
|
||
attribute++)
|
||
{
|
||
const char *val = NULL;
|
||
const XML_Char **p;
|
||
void *parsed_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 (this, _("Attribute \"%s\" missing a value"),
|
||
attribute->name);
|
||
continue;
|
||
}
|
||
|
||
if (*p == NULL && !(attribute->flags & GDB_XML_AF_OPTIONAL))
|
||
{
|
||
gdb_xml_error (this, _("Required attribute \"%s\" of "
|
||
"<%s> not specified"),
|
||
attribute->name, element->name);
|
||
continue;
|
||
}
|
||
|
||
if (*p == NULL)
|
||
continue;
|
||
|
||
gdb_xml_debug (this, _("Parsing attribute %s=\"%s\""),
|
||
attribute->name, val);
|
||
|
||
if (attribute->handler)
|
||
parsed_value = attribute->handler (this, attribute, val);
|
||
else
|
||
parsed_value = xstrdup (val);
|
||
|
||
attributes.emplace_back (attribute->name, parsed_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 (this, _("Ignoring unknown attribute %s"), *p);
|
||
}
|
||
}
|
||
|
||
/* Call the element handler if there is one. */
|
||
if (element->start_handler)
|
||
element->start_handler (this, element, m_user_data, attributes);
|
||
|
||
/* Fill in a new scope level. Note that we must delay getting a
|
||
back reference till here because above we might have recursed,
|
||
which may have reallocated the vector which invalidates
|
||
iterators/pointers/references. */
|
||
scope_level &new_scope = m_scopes.back ();
|
||
new_scope.element = element;
|
||
new_scope.elements = element->children;
|
||
}
|
||
|
||
/* 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 = (struct gdb_xml_parser *) data;
|
||
|
||
try
|
||
{
|
||
parser->start_element (name, attrs);
|
||
}
|
||
catch (gdb_exception &ex)
|
||
{
|
||
parser->set_error (std::move (ex));
|
||
}
|
||
}
|
||
|
||
/* Handle the end of an element. NAME is the current element. */
|
||
|
||
void
|
||
gdb_xml_parser::end_element (const XML_Char *name)
|
||
{
|
||
if (m_error.reason < 0)
|
||
return;
|
||
|
||
struct scope_level *scope = &m_scopes.back ();
|
||
const struct gdb_xml_element *element;
|
||
unsigned int seen;
|
||
|
||
gdb_xml_debug (this, _("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 (this, _("Required element <%s> is missing"),
|
||
element->name);
|
||
|
||
/* Call the element processor. */
|
||
if (scope->element != NULL && scope->element->end_handler)
|
||
{
|
||
const char *body;
|
||
|
||
if (scope->body.empty ())
|
||
body = "";
|
||
else
|
||
{
|
||
int length;
|
||
|
||
length = scope->body.size ();
|
||
body = scope->body.c_str ();
|
||
|
||
/* Strip leading and trailing whitespace. */
|
||
while (length > 0 && ISSPACE (body[length - 1]))
|
||
length--;
|
||
scope->body.erase (length);
|
||
while (*body && ISSPACE (*body))
|
||
body++;
|
||
}
|
||
|
||
scope->element->end_handler (this, scope->element,
|
||
m_user_data, body);
|
||
}
|
||
else if (scope->element == NULL)
|
||
XML_DefaultCurrent (m_expat_parser);
|
||
|
||
/* Pop the scope level. */
|
||
m_scopes.pop_back ();
|
||
}
|
||
|
||
/* 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 = (struct gdb_xml_parser *) data;
|
||
|
||
try
|
||
{
|
||
parser->end_element (name);
|
||
}
|
||
catch (gdb_exception &ex)
|
||
{
|
||
parser->set_error (std::move (ex));
|
||
}
|
||
}
|
||
|
||
/* Free a parser and all its associated state. */
|
||
|
||
gdb_xml_parser::~gdb_xml_parser ()
|
||
{
|
||
XML_ParserFree (m_expat_parser);
|
||
}
|
||
|
||
/* Initialize a parser. */
|
||
|
||
gdb_xml_parser::gdb_xml_parser (const char *name,
|
||
const gdb_xml_element *elements,
|
||
void *user_data)
|
||
: m_name (name),
|
||
m_user_data (user_data),
|
||
m_last_line (0),
|
||
m_dtd_name (NULL),
|
||
m_is_xinclude (false)
|
||
{
|
||
m_expat_parser = XML_ParserCreateNS (NULL, '!');
|
||
if (m_expat_parser == NULL)
|
||
malloc_failure (0);
|
||
|
||
XML_SetUserData (m_expat_parser, this);
|
||
|
||
/* Set the callbacks. */
|
||
XML_SetElementHandler (m_expat_parser, gdb_xml_start_element_wrapper,
|
||
gdb_xml_end_element_wrapper);
|
||
XML_SetCharacterDataHandler (m_expat_parser, gdb_xml_body_text);
|
||
|
||
/* Initialize the outer scope. */
|
||
m_scopes.emplace_back (elements);
|
||
}
|
||
|
||
/* 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)
|
||
{
|
||
XML_Parser entity_parser;
|
||
const char *text;
|
||
enum XML_Status status;
|
||
|
||
if (systemId == NULL)
|
||
{
|
||
gdb_xml_parser *parser
|
||
= (gdb_xml_parser *) XML_GetUserData (expat_parser);
|
||
|
||
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;
|
||
}
|
||
|
||
void
|
||
gdb_xml_parser::use_dtd (const char *dtd_name)
|
||
{
|
||
enum XML_Error err;
|
||
|
||
m_dtd_name = dtd_name;
|
||
|
||
XML_SetParamEntityParsing (m_expat_parser,
|
||
XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE);
|
||
XML_SetExternalEntityRefHandler (m_expat_parser,
|
||
gdb_xml_fetch_external_entity);
|
||
|
||
/* Even if no DTD is provided, use the built-in DTD anyway. */
|
||
err = XML_UseForeignDTD (m_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_parser::parse (const char *buffer)
|
||
{
|
||
enum XML_Status status;
|
||
const char *error_string;
|
||
|
||
gdb_xml_debug (this, _("Starting:\n%s"), buffer);
|
||
|
||
status = XML_Parse (m_expat_parser, buffer, strlen (buffer), 1);
|
||
|
||
if (status == XML_STATUS_OK && m_error.reason == 0)
|
||
return 0;
|
||
|
||
if (m_error.reason == RETURN_ERROR
|
||
&& m_error.error == XML_PARSE_ERROR)
|
||
{
|
||
gdb_assert (m_error.message != NULL);
|
||
error_string = m_error.what ();
|
||
}
|
||
else if (status == XML_STATUS_ERROR)
|
||
{
|
||
enum XML_Error err = XML_GetErrorCode (m_expat_parser);
|
||
|
||
error_string = XML_ErrorString (err);
|
||
}
|
||
else
|
||
{
|
||
gdb_assert (m_error.reason < 0);
|
||
throw_exception (std::move (m_error));
|
||
}
|
||
|
||
if (m_last_line != 0)
|
||
warning (_("while parsing %s (at line %d): %s"), m_name,
|
||
m_last_line, error_string);
|
||
else
|
||
warning (_("while parsing %s: %s"), m_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)
|
||
{
|
||
gdb_xml_parser parser (name, elements, user_data);
|
||
if (dtd_name != NULL)
|
||
parser.use_dtd (dtd_name);
|
||
return parser.parse (document);
|
||
}
|
||
|
||
/* 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
|
||
= (const struct gdb_xml_enum *) attribute->handler_data;
|
||
void *ret;
|
||
|
||
for (enums = (const struct gdb_xml_enum *) 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
|
||
{
|
||
xinclude_parsing_data (std::string &output_,
|
||
xml_fetch_another fetcher_, void *fetcher_baton_,
|
||
int include_depth_)
|
||
: output (output_),
|
||
skip_depth (0),
|
||
include_depth (include_depth_),
|
||
fetcher (fetcher_),
|
||
fetcher_baton (fetcher_baton_)
|
||
{}
|
||
|
||
/* Where the output goes. */
|
||
std::string &output;
|
||
|
||
/* 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,
|
||
std::vector<gdb_xml_value> &attributes)
|
||
{
|
||
struct xinclude_parsing_data *data
|
||
= (struct xinclude_parsing_data *) user_data;
|
||
char *href = (char *) xml_find_attribute (attributes, "href")->value.get ();
|
||
|
||
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);
|
||
|
||
gdb::optional<gdb::char_vector> text
|
||
= data->fetcher (href, data->fetcher_baton);
|
||
if (!text)
|
||
gdb_xml_error (parser, _("Could not load XML document \"%s\""), href);
|
||
|
||
if (!xml_process_xincludes (data->output, parser->name (),
|
||
text->data (), data->fetcher,
|
||
data->fetcher_baton,
|
||
data->include_depth + 1))
|
||
gdb_xml_error (parser, _("Parsing \"%s\" failed"), href);
|
||
|
||
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
|
||
= (struct xinclude_parsing_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 = (struct gdb_xml_parser *) data_;
|
||
xinclude_parsing_data *data = (xinclude_parsing_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. */
|
||
data->output.append (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 = (struct gdb_xml_parser *) data_;
|
||
xinclude_parsing_data *data = (xinclude_parsing_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 = (struct gdb_xml_parser *) data_;
|
||
xinclude_parsing_data *data = (xinclude_parsing_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. */
|
||
}
|
||
|
||
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. */
|
||
|
||
bool
|
||
xml_process_xincludes (std::string &result,
|
||
const char *name, const char *text,
|
||
xml_fetch_another fetcher, void *fetcher_baton,
|
||
int depth)
|
||
{
|
||
xinclude_parsing_data data (result, fetcher, fetcher_baton, depth);
|
||
|
||
gdb_xml_parser parser (name, xinclude_elements, &data);
|
||
parser.set_is_xinclude (true);
|
||
|
||
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);
|
||
|
||
parser.use_dtd ("xinclude.dtd");
|
||
|
||
if (parser.parse (text) == 0)
|
||
{
|
||
if (depth == 0)
|
||
gdb_xml_debug (&parser, _("XInclude processing succeeded."));
|
||
return true;
|
||
}
|
||
|
||
return false;
|
||
}
|
||
#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 *const (*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);
|
||
}
|
||
|
||
gdb::optional<gdb::char_vector>
|
||
xml_fetch_content_from_file (const char *filename, void *baton)
|
||
{
|
||
const char *dirname = (const char *) baton;
|
||
gdb_file_up file;
|
||
|
||
if (dirname && *dirname)
|
||
{
|
||
char *fullname = concat (dirname, "/", filename, (char *) NULL);
|
||
|
||
file = gdb_fopen_cloexec (fullname, FOPEN_RB);
|
||
xfree (fullname);
|
||
}
|
||
else
|
||
file = gdb_fopen_cloexec (filename, FOPEN_RB);
|
||
|
||
if (file == NULL)
|
||
return {};
|
||
|
||
/* Read in the whole file. */
|
||
|
||
size_t len;
|
||
|
||
if (fseek (file.get (), 0, SEEK_END) == -1)
|
||
perror_with_name (_("seek to end of file"));
|
||
len = ftell (file.get ());
|
||
rewind (file.get ());
|
||
|
||
gdb::char_vector text (len + 1);
|
||
|
||
if (fread (text.data (), 1, len, file.get ()) != len
|
||
|| ferror (file.get ()))
|
||
{
|
||
warning (_("Read error from \"%s\""), filename);
|
||
return {};
|
||
}
|
||
|
||
text.back () = '\0';
|
||
return text;
|
||
}
|
||
|
||
void _initialize_xml_support ();
|
||
void _initialize_xml_support ();
|
||
void
|
||
_initialize_xml_support ()
|
||
{
|
||
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);
|
||
}
|