From: Lucas De Marchi <lucas.de.marchi@gmail.com>
Date: Thu, 14 Nov 2024 05:55:10 +0000 (-0600)
Subject: depmod: Fix error messages related to module_directory
X-Git-Tag: v34~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e82a548cb2bd586af3547732056e5ca099e79400;p=thirdparty%2Fkmod.git

depmod: Fix error messages related to module_directory

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
---

diff --git a/tools/depmod.c b/tools/depmod.c
index 2c131f55..cf4834a8 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -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;
 	}