From: Nikolay Amiantov <ab@fmap.me>
To: linux-modules@vger.kernel.org
Cc: Shea Levy <shea@shealevy.com>, Nikolay Amiantov <ab@fmap.me>
Subject: [PATCH 2/4] libkmod: allow hardcoding array of dirname prefixes
Date: Tue, 16 Aug 2016 03:50:30 +0300 [thread overview]
Message-ID: <20160816005032.28881-3-ab@fmap.me> (raw)
In-Reply-To: <20160816005032.28881-1-ab@fmap.me>
Directories in the array are searched until the first directory with `uname -r`
subdirectory is found. As a fallback last item in the array is used
unconditionally.
---
libkmod/libkmod.c | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 7b0247f..be9358d 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -206,7 +206,10 @@ static int log_priority(const char *priority)
return 0;
}
-static const char *dirname_default_prefix = "/lib/modules";
+static const char *dirname_default_prefixes[] = {
+ "/lib/modules",
+ NULL
+};
static char *get_kernel_release(const char *dirname)
{
@@ -219,11 +222,43 @@ static char *get_kernel_release(const char *dirname)
if (uname(&u) < 0)
return NULL;
- if ((dirname_prefix = getenv("MODULE_DIR")) == NULL)
- dirname_prefix = dirname_default_prefix;
+ if ((dirname_prefix = getenv("MODULE_DIR")) != NULL) {
+ if(asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0)
+ return NULL;
+ } else {
+ size_t i;
+ char buf[PATH_MAX];
+
+ for (i = 0; dirname_default_prefixes[i] != NULL; i++) {
+ int plen;
+
+ plen = snprintf(buf, sizeof(buf), "%s/%s", dirname_default_prefixes[i], u.release);
+ if (plen < 0)
+ return NULL;
+ else if (plen >= PATH_MAX)
+ continue;
+
+ if (dirname_default_prefixes[i + 1] != NULL) {
+ struct stat dirstat;
+
+ if (stat(buf, &dirstat) < 0) {
+ if (errno == ENOENT)
+ continue;
+ else
+ return NULL;
+ }
+
+ if (!S_ISDIR(dirstat.st_mode))
+ continue;
+ }
- if (asprintf(&p, "%s/%s", dirname_prefix, u.release) < 0)
- return NULL;
+ p = malloc(plen + 1);
+ if (p == NULL)
+ return NULL;
+ memcpy(p, buf, plen + 1);
+ break;
+ }
+ }
return p;
}
--
2.9.2
next prev parent reply other threads:[~2016-08-16 0:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-16 0:50 Improvements in search of kernel modules directory Nikolay Amiantov
2016-08-16 0:50 ` [PATCH 1/4] libkmod: add MODULE_DIR to override " Nikolay Amiantov
2016-08-16 0:50 ` Nikolay Amiantov [this message]
2016-08-16 0:50 ` [PATCH 3/4] static-nodes: use kmod to get " Nikolay Amiantov
2016-08-16 0:50 ` [PATCH 4/4] libkmod: add --with-modulesdirs configure option Nikolay Amiantov
2016-11-11 2:13 ` Improvements in search of kernel modules directory Lucas De Marchi
2016-12-05 3:24 ` Lucas De Marchi
2016-12-05 12:35 ` Shea Levy
2016-12-07 7:06 ` Yauheni Kaliuta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160816005032.28881-3-ab@fmap.me \
--to=ab@fmap.me \
--cc=linux-modules@vger.kernel.org \
--cc=shea@shealevy.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).