From 3e33ca08816bf1225fce7b2e2eefd331a91fcf22 Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Wed, 19 Feb 2025 19:18:23 +0100 Subject: [PATCH] kmod: use program_invocation_short_name more often Remove the explicit basename(argv[0]) calls because we already rely on program_invocation_short_name even before reaching these lines. Unifies code and slightly reduces binary size. Signed-off-by: Tobias Stoeckmann Link: https://github.com/kmod-project/kmod/pull/284 Signed-off-by: Lucas De Marchi --- tools/kmod.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/kmod.c b/tools/kmod.c index 434dd049..6a9c996b 100644 --- a/tools/kmod.c +++ b/tools/kmod.c @@ -53,7 +53,7 @@ static int kmod_help(int argc, char *argv[]) "\t-V, --version show version\n" "\t-h, --help show this help\n\n" "Commands:\n", - basename(argv[0])); + program_invocation_short_name); for (i = 0; i < ARRAY_SIZE(kmod_cmds); i++) { if (kmod_cmds[i]->help != NULL) { @@ -136,13 +136,10 @@ fail: static int handle_kmod_compat_commands(int argc, char *argv[]) { - const char *cmd; size_t i; - cmd = basename(argv[0]); - for (i = 0; i < ARRAY_SIZE(kmod_compat_cmds); i++) { - if (streq(kmod_compat_cmds[i]->name, cmd)) + if (streq(kmod_compat_cmds[i]->name, program_invocation_short_name)) return kmod_compat_cmds[i]->cmd(argc, argv); } -- 2.47.2