From dd6a8e3fc77bce6a63497fff9f74864fc1ab11a5 Mon Sep 17 00:00:00 2001 From: Colin Gillespie Date: Tue, 5 Sep 2023 15:36:23 +1000 Subject: [PATCH] cli: trim trailing whitespace from package arguments Signed-off-by: Colin Gillespie --- cli/main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cli/main.c b/cli/main.c index 76cd9c2..73b6dcc 100644 --- a/cli/main.c +++ b/cli/main.c @@ -1341,7 +1341,8 @@ cleanup3: while (1) { - const char *package = argv[pkg_optind]; + char *package = argv[pkg_optind]; + char *end; if (package == NULL) break; @@ -1361,6 +1362,10 @@ cleanup3: continue; } + end = package + strlen(package) - 1; + while(end > package && isspace((unsigned char)end[0])) end--; + end[1] = '\0'; + if (argv[pkg_optind + 1] == NULL || !PKGCONF_IS_OPERATOR_CHAR(*(argv[pkg_optind + 1]))) { pkgconf_queue_push(&pkgq, package);