From: Bastien Nocera <hadess@hadess.net>
Date: Mon, 14 Oct 2013 06:15:51 +0000 (+0200)
Subject: shared/util: Fix glob_extend() argument
X-Git-Tag: v209~1888
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a8ccacf5344c4434b1d5ff3837307acb8fcf93d2;hp=71fda00f320379f5cbee8e118848de98caaa229d;ds=sidebyside

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

diff --git a/src/shared/util.c b/src/shared/util.c
index 54dbace19..182277030 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4461,7 +4461,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;