From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 27 Jun 2011 11:09:17 +0000 (+0300)
Subject: Honor trailing slash in rpmGlob()
X-Git-Tag: tznext/4.11.0.1.tizen20130304~995
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65e88045ba80b175418b865fe4c4a88d48c00189;p=tools%2Flibrpm-tizen.git

Honor trailing slash in rpmGlob()

- Only return directories if a pattern contains a trailing slash.
  Use GLOB_ONLYDIR hint if available but as this is unreliable,
  we need to stat the paths to be sure.
- Hysterically enough, rpm bundles its own copy of glob() which does
  have GLOB_ONLYDIR but ATM it doesn't get build because HAVE_D_TYPE
  isn't defined outside glibc build environment which is where our glob
  originally came from...
---

diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 506b97c..4031c18 100644
--- a/rpmio/rpmfileutil.c
+++ b/rpmio/rpmfileutil.c
@@ -601,17 +601,25 @@ int rpmGlob(const char * patterns, int * argcPtr, ARGV_t * argvPtr)
 	const char * path;
 	int ut = urlPath(av[j], &path);
 	int local = (ut == URL_IS_PATH) || (ut == URL_IS_UNKNOWN);
+	size_t plen = strlen(path);
+	int flags = gflags;
+	int dir_only = (plen > 0 && path[plen-1] == '/');
 	glob_t gl;
 
 	if (!local || (!glob_pattern_p(av[j], 0) && strchr(path, '~') == NULL)) {
 	    argvAdd(&argv, av[j]);
 	    continue;
 	}
+
+#ifdef GLOB_ONLYDIR
+	if (dir_only)
+	    flags |= GLOB_ONLYDIR;
+#endif
 	
 	gl.gl_pathc = 0;
 	gl.gl_pathv = NULL;
 	
-	rc = glob(av[j], gflags, NULL, &gl);
+	rc = glob(av[j], flags, NULL, &gl);
 	if (rc)
 	    goto exit;
 
@@ -645,6 +653,13 @@ int rpmGlob(const char * patterns, int * argcPtr, ARGV_t * argvPtr)
 
 	for (i = 0; i < gl.gl_pathc; i++) {
 	    const char * globFile = &(gl.gl_pathv[i][0]);
+
+	    if (dir_only) {
+		struct stat sb;
+		if (lstat(gl.gl_pathv[i], &sb) || !S_ISDIR(sb.st_mode))
+		    continue;
+	    }
+		
 	    if (globRoot > globURL && globRoot[-1] == '/')
 		while (*globFile == '/') globFile++;
 	    strcpy(globRoot, globFile);