X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-glob.patch;h=1138f2c31782888bbf230d3505f8f59c81664628;hb=7009e3a82c01348e59d8022fcedb550295c2532b;hp=de3ab06a094e226d0a98c976b6f04a1d9b06bf33;hpb=132adc5c7a9b7b7602afbd594bd17cd2fcf1cd57;p=packages%2Frpm.git

diff --git a/rpm-glob.patch b/rpm-glob.patch
index de3ab06..1138f2c 100644
--- a/rpm-glob.patch
+++ b/rpm-glob.patch
@@ -1,50 +1,48 @@
---- rpm-4.0.2/lib/misc.c.glob	Wed May 16 13:00:10 2001
-+++ rpm-4.0.2/lib/misc.c	Wed May 16 15:35:28 2001
-@@ -583,6 +583,11 @@
-     const char * path;
-     const char * globURL;
-     char * globRoot = NULL;
-+#ifdef ENABLE_NLS	
-+	char * old_collate = NULL;
-+	char * old_ctype = NULL;
-+	char * t;
-+#endif
-     size_t maxb, nb;
-     glob_t gl;
-     int ut;
-@@ -593,6 +598,17 @@
-     if (rc)
- 	return rc;
+--- rpm-5.1.4/rpmio/rpmrpc.c.org	2008-07-29 21:27:42.203871384 +0200
++++ rpm-5.1.4/rpmio/rpmrpc.c	2008-07-29 21:27:58.080756454 +0200
+@@ -1757,14 +1757,14 @@
+ 	return -2;
+ 	/*@notreached@*/ break;
+     }
+-    return glob(pattern, flags, errfunc, pglob);
++    return rpm_glob(pattern, flags, errfunc, pglob);
+ }
  
-+#ifdef ENABLE_NLS
-+	t = setlocale(LC_COLLATE, NULL);
-+	if (t)
-+		old_collate = strdup(t);
-+	t = setlocale(LC_CTYPE, NULL);
-+	if (t)
-+		old_ctype = strdup(t);
-+	setlocale(LC_COLLATE, "C");
-+	setlocale(LC_CTYPE, "C");
-+#endif
-+	
-     for (j = 0; j < ac; j++) {
- 	if (!myGlobPatternP(av[j])) {
- 	    if (argc == 0)
-@@ -667,6 +683,17 @@
+ void Globfree(glob_t *pglob)
+ {
+ if (_rpmio_debug)
+ fprintf(stderr, "*** Globfree(%p)\n", pglob);
+-    globfree(pglob);
++    rpm_globfree(pglob);
+ }
  
+ DIR * Opendir(const char * path)
+--- rpm-5.1.4/misc/librpmmisc.c.org	2008-07-29 21:26:19.710540550 +0200
++++ rpm-5.1.4/misc/librpmmisc.c	2008-07-29 21:27:25.357426308 +0200
+@@ -71,7 +71,11 @@
+ #include "fnmatch.h"
+ #include "fnmatch.c"
+ #ifndef __CYGWIN__
++#define	glob		rpm_glob
++#define	globfree	rpm_globfree
+ #include "glob.h"
+ #include "glob.c"
++#undef glob
++#undef globfree
+ #endif
  
- exit:
-+#ifdef ENABLE_NLS
-+	if (old_collate) {
-+		setlocale(LC_COLLATE, old_collate);
-+		free(old_collate);
-+	}
-+	if (old_ctype) {
-+		setlocale(LC_CTYPE, old_ctype);
-+		free(old_ctype);
-+	}
-+#endif
-+
-     if (av)
- 	free((void *)av);
-     if ((rc || argvPtr == NULL) && argv) {
+--- rpm/misc/librpmmisc.vers~	2007-11-13 03:16:23.000000000 +0100
++++ rpm/misc/librpmmisc.vers	2008-07-29 21:32:35.023645681 +0200
+@@ -7,8 +7,10 @@
+     db_strerror_rpmdb;
+     db_create_rpmdb;
+     fnmatch;
+-    glob;
+-    globfree;
++    rpm_glob;
++    rpm_glob64;
++    rpm_globfree;
++    rpm_globfree64;
+     lua*;
+     magic_*;
+     rpmz_*;