diff options
author | Yauheni Kaliuta <yauheni.kaliuta@redhat.com> | 2017-05-09 22:09:21 +0300 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2017-06-01 19:17:42 -0700 |
commit | 369ca65620a00611285666c9b961e6156572e8d7 (patch) | |
tree | 68e6f02761ba6e8e7309d42b84200e87e78c9344 | |
parent | 0d6b3f9beaea031c445dc6bd125d0229f142718b (diff) | |
download | kmod-369ca65620a00611285666c9b961e6156572e8d7.tar.gz kmod-369ca65620a00611285666c9b961e6156572e8d7.zip |
depmod: create depmod dir independent search function
Prepare to implement external directories support.
The patch splits depmod_modules_search() function to two
functions: depmod_modules_search(), called by the high level with
intention to search all possible modules, and
depmod_module_search_path(), which takes path as a parameter and
scans modules under the path only. Initially it is used to scan
the same depmod->cfg->dirname path only.
Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
-rw-r--r-- | tools/depmod.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/tools/depmod.c b/tools/depmod.c index ded6450..cfed864 100644 --- a/tools/depmod.c +++ b/tools/depmod.c @@ -1191,29 +1191,42 @@ static int depmod_modules_search_dir(struct depmod *depmod, DIR *d, size_t basel return err; } -static int depmod_modules_search(struct depmod *depmod) +static int depmod_modules_search_path(struct depmod *depmod, + const char *path) { - char path[PATH_MAX]; - DIR *d = opendir(depmod->cfg->dirname); + char path_buf[PATH_MAX]; + DIR *d; size_t baselen; int err; + + d = opendir(path); if (d == NULL) { err = -errno; - ERR("could not open directory %s: %m\n", depmod->cfg->dirname); + ERR("could not open directory %s: %m\n", path); return err; } - baselen = depmod->cfg->dirnamelen; - memcpy(path, depmod->cfg->dirname, baselen); - path[baselen] = '/'; + baselen = strlen(path); + memcpy(path_buf, path, baselen); + path_buf[baselen] = '/'; baselen++; - path[baselen] = '\0'; + path_buf[baselen] = '\0'; - err = depmod_modules_search_dir(depmod, d, baselen, path); + err = depmod_modules_search_dir(depmod, d, baselen, path_buf); closedir(d); return err; } +static int depmod_modules_search(struct depmod *depmod) +{ + int err; + + err = depmod_modules_search_path(depmod, depmod->cfg->dirname); + if (err < 0) + return err; + return 0; +} + static int mod_cmp(const void *pa, const void *pb) { const struct mod *a = *(const struct mod **)pa; const struct mod *b = *(const struct mod **)pb; |