diff options
author | Matt Kraai <kraai@debian.org> | 2001-05-14 18:27:25 +0000 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2001-05-14 18:27:25 +0000 |
commit | 94964660445e941db0ae9df0d20cf9c92fc15ef4 (patch) | |
tree | e6aa648b71662941e51152d1cb964515b94b0c82 | |
parent | 14d354312a9d49a8b410516c20be57159af217a5 (diff) | |
download | busybox-w32-94964660445e941db0ae9df0d20cf9c92fc15ef4.tar.gz busybox-w32-94964660445e941db0ae9df0d20cf9c92fc15ef4.tar.bz2 busybox-w32-94964660445e941db0ae9df0d20cf9c92fc15ef4.zip |
Follow symbolic links when searching for modules.
-rw-r--r-- | insmod.c | 8 | ||||
-rw-r--r-- | modutils/insmod.c | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -124,7 +124,7 @@ | |||
124 | #ifndef MODUTILS_MODULE_H | 124 | #ifndef MODUTILS_MODULE_H |
125 | static const int MODUTILS_MODULE_H = 1; | 125 | static const int MODUTILS_MODULE_H = 1; |
126 | 126 | ||
127 | #ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $" | 127 | #ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $" |
128 | 128 | ||
129 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 129 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
130 | We do not use the kernel headers directly because we do not wish | 130 | We do not use the kernel headers directly because we do not wish |
@@ -330,7 +330,7 @@ int delete_module(const char *); | |||
330 | #ifndef MODUTILS_OBJ_H | 330 | #ifndef MODUTILS_OBJ_H |
331 | static const int MODUTILS_OBJ_H = 1; | 331 | static const int MODUTILS_OBJ_H = 1; |
332 | 332 | ||
333 | #ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $" | 333 | #ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $" |
334 | 334 | ||
335 | /* The relocatable object is manipulated using elfin types. */ | 335 | /* The relocatable object is manipulated using elfin types. */ |
336 | 336 | ||
@@ -3182,7 +3182,7 @@ extern int insmod_main( int argc, char **argv) | |||
3182 | char module_dir[FILENAME_MAX]; | 3182 | char module_dir[FILENAME_MAX]; |
3183 | snprintf (module_dir, sizeof(module_dir), "%s/%s", | 3183 | snprintf (module_dir, sizeof(module_dir), "%s/%s", |
3184 | _PATH_MODULES, myuname.release); | 3184 | _PATH_MODULES, myuname.release); |
3185 | recursive_action(module_dir, TRUE, FALSE, FALSE, | 3185 | recursive_action(module_dir, TRUE, TRUE, FALSE, |
3186 | check_module_name_match, 0, m_fullName); | 3186 | check_module_name_match, 0, m_fullName); |
3187 | } | 3187 | } |
3188 | 3188 | ||
@@ -3191,7 +3191,7 @@ extern int insmod_main( int argc, char **argv) | |||
3191 | { | 3191 | { |
3192 | /* No module found under /lib/modules/`uname -r`, this | 3192 | /* No module found under /lib/modules/`uname -r`, this |
3193 | * time cast the net a bit wider. Search /lib/modules/ */ | 3193 | * time cast the net a bit wider. Search /lib/modules/ */ |
3194 | if (recursive_action(_PATH_MODULES, TRUE, FALSE, FALSE, | 3194 | if (recursive_action(_PATH_MODULES, TRUE, TRUE, FALSE, |
3195 | check_module_name_match, 0, m_fullName) == FALSE) | 3195 | check_module_name_match, 0, m_fullName) == FALSE) |
3196 | { | 3196 | { |
3197 | if (m_filename[0] == '\0' | 3197 | if (m_filename[0] == '\0' |
diff --git a/modutils/insmod.c b/modutils/insmod.c index bc7f6589a..44c34a2e8 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -124,7 +124,7 @@ | |||
124 | #ifndef MODUTILS_MODULE_H | 124 | #ifndef MODUTILS_MODULE_H |
125 | static const int MODUTILS_MODULE_H = 1; | 125 | static const int MODUTILS_MODULE_H = 1; |
126 | 126 | ||
127 | #ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $" | 127 | #ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $" |
128 | 128 | ||
129 | /* This file contains the structures used by the 2.0 and 2.1 kernels. | 129 | /* This file contains the structures used by the 2.0 and 2.1 kernels. |
130 | We do not use the kernel headers directly because we do not wish | 130 | We do not use the kernel headers directly because we do not wish |
@@ -330,7 +330,7 @@ int delete_module(const char *); | |||
330 | #ifndef MODUTILS_OBJ_H | 330 | #ifndef MODUTILS_OBJ_H |
331 | static const int MODUTILS_OBJ_H = 1; | 331 | static const int MODUTILS_OBJ_H = 1; |
332 | 332 | ||
333 | #ident "$Id: insmod.c,v 1.61 2001/05/14 17:07:32 andersen Exp $" | 333 | #ident "$Id: insmod.c,v 1.62 2001/05/14 18:27:25 kraai Exp $" |
334 | 334 | ||
335 | /* The relocatable object is manipulated using elfin types. */ | 335 | /* The relocatable object is manipulated using elfin types. */ |
336 | 336 | ||
@@ -3182,7 +3182,7 @@ extern int insmod_main( int argc, char **argv) | |||
3182 | char module_dir[FILENAME_MAX]; | 3182 | char module_dir[FILENAME_MAX]; |
3183 | snprintf (module_dir, sizeof(module_dir), "%s/%s", | 3183 | snprintf (module_dir, sizeof(module_dir), "%s/%s", |
3184 | _PATH_MODULES, myuname.release); | 3184 | _PATH_MODULES, myuname.release); |
3185 | recursive_action(module_dir, TRUE, FALSE, FALSE, | 3185 | recursive_action(module_dir, TRUE, TRUE, FALSE, |
3186 | check_module_name_match, 0, m_fullName); | 3186 | check_module_name_match, 0, m_fullName); |
3187 | } | 3187 | } |
3188 | 3188 | ||
@@ -3191,7 +3191,7 @@ extern int insmod_main( int argc, char **argv) | |||
3191 | { | 3191 | { |
3192 | /* No module found under /lib/modules/`uname -r`, this | 3192 | /* No module found under /lib/modules/`uname -r`, this |
3193 | * time cast the net a bit wider. Search /lib/modules/ */ | 3193 | * time cast the net a bit wider. Search /lib/modules/ */ |
3194 | if (recursive_action(_PATH_MODULES, TRUE, FALSE, FALSE, | 3194 | if (recursive_action(_PATH_MODULES, TRUE, TRUE, FALSE, |
3195 | check_module_name_match, 0, m_fullName) == FALSE) | 3195 | check_module_name_match, 0, m_fullName) == FALSE) |
3196 | { | 3196 | { |
3197 | if (m_filename[0] == '\0' | 3197 | if (m_filename[0] == '\0' |