[patch] portage-utils-libstdc++-v3.patch

portage-utils-libstdc++-v3.patch (text/plain), 1.26 KB, created by Peter Volkov (RETIRED) on 2008-11-02 06:50:58 UTC

=== modified file 'main.c'
--- main.c	2008-11-01 20:32:07 +0000
+++ main.c	2008-11-02 06:49:07 +0000
@@ -31,6 +31,7 @@
 
 /* prototypes and such */
 static char eat_file(const char *file, char *buf, const size_t bufsize);
+int charmatch(const char *str1, const char *str2);
 int rematch(const char *, const char *, int);
 static char *rmspace(char *);
 
@@ -202,6 +203,23 @@
 	return ret;
 }
 
+int charmatch(const char *str1, const char *str2)
+{
+	if ((str1 == NULL) || (str2 == NULL))
+		return EXIT_FAILURE;
+
+	while (*str1 != 0) {
+		/* if str2==0 but str1!=0 we'll return and so it's
+		 * impossible to touch match++ address here */
+		if (*str1 != *str2)
+			return 1;
+		str1++;
+		str2++;
+	}
+
+	return 0;
+}
+
 int rematch(const char *regex, const char *match, int cflags)
 {
 	regex_t preg;

=== modified file 'qlist.c'
--- qlist.c	2008-11-01 20:32:07 +0000
+++ qlist.c	2008-11-01 20:32:31 +0000
@@ -223,6 +223,10 @@
 					if ((strcmp(name, strstr(swap, "/") + 1) == 0) || (strcmp(name, strstr(buf, "/") + 1) == 0))
 						break;
 				} else {
+					if (charmatch(name, buf) == 0)
+						break;
+					if (charmatch(name, de[x]->d_name) == 0)
+						break;
 					if (rematch(name, buf, REG_EXTENDED) == 0)
 						break;
 					if (rematch(name, de[x]->d_name, REG_EXTENDED) == 0)