]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
depmod: Fix error messages related to module_directory
authorLucas De Marchi <lucas.de.marchi@gmail.com>
Thu, 14 Nov 2024 05:55:10 +0000 (23:55 -0600)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Thu, 21 Nov 2024 04:25:30 +0000 (22:25 -0600)
It's no longer a constant: print the right message.

Fixes: 4f8a6a85 ("tools: Check snprintf return value")
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/243
tools/depmod.c

index 2c131f55a64c7dcbe39e8de67135220c094f4a16..cf4834a8d0d4075f30eefff075ee5aa5e151e571 100644 (file)
@@ -3034,8 +3034,8 @@ static int do_depmod(int argc, char *argv[])
        cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, "%s%s/%s", root ?: "",
                                  module_directory, cfg.kversion);
        if (cfg.dirnamelen >= PATH_MAX) {
-               ERR("Bad directory %s" MODULE_DIRECTORY "/%s: path too long\n",
-                   root ?: "", cfg.kversion);
+               ERR("Bad directory %s%s/%s: path too long\n", root ?: "",
+                   module_directory, cfg.kversion);
                goto cmdline_failed;
        }
 
@@ -3043,8 +3043,8 @@ static int do_depmod(int argc, char *argv[])
                                     out_root ?: (root ?: ""), module_directory,
                                     cfg.kversion);
        if (cfg.outdirnamelen >= PATH_MAX) {
-               ERR("Bad directory %s" MODULE_DIRECTORY "/%s: path too long\n",
-                   out_root ?: (root ?: ""), cfg.kversion);
+               ERR("Bad directory %s%s/%s: path too long\n", out_root ?: (root ?: ""),
+                   module_directory, cfg.kversion);
                goto cmdline_failed;
        }