mirror of
https://git.proxmox.com/git/systemd
synced 2026-02-03 16:42:27 +00:00
87c3557857
This commit was created using the following commands and then fixing up debian/patches/series manually. $ git config diff.renames false $ git rebase --onto debian/208-5 v208 stable/v208-stable $ git checkout -b patch-queue/experimental HEAD $ gbp-pq export --no-patch-numbers $ git add --ignore-removal debian/patches/
25 lines
835 B
Diff
25 lines
835 B
Diff
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Mon, 14 Oct 2013 08:15:51 +0200
|
|
Subject: shared/util: Fix glob_extend() argument
|
|
|
|
glob_extend() would completely fail to work, or return incorrect
|
|
data if it wasn't being passed the current getopt "optarg" variable
|
|
as it used the global variable, instead of the passed parameters.
|
|
---
|
|
src/shared/util.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
index 748f1bb..6c88040 100644
|
|
--- a/src/shared/util.c
|
|
+++ b/src/shared/util.c
|
|
@@ -4391,7 +4391,7 @@ int glob_extend(char ***strv, const char *path) {
|
|
char **p;
|
|
|
|
errno = 0;
|
|
- k = glob(optarg, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
|
|
+ k = glob(path, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
|
|
|
|
if (k == GLOB_NOMATCH)
|
|
return -ENOENT;
|