X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fauto-load.c;h=1dfcf21eeebf220853371342e1c0c92bf78f7f65;hb=f960a6176a3185a013db507c29d99d8c92eb21b9;hp=33d282afe83b8d8da0a49dc6477844512e08b6b2;hpb=6e22e10d63addd60f39114cef81ade290b15b2c8;p=binutils-gdb.git diff --git a/gdb/auto-load.c b/gdb/auto-load.c index 33d282afe83..1dfcf21eeeb 100644 --- a/gdb/auto-load.c +++ b/gdb/auto-load.c @@ -1,6 +1,6 @@ /* GDB routines for supporting auto-loaded scripts. - Copyright (C) 2012-2018 Free Software Foundation, Inc. + Copyright (C) 2012-2021 Free Software Foundation, Inc. This file is part of GDB. @@ -36,11 +36,12 @@ #include "completer.h" #include "fnmatch.h" #include "top.h" -#include "filestuff.h" +#include "gdbsupport/filestuff.h" #include "extension.h" #include "gdb/section-scripts.h" #include -#include "common/pathstuff.h" +#include "gdbsupport/pathstuff.h" +#include "cli/cli-style.h" /* The section to look in for auto-loaded scripts (in file formats that support sections). @@ -60,8 +61,9 @@ static void maybe_print_script_not_found_warning const struct extension_language_defn *language, const char *section_name, unsigned offset); -/* Value of the 'set debug auto-load' configuration variable. */ -static int debug_auto_load = 0; +/* See auto-load.h. */ + +bool debug_auto_load = false; /* "show" command for the debug_auto_load configuration variable. */ @@ -79,7 +81,7 @@ show_debug_auto_load (struct ui_file *file, int from_tty, set auto-load gdb-scripts on|off This is true if we should auto-load associated scripts when an objfile is opened, false otherwise. */ -static int auto_load_gdb_scripts = 1; +static bool auto_load_gdb_scripts = true; /* "show" command for the auto_load_gdb_scripts configuration variable. */ @@ -92,9 +94,9 @@ show_auto_load_gdb_scripts (struct ui_file *file, int from_tty, value); } -/* Return non-zero if auto-loading gdb scripts is enabled. */ +/* See auto-load.h. */ -int +bool auto_load_gdb_scripts_enabled (const struct extension_language_defn *extlang) { return auto_load_gdb_scripts; @@ -110,16 +112,16 @@ auto_load_gdb_scripts_enabled (const struct extension_language_defn *extlang) This flag exists to facilitate deferring auto-loading during start-up until after ./.gdbinit has been read; it may augment the search directories used to find the scripts. */ -int global_auto_load = 1; +bool global_auto_load = true; /* Auto-load .gdbinit file from the current directory? */ -int auto_load_local_gdbinit = 1; +bool auto_load_local_gdbinit = true; /* Absolute pathname to the current directory .gdbinit, if it exists. */ char *auto_load_local_gdbinit_pathname = NULL; -/* Boolean value if AUTO_LOAD_LOCAL_GDBINIT_PATHNAME has been loaded. */ -int auto_load_local_gdbinit_loaded = 0; +/* if AUTO_LOAD_LOCAL_GDBINIT_PATHNAME has been loaded. */ +bool auto_load_local_gdbinit_loaded = false; /* "show" command for the auto_load_local_gdbinit configuration variable. */ @@ -169,7 +171,7 @@ static char *auto_load_safe_path; /* Vector of directory elements of AUTO_LOAD_SAFE_PATH with each one normalized by tilde_expand and possibly each entries has added its gdb_realpath counterpart. */ -std::vector> auto_load_safe_path_vec; +static std::vector> auto_load_safe_path_vec; /* Expand $datadir and $debugdir in STRING according to the rules of substitute_path_component. */ @@ -178,12 +180,11 @@ static std::vector> auto_load_expand_dir_vars (const char *string) { char *s = xstrdup (string); - substitute_path_component (&s, "$datadir", gdb_datadir); + substitute_path_component (&s, "$datadir", gdb_datadir.c_str ()); substitute_path_component (&s, "$debugdir", debug_file_directory); if (debug_auto_load && strcmp (s, string) != 0) - fprintf_unfiltered (gdb_stdlog, - _("auto-load: Expanded $-variables to \"%s\".\n"), s); + auto_load_debug_printf ("Expanded $-variables to \"%s\".", s); std::vector> dir_vec = dirnames_to_char_ptr_vec (s); @@ -197,10 +198,8 @@ auto_load_expand_dir_vars (const char *string) static void auto_load_safe_path_vec_update (void) { - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, - _("auto-load: Updating directories of \"%s\".\n"), - auto_load_safe_path); + auto_load_debug_printf ("Updating directories of \"%s\".", + auto_load_safe_path); auto_load_safe_path_vec = auto_load_expand_dir_vars (auto_load_safe_path); size_t len = auto_load_safe_path_vec.size (); @@ -221,23 +220,18 @@ auto_load_safe_path_vec_update (void) if (debug_auto_load) { if (strcmp (in_vec.get (), original.get ()) == 0) - fprintf_unfiltered (gdb_stdlog, - _("auto-load: Using directory \"%s\".\n"), - in_vec.get ()); + auto_load_debug_printf ("Using directory \"%s\".", + in_vec.get ()); else - fprintf_unfiltered (gdb_stdlog, - _("auto-load: Resolved directory \"%s\" " - "as \"%s\".\n"), - original.get (), in_vec.get ()); + auto_load_debug_printf ("Resolved directory \"%s\" as \"%s\".", + original.get (), in_vec.get ()); } /* If gdb_realpath returns a different content, append it. */ if (strcmp (real_path.get (), in_vec.get ()) != 0) { - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, - _("auto-load: And canonicalized as \"%s\".\n"), - real_path.get ()); + auto_load_debug_printf ("And canonicalized as \"%s\".", + real_path.get ()); auto_load_safe_path_vec.push_back (std::move (real_path)); } @@ -337,10 +331,8 @@ filename_is_in_pattern_1 (char *filename, char *pattern) size_t pattern_len = strlen (pattern); size_t filename_len = strlen (filename); - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, _("auto-load: Matching file \"%s\" " - "to pattern \"%s\"\n"), - filename, pattern); + auto_load_debug_printf ("Matching file \"%s\" to pattern \"%s\"", + filename, pattern); /* Trim trailing slashes ("/") from PATTERN. Even for "d:\" paths as trailing slashes are trimmed also from FILENAME it still matches @@ -354,35 +346,28 @@ filename_is_in_pattern_1 (char *filename, char *pattern) IS_DIR_SEPARATOR character, such as the 'C:\x.exe' filename. */ if (pattern_len == 0) { - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, - _("auto-load: Matched - empty pattern\n")); + auto_load_debug_printf ("Matched - empty pattern"); return 1; } for (;;) { /* Trim trailing slashes ("/"). PATTERN also has slashes trimmed the - same way so they will match. */ + same way so they will match. */ while (filename_len && IS_DIR_SEPARATOR (filename[filename_len - 1])) filename_len--; filename[filename_len] = '\0'; if (filename_len == 0) { - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, - _("auto-load: Not matched - pattern \"%s\".\n"), - pattern); + auto_load_debug_printf ("Not matched - pattern \"%s\".", pattern); return 0; } if (gdb_filename_fnmatch (pattern, filename, FNM_FILE_NAME | FNM_NOESCAPE) == 0) { - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, _("auto-load: Matched - file " - "\"%s\" to pattern \"%s\".\n"), - filename, pattern); + auto_load_debug_printf ("Matched - file \"%s\" to pattern \"%s\".", + filename, pattern); return 1; } @@ -433,10 +418,8 @@ filename_is_in_auto_load_safe_path_vec (const char *filename, { *filename_realp = gdb_realpath (filename); if (debug_auto_load && strcmp (filename_realp->get (), filename) != 0) - fprintf_unfiltered (gdb_stdlog, - _("auto-load: Resolved " - "file \"%s\" as \"%s\".\n"), - filename, filename_realp->get ()); + auto_load_debug_printf ("Resolved file \"%s\" as \"%s\".", + filename, filename_realp->get ()); } if (strcmp (filename_realp->get (), filename) != 0) @@ -450,57 +433,56 @@ filename_is_in_auto_load_safe_path_vec (const char *filename, if (pattern != NULL) { - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, _("auto-load: File \"%s\" matches " - "directory \"%s\".\n"), - filename, pattern); + auto_load_debug_printf ("File \"%s\" matches directory \"%s\".", + filename, pattern); return 1; } return 0; } -/* Return 1 if FILENAME is located in one of the directories of - AUTO_LOAD_SAFE_PATH. Otherwise call warning and return 0. FILENAME does - not have to be an absolute path. +/* See auto-load.h. */ - Existence of FILENAME is not checked. Function will still give a warning - even if the caller would quietly skip non-existing file in unsafe - directory. */ - -int -file_is_auto_load_safe (const char *filename, const char *debug_fmt, ...) +bool +file_is_auto_load_safe (const char *filename) { gdb::unique_xmalloc_ptr filename_real; - static int advice_printed = 0; - - if (debug_auto_load) - { - va_list debug_args; - - va_start (debug_args, debug_fmt); - vfprintf_unfiltered (gdb_stdlog, debug_fmt, debug_args); - va_end (debug_args); - } + static bool advice_printed = false; if (filename_is_in_auto_load_safe_path_vec (filename, &filename_real)) - return 1; + return true; auto_load_safe_path_vec_update (); if (filename_is_in_auto_load_safe_path_vec (filename, &filename_real)) - return 1; + return true; - warning (_("File \"%s\" auto-loading has been declined by your " + warning (_("File \"%ps\" auto-loading has been declined by your " "`auto-load safe-path' set to \"%s\"."), - filename_real.get (), auto_load_safe_path); + styled_string (file_name_style.style (), filename_real.get ()), + auto_load_safe_path); if (!advice_printed) { - const char *homedir = getenv ("HOME"); - - if (homedir == NULL) - homedir = "$HOME"; - std::string homeinit = string_printf ("%s/%s", homedir, gdbinit); + /* Find the existing home directory config file. */ + struct stat buf; + std::string home_config = find_gdb_home_config_file (GDBINIT, &buf); + if (home_config.empty ()) + { + /* The user doesn't have an existing home directory config file, + so we should suggest a suitable path for them to use. */ + std::string config_dir_file + = get_standard_config_filename (GDBINIT); + if (!config_dir_file.empty ()) + home_config = config_dir_file; + else + { + const char *homedir = getenv ("HOME"); + if (homedir == nullptr) + homedir = "$HOME"; + home_config = (std::string (homedir) + SLASH_STRING + + std::string (GDBINIT)); + } + } printf_filtered (_("\ To enable execution of this file add\n\ @@ -513,11 +495,11 @@ For more information about this security protection see the\n\ \"Auto-loading safe path\" section in the GDB manual. E.g., run from the shell:\n\ \tinfo \"(gdb)Auto-loading safe path\"\n"), filename_real.get (), - homeinit.c_str (), homeinit.c_str ()); - advice_printed = 1; + home_config.c_str (), home_config.c_str ()); + advice_printed = true; } - return 0; + return false; } /* For scripts specified in .debug_gdb_scripts, multiple objfiles may load @@ -529,16 +511,16 @@ struct auto_load_pspace_info { /* For each program space we keep track of loaded scripts, both when specified as file names and as scripts to be executed directly. */ - struct htab *loaded_script_files; - struct htab *loaded_script_texts; + htab_up loaded_script_files; + htab_up loaded_script_texts; /* Non-zero if we've issued the warning about an auto-load script not being supported. We only want to issue this warning once. */ - int unsupported_script_warning_printed; + bool unsupported_script_warning_printed = false; /* Non-zero if we've issued the warning about an auto-load script not being found. We only want to issue this warning once. */ - int script_not_found_warning_printed; + bool script_not_found_warning_printed = false; }; /* Objects of this type are stored in the loaded_script hash table. */ @@ -552,26 +534,15 @@ struct loaded_script inaccessible), or NULL for loaded_script_texts. */ const char *full_path; - /* Non-zero if this script has been loaded. */ - int loaded; + /* True if this script has been loaded. */ + bool loaded; const struct extension_language_defn *language; }; /* Per-program-space data key. */ -static const struct program_space_data *auto_load_pspace_data; - -static void -auto_load_pspace_data_cleanup (struct program_space *pspace, void *arg) -{ - struct auto_load_pspace_info *info = (struct auto_load_pspace_info *) arg; - - if (info->loaded_script_files) - htab_delete (info->loaded_script_files); - if (info->loaded_script_texts) - htab_delete (info->loaded_script_texts); - xfree (info); -} +static const struct program_space_key + auto_load_pspace_data; /* Get the current autoload data. If none is found yet, add it now. This function always returns a valid object. */ @@ -581,13 +552,9 @@ get_auto_load_pspace_data (struct program_space *pspace) { struct auto_load_pspace_info *info; - info = ((struct auto_load_pspace_info *) - program_space_data (pspace, auto_load_pspace_data)); + info = auto_load_pspace_data.get (pspace); if (info == NULL) - { - info = XCNEW (struct auto_load_pspace_info); - set_program_space_data (pspace, auto_load_pspace_data, info); - } + info = auto_load_pspace_data.emplace (pspace); return info; } @@ -623,17 +590,19 @@ init_loaded_scripts_info (struct auto_load_pspace_info *pspace_info) Space for each entry is obtained with one malloc so we can free them easily. */ - pspace_info->loaded_script_files = htab_create (31, - hash_loaded_script_entry, - eq_loaded_script_entry, - xfree); - pspace_info->loaded_script_texts = htab_create (31, - hash_loaded_script_entry, - eq_loaded_script_entry, - xfree); - - pspace_info->unsupported_script_warning_printed = FALSE; - pspace_info->script_not_found_warning_printed = FALSE; + pspace_info->loaded_script_files.reset + (htab_create (31, + hash_loaded_script_entry, + eq_loaded_script_entry, + xfree)); + pspace_info->loaded_script_texts.reset + (htab_create (31, + hash_loaded_script_entry, + eq_loaded_script_entry, + xfree)); + + pspace_info->unsupported_script_warning_printed = false; + pspace_info->script_not_found_warning_printed = false; } /* Wrapper on get_auto_load_pspace_data to also allocate the hash table @@ -652,24 +621,24 @@ get_auto_load_pspace_data_for_loading (struct program_space *pspace) } /* Add script file NAME in LANGUAGE to hash table of PSPACE_INFO. - LOADED 1 if the script has been (is going to) be loaded, 0 otherwise - (such as if it has not been found). + LOADED is true if the script has been (is going to) be loaded, false + otherwise (such as if it has not been found). FULL_PATH is NULL if the script wasn't found. + The result is true if the script was already in the hash table. */ -static int -maybe_add_script_file (struct auto_load_pspace_info *pspace_info, int loaded, +static bool +maybe_add_script_file (struct auto_load_pspace_info *pspace_info, bool loaded, const char *name, const char *full_path, const struct extension_language_defn *language) { - struct htab *htab = pspace_info->loaded_script_files; + struct htab *htab = pspace_info->loaded_script_files.get (); struct loaded_script **slot, entry; - int in_hash_table; entry.name = name; entry.language = language; slot = (struct loaded_script **) htab_find_slot (htab, &entry, INSERT); - in_hash_table = *slot != NULL; + bool in_hash_table = *slot != NULL; /* If this script is not in the hash table, add it. */ @@ -701,23 +670,23 @@ maybe_add_script_file (struct auto_load_pspace_info *pspace_info, int loaded, } /* Add script contents NAME in LANGUAGE to hash table of PSPACE_INFO. - LOADED 1 if the script has been (is going to) be loaded, 0 otherwise - (such as if it has not been found). + LOADED is true if the script has been (is going to) be loaded, false + otherwise (such as if it has not been found). + The result is true if the script was already in the hash table. */ -static int +static bool maybe_add_script_text (struct auto_load_pspace_info *pspace_info, - int loaded, const char *name, + bool loaded, const char *name, const struct extension_language_defn *language) { - struct htab *htab = pspace_info->loaded_script_texts; + struct htab *htab = pspace_info->loaded_script_texts.get (); struct loaded_script **slot, entry; - int in_hash_table; entry.name = name; entry.language = language; slot = (struct loaded_script **) htab_find_slot (htab, &entry, INSERT); - in_hash_table = *slot != NULL; + bool in_hash_table = *slot != NULL; /* If this script is not in the hash table, add it. */ @@ -747,17 +716,9 @@ clear_section_scripts (void) struct program_space *pspace = current_program_space; struct auto_load_pspace_info *info; - info = ((struct auto_load_pspace_info *) - program_space_data (pspace, auto_load_pspace_data)); + info = auto_load_pspace_data.get (pspace); if (info != NULL && info->loaded_script_files != NULL) - { - htab_delete (info->loaded_script_files); - htab_delete (info->loaded_script_texts); - info->loaded_script_files = NULL; - info->loaded_script_texts = NULL; - info->unsupported_script_warning_printed = FALSE; - info->script_not_found_warning_printed = FALSE; - } + auto_load_pspace_data.clear (pspace); } /* Look for the auto-load script in LANGUAGE associated with OBJFILE where @@ -776,9 +737,10 @@ auto_load_objfile_script_1 (struct objfile *objfile, const char *realname, gdb_file_up input = gdb_fopen_cloexec (filename.c_str (), "r"); debugfile = filename.c_str (); - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, _("auto-load: Attempted file \"%s\" %s.\n"), - debugfile, input ? _("exists") : _("does not exist")); + + auto_load_debug_printf ("Attempted file \"%s\" %s.", + debugfile, + input != nullptr ? "exists" : "does not exist"); std::string debugfile_holder; if (!input) @@ -789,10 +751,14 @@ auto_load_objfile_script_1 (struct objfile *objfile, const char *realname, std::vector> vec = auto_load_expand_dir_vars (auto_load_dir); - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, _("auto-load: Searching 'set auto-load " - "scripts-directory' path \"%s\".\n"), - auto_load_dir); + auto_load_debug_printf + ("Searching 'set auto-load scripts-directory' path \"%s\".", + auto_load_dir); + + /* Convert Windows file name from c:/dir/file to /c/dir/file. */ + if (HAS_DRIVE_SPEC (debugfile)) + filename = (std::string("\\") + debugfile[0] + + STRIP_DRIVE_SPEC (debugfile)); for (const gdb::unique_xmalloc_ptr &dir : vec) { @@ -801,11 +767,13 @@ auto_load_objfile_script_1 (struct objfile *objfile, const char *realname, debugfile = debugfile_holder.c_str (); input = gdb_fopen_cloexec (debugfile, "r"); - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, _("auto-load: Attempted file " - "\"%s\" %s.\n"), - debugfile, - input ? _("exists") : _("does not exist")); + + auto_load_debug_printf ("Attempted file \"%s\" %s.", + debugfile, + (input != nullptr + ? "exists" + : "does not exist")); + if (input != NULL) break; } @@ -813,15 +781,13 @@ auto_load_objfile_script_1 (struct objfile *objfile, const char *realname, if (input) { - int is_safe; struct auto_load_pspace_info *pspace_info; - is_safe - = file_is_auto_load_safe (debugfile, - _("auto-load: Loading %s script \"%s\"" - " by extension for objfile \"%s\".\n"), - ext_lang_name (language), - debugfile, objfile_name (objfile)); + auto_load_debug_printf + ("Loading %s script \"%s\" by extension for objfile \"%s\".", + ext_lang_name (language), debugfile, objfile_name (objfile)); + + bool is_safe = file_is_auto_load_safe (debugfile); /* Add this script to the hash table too so "info auto-load ${lang}-scripts" can print it. */ @@ -877,10 +843,11 @@ auto_load_objfile_script (struct objfile *objfile, { len -= lexe; realname.get ()[len] = '\0'; - if (debug_auto_load) - fprintf_unfiltered (gdb_stdlog, _("auto-load: Stripped .exe suffix, " - "retrying with \"%s\".\n"), - realname.get ()); + + auto_load_debug_printf + ("auto-load: Stripped .exe suffix, retrying with \"%s\".", + realname.get ()); + auto_load_objfile_script_1 (objfile, realname.get (), language); } } @@ -897,7 +864,6 @@ source_script_file (struct auto_load_pspace_info *pspace_info, const char *section_name, unsigned int offset, const char *file) { - int in_hash_table; objfile_script_sourcer_func *sourcer; /* Skip this script if support is not compiled in. */ @@ -924,13 +890,12 @@ source_script_file (struct auto_load_pspace_info *pspace_info, if (opened) { - if (!file_is_auto_load_safe (opened->full_path.get (), - _("auto-load: Loading %s script " - "\"%s\" from section \"%s\" of " - "objfile \"%s\".\n"), - ext_lang_name (language), - opened->full_path.get (), - section_name, objfile_name (objfile))) + auto_load_debug_printf + ("Loading %s script \"%s\" from section \"%s\" of objfile \"%s\".", + ext_lang_name (language), opened->full_path.get (), + section_name, objfile_name (objfile)); + + if (!file_is_auto_load_safe (opened->full_path.get ())) opened.reset (); } else @@ -947,11 +912,10 @@ source_script_file (struct auto_load_pspace_info *pspace_info, section_name, offset); } - in_hash_table = maybe_add_script_file (pspace_info, bool (opened), file, - (opened - ? opened->full_path.get () - : NULL), - language); + bool in_hash_table + = maybe_add_script_file (pspace_info, bool (opened), file, + (opened ? opened->full_path.get (): NULL), + language); /* If this file is not currently loaded, load it. */ if (opened && !in_hash_table) @@ -973,7 +937,6 @@ execute_script_contents (struct auto_load_pspace_info *pspace_info, objfile_script_executor_func *executor; const char *newline, *script_text; const char *name; - int is_safe, in_hash_table; /* The first line of the script is the name of the script. It must not contain any kind of space character. */ @@ -1001,8 +964,10 @@ execute_script_contents (struct auto_load_pspace_info *pspace_info, /* We don't throw an error, the program is still debuggable. */ warning (_("\ Missing/bad script name in entry at offset %u in section %s\n\ -of file %s."), - offset, section_name, objfile_name (objfile)); +of file %ps."), + offset, section_name, + styled_string (file_name_style.style (), + objfile_name (objfile))); return; } script_text = newline + 1; @@ -1025,14 +990,14 @@ of file %s."), return; } - is_safe = file_is_auto_load_safe (objfile_name (objfile), - _("auto-load: Loading %s script " - "\"%s\" from section \"%s\" of " - "objfile \"%s\".\n"), - ext_lang_name (language), name, - section_name, objfile_name (objfile)); + auto_load_debug_printf + ("Loading %s script \"%s\" from section \"%s\" of objfile \"%s\".", + ext_lang_name (language), name, section_name, objfile_name (objfile)); + + bool is_safe = file_is_auto_load_safe (objfile_name (objfile)); - in_hash_table = maybe_add_script_text (pspace_info, is_safe, name, language); + bool in_hash_table + = maybe_add_script_text (pspace_info, is_safe, name, language); /* If this file is not currently loaded, load it. */ if (is_safe && !in_hash_table) @@ -1128,19 +1093,21 @@ auto_load_section_scripts (struct objfile *objfile, const char *section_name) scripts_sect = bfd_get_section_by_name (abfd, section_name); if (scripts_sect == NULL - || (bfd_get_section_flags (abfd, scripts_sect) & SEC_HAS_CONTENTS) == 0) + || (bfd_section_flags (scripts_sect) & SEC_HAS_CONTENTS) == 0) return; if (!bfd_get_full_section_contents (abfd, scripts_sect, &data)) - warning (_("Couldn't read %s section of %s"), - section_name, bfd_get_filename (abfd)); + warning (_("Couldn't read %s section of %ps"), + section_name, + styled_string (file_name_style.style (), + bfd_get_filename (abfd))); else { gdb::unique_xmalloc_ptr data_holder (data); char *p = (char *) data; source_section_scripts (objfile, section_name, p, - p + bfd_get_section_size (scripts_sect)); + p + bfd_section_size (scripts_sect)); } } @@ -1298,7 +1265,7 @@ auto_load_info_scripts (const char *pattern, int from_tty, collect_matching_scripts_data data (&script_files, language); /* Pass a pointer to scripts as VEC_safe_push can realloc space. */ - htab_traverse_noresize (pspace_info->loaded_script_files, + htab_traverse_noresize (pspace_info->loaded_script_files.get (), collect_matching_scripts, &data); std::sort (script_files.begin (), script_files.end (), @@ -1310,7 +1277,7 @@ auto_load_info_scripts (const char *pattern, int from_tty, collect_matching_scripts_data data (&script_texts, language); /* Pass a pointer to scripts as VEC_safe_push can realloc space. */ - htab_traverse_noresize (pspace_info->loaded_script_texts, + htab_traverse_noresize (pspace_info->loaded_script_texts.get (), collect_matching_scripts, &data); std::sort (script_texts.begin (), script_texts.end (), @@ -1361,11 +1328,13 @@ info_auto_load_local_gdbinit (const char *args, int from_tty) if (auto_load_local_gdbinit_pathname == NULL) printf_filtered (_("Local .gdbinit file was not found.\n")); else if (auto_load_local_gdbinit_loaded) - printf_filtered (_("Local .gdbinit file \"%s\" has been loaded.\n"), - auto_load_local_gdbinit_pathname); + printf_filtered (_("Local .gdbinit file \"%ps\" has been loaded.\n"), + styled_string (file_name_style.style (), + auto_load_local_gdbinit_pathname)); else - printf_filtered (_("Local .gdbinit file \"%s\" has not been loaded.\n"), - auto_load_local_gdbinit_pathname); + printf_filtered (_("Local .gdbinit file \"%ps\" has not been loaded.\n"), + styled_string (file_name_style.style (), + auto_load_local_gdbinit_pathname)); } /* Print an "unsupported script" warning if it has not already been printed. @@ -1382,11 +1351,13 @@ maybe_print_unsupported_script_warning { warning (_("\ Unsupported auto-load script at offset %u in section %s\n\ -of file %s.\n\ +of file %ps.\n\ Use `info auto-load %s-scripts [REGEXP]' to list them."), - offset, section_name, objfile_name (objfile), + offset, section_name, + styled_string (file_name_style.style (), + objfile_name (objfile)), ext_lang_name (language)); - pspace_info->unsupported_script_warning_printed = 1; + pspace_info->unsupported_script_warning_printed = true; } } @@ -1404,11 +1375,13 @@ maybe_print_script_not_found_warning { warning (_("\ Missing auto-load script at offset %u in section %s\n\ -of file %s.\n\ +of file %ps.\n\ Use `info auto-load %s-scripts [REGEXP]' to list them."), - offset, section_name, objfile_name (objfile), + offset, section_name, + styled_string (file_name_style.style (), + objfile_name (objfile)), ext_lang_name (language)); - pspace_info->script_not_found_warning_printed = 1; + pspace_info->script_not_found_warning_printed = true; } } @@ -1460,15 +1433,6 @@ automatic loading of Python scripts."), return &retval; } -/* Command "show auto-load" displays summary of all the current - "show auto-load " settings. */ - -static void -show_auto_load_cmd (const char *args, int from_tty) -{ - cmd_show_list (*auto_load_show_cmdlist_get (), from_tty, ""); -} - /* Initialize "show auto-load " commands prefix and return it. */ struct cmd_list_element ** @@ -1477,12 +1441,12 @@ auto_load_show_cmdlist_get (void) static struct cmd_list_element *retval; if (retval == NULL) - add_prefix_cmd ("auto-load", class_maintenance, show_auto_load_cmd, _("\ + add_show_prefix_cmd ("auto-load", class_maintenance, _("\ Show auto-loading specific settings.\n\ Show configuration of various auto-load-specific variables such as\n\ automatic loading of Python scripts."), - &retval, "show auto-load ", - 0/*allow-unknown*/, &showlist); + &retval, "show auto-load ", + 0/*allow-unknown*/, &showlist); return &retval; } @@ -1530,18 +1494,15 @@ found and/or loaded."), return &retval; } +void _initialize_auto_load (); void -_initialize_auto_load (void) +_initialize_auto_load () { struct cmd_list_element *cmd; char *scripts_directory_help, *gdb_name_help, *python_name_help; char *guile_name_help; const char *suffix; - auto_load_pspace_data - = register_program_space_data_with_cleanup (NULL, - auto_load_pspace_data_cleanup); - gdb::observers::new_objfile.attach (auto_load_new_objfile); add_setshow_boolean_cmd ("gdb-scripts", class_support, @@ -1551,7 +1512,7 @@ Show whether auto-loading of canned sequences of commands scripts is enabled."), _("\ If enabled, canned sequences of commands are loaded when the debugger reads\n\ an executable or shared library.\n\ -This options has security implications for untrusted inferiors."), +This option has security implications for untrusted inferiors."), NULL, show_auto_load_gdb_scripts, auto_load_set_cmdlist_get (), auto_load_show_cmdlist_get ()); @@ -1569,7 +1530,7 @@ Show whether auto-loading .gdbinit script in current directory is enabled."), If enabled, canned sequences of commands are loaded when debugger starts\n\ from .gdbinit file in current directory. Such files are deprecated,\n\ use a script associated with inferior executable file instead.\n\ -This options has security implications for untrusted inferiors."), +This option has security implications for untrusted inferiors."), NULL, show_auto_load_local_gdbinit, auto_load_set_cmdlist_get (), auto_load_show_cmdlist_get ()); @@ -1647,7 +1608,7 @@ Setting this parameter to '/' (without the quotes) allows any file\n\ for the 'set auto-load ...' options. Each path entry can be also shell\n\ wildcard pattern; '*' does not match directory separator.\n\ This option is ignored for the kinds of files having 'set auto-load ... off'.\n\ -This options has security implications for untrusted inferiors."), +This option has security implications for untrusted inferiors."), set_auto_load_safe_path, show_auto_load_safe_path, auto_load_set_cmdlist_get (),