This patch makes the following 2 modification:
1) Search all possible paths for extensions. Previously if one path, e.g.
"/usr/lib64/crash/extensions" exists, but no extensions found within,
crash will not search any later paths, e.g. "./extensions". This patch
will let crash continue to search any later paths.
2) Allow preload one/all extensions via preload_extensions(). If name of one
extension is given, the preload_extensions() will load it, otherwise all
extensions will load. This will make preload_extensions(NULL) behave the
same as before.
Signed-off-by: Tao Liu <l...@redhat.com>
---
defs.h | 2 +-
extensions.c | 83 +++++++++++++++++++++++++++++++---------------------
main.c | 2 +-
3 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/defs.h b/defs.h
index 4fecb83..573759c 100644
--- a/defs.h
+++ b/defs.h
@@ -6184,7 +6184,7 @@ void register_extension(struct command_table_entry *);
void dump_extension_table(int);
void load_extension(char *);
void unload_extension(char *);
-void preload_extensions(void);
+void preload_extensions(char *);
/* Hooks for sial */
unsigned long get_curtask(void);
char *crash_global_cmd(void);
diff --git a/extensions.c b/extensions.c
index d23b1e3..2b3b736 100644
--- a/extensions.c
+++ b/extensions.c
@@ -19,7 +19,7 @@
#include <dlfcn.h>
static int in_extensions_library(char *, char *);
-static char *get_extensions_directory(char *);
+static char *get_extensions_directory(char *, bool *);
static void show_all_extensions(void);
static void show_extensions(char *);
@@ -395,51 +395,58 @@ in_extensions_library(char *lib, char *buf)
* Look for an extensions directory using the proper order.
*/
static char *
-get_extensions_directory(char *dirbuf)
+get_extensions_directory(char *dirbuf, bool *end)
{
- char *env;
+ static int index = 0;
+ char *dirs[] = {
+ getenv("CRASH_EXTENSIONS"),
+ "/usr/lib64/crash/extensions",
+ "/usr/lib/crash/extensions",
+ "./extensions",
+ };
+ char *dir;
- if ((env = getenv("CRASH_EXTENSIONS"))) {
- if (is_directory(env)) {
- strcpy(dirbuf, env);
- return dirbuf;
- }
+retry:
+ if (index >= sizeof(dirs) / sizeof(char *)) {
+ *end = true;
+ return NULL;
}
-
- if (BITS64()) {
- sprintf(dirbuf, "/usr/lib64/crash/extensions");
- if (is_directory(dirbuf))
- return dirbuf;
+ *end = false;
+ dir = dirs[index++];
+ if (is_directory(dir)) {
+ if (!BITS64() && strstr(dir, "/usr/lib64")) {
+ goto retry;
+ }
+ snprintf(dirbuf, BUFSIZE, "%s", dir);
+ return dir;
+ } else {
+ return NULL;
}
-
- sprintf(dirbuf, "/usr/lib/crash/extensions");
- if (is_directory(dirbuf))
- return dirbuf;
-
- sprintf(dirbuf, "./extensions");
- if (is_directory(dirbuf))
- return dirbuf;
-
- return NULL;
}
void
-preload_extensions(void)
+preload_extensions(char *so_name)
{
DIR *dirp;
struct dirent *dp;
char dirbuf[BUFSIZE];
char filename[BUFSIZE*2];
int found;
+ bool end;
- if (!get_extensions_directory(dirbuf))
- return;
+next_dir:
+ if (!get_extensions_directory(dirbuf, &end)) {
+ if (end)
+ return;
+ else
+ goto next_dir;
+ }
dirp = opendir(dirbuf);
if (!dirp) {
error(INFO, "%s: %s\n", dirbuf, strerror(errno));
- return;
+ goto next_dir;
}
pc->curcmd = pc->program_name;
@@ -452,19 +459,27 @@ preload_extensions(void)
if (!is_shared_object(filename))
continue;
- found++;
-
- load_extension(dp->d_name);
+ if (!so_name) {
+ found++;
+ load_extension(dp->d_name);
+ } else if (so_name && !strcmp(so_name, dp->d_name)) {
+ found++;
+ load_extension(dp->d_name);
+ break;
+ }
}
closedir(dirp);
if (found)
fprintf(fp, "\n");
- else
- error(NOTE,
- "%s: no extension modules found in directory\n\n",
- dirbuf);
+ else {
+ if (!so_name || (so_name && CRASHDEBUG(1)))
+ error(NOTE,
+ "%s: no extension modules found in directory\n\n",
+ dirbuf);
+ goto next_dir;
+ }
}
/*
diff --git a/main.c b/main.c
index 71bcc15..70506f3 100644
--- a/main.c
+++ b/main.c
@@ -820,7 +820,7 @@ main_loop(void)
pc->flags |= RUNTIME;
if (pc->flags & PRELOAD_EXTENSIONS)
- preload_extensions();
+ preload_extensions(NULL);
/*
* Return here if a non-recoverable error occurs
--
2.47.0
--
Crash-utility mailing list -- devel@lists.crash-utility.osci.io
To unsubscribe send an email to devel-le...@lists.crash-utility.osci.io
https://${domain_name}/admin/lists/devel.lists.crash-utility.osci.io/
Contribution Guidelines: https://github.com/crash-utility/crash/wiki
