tools: kmod: Add handling of compat modinfo

diff --git a/Makefile.am b/Makefile.am
index 32c4173a06a5161f2296e5c5faa5a7bed88ce69a..1752abef3eb3fa65a994f1af1e5397b12352c7c6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,7 +91,8 @@ tools_kmod_modprobe_LDADD = libkmod/libkmod.la
 tools_kmod_modinfo_LDADD = libkmod/libkmod.la
 
 tools_kmod_SOURCES = tools/kmod.c tools/kmod.h tools/kmod-lsmod.c \
-                    tools/kmod-rmmod.c tools/kmod-insmod.c
+                    tools/kmod-rmmod.c tools/kmod-insmod.c \
+                    tools/kmod-modinfo.c
 tools_kmod_CPPFLAGS = $(AM_CPPFLAGS) -DKMOD_BUNDLE_TOOL=1
 tools_kmod_LDADD = libkmod/libkmod.la
 endif

diff --git a/configure.ac b/configure.ac
index 6a6ce7551c62b24e5123dc9f5a28ae669b8ecd5a..4137f0f243a1e88275ef6875ea5237ba6ea47f4a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,7 @@ AS_IF([test "x$enable_debug" = "xyes"], [
 
 CC_CHECK_CFLAGS_APPEND([ \
                        -pipe \
+                       -DANOTHER_BRICK_IN_THE \
                        -Wall \
                        -W \
                        -Wextra \

diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
index fa91682ad476c95970117d7f2b833e26642c1808..ea9de1b8dd011f117c80bb56e887f9d186573dab 100644 (file)
--- a/tools/kmod-modinfo.c
+++ b/tools/kmod-modinfo.c
@@ -326,7 +326,7 @@ static void help(const char *progname)
                progname);
 }
 
-int main(int argc, char *argv[])
+static int do_modinfo(int argc, char *argv[])
 {
        struct kmod_ctx *ctx;
        char dirname_buf[PATH_MAX];
@@ -432,3 +432,20 @@ int main(int argc, char *argv[])
        kmod_unref(ctx);
        return err >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
+
+#ifndef KMOD_BUNDLE_TOOL
+int main(int argc, char *argv[])
+{
+       return do_modinfo(argc, argv);
+}
+
+#else
+#include "kmod.h"
+
+const struct kmod_cmd kmod_cmd_compat_modinfo = {
+       .name = "modinfo",
+       .cmd = do_modinfo,
+       .help = "compat modinfo command",
+};
+
+#endif

diff --git a/tools/kmod.c b/tools/kmod.c
index 53469ba986afbd2c91715094be865ce66a5864a9..0e6c063b2bf42a4374a73a78847eaa6a1607f808 100644 (file)
--- a/tools/kmod.c
+++ b/tools/kmod.c
@@ -42,6 +42,7 @@ static const struct kmod_cmd *kmod_compat_cmds[] = {
        &kmod_cmd_compat_lsmod,
        &kmod_cmd_compat_rmmod,
        &kmod_cmd_compat_insmod,
+       &kmod_cmd_compat_modinfo,
 };
 
 static int kmod_help(int argc, char *argv[])

diff --git a/tools/kmod.h b/tools/kmod.h
index ffee228832084e83793a94915f68fae996fea011..62be6971f107c0724f9e71136c9a8a56662c68d2 100644 (file)
--- a/tools/kmod.h
+++ b/tools/kmod.h
@@ -30,5 +30,6 @@ struct kmod_cmd {
 extern const struct kmod_cmd kmod_cmd_compat_lsmod;
 extern const struct kmod_cmd kmod_cmd_compat_rmmod;
 extern const struct kmod_cmd kmod_cmd_compat_insmod;
+extern const struct kmod_cmd kmod_cmd_compat_modinfo;
 
 #endif