From 4d2a7145666c91f0ba63dd5c6937b15339b42b0c Mon Sep 17 00:00:00 2001

From: Bastien Nocera <hadess@hadess.net>

Date: Mon, 14 Oct 2013 08:15:51 +0200

Subject: [PATCH] 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;

-- 

1.8.4.652.g0d6e0ce