[gentoo-commits] gentoo-x86 commit in app-portage/conf-update/files: conf-update-1.0-regex-classes.patch

[Sebastian Pipping (sping)]

sping       10/10/04 19:22:54

  Added:                conf-update-1.0-regex-classes.patch
  Log:
  app-portage/conf-update: Integrate patch for grep 2.7 (bug #338414)
  (Portage version: 2.2_rc67_p185/cvs/Linux i686)

Revision  Changes    Path
1.1                  app-portage/conf-update/files/conf-update-1.0-regex-classes.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/conf-update/files/conf-update-1.0-regex-classes.patch?rev=1.1&content-type=text/plain

Index: conf-update-1.0-regex-classes.patch
===================================================================
--- conf-update-1.0/conf-update.c.orig	2006-10-09 13:23:33.000000000 +0200
+++ conf-update-1.0/conf-update.c	2010-09-23 08:58:54.982551103 +0200
@@ -133,12 +133,12 @@
 				esc_myfile = g_shell_quote(myfile);
 				highest = get_highest_update(protected, protected[i]);
 				esc_highest = g_shell_quote(highest);
-				cmd = (char *)calloc(strlen("diff -Nu % % | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][:space:]*$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
+				cmd = (char *)calloc(strlen("diff -Nu % % | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\" " ) + strlen(esc_highest) + strlen(esc_myfile), sizeof(char));
 				strcpy(cmd, "diff -Nu ");
 				strcat(cmd, esc_myfile);
 				strcat(cmd, " ");
 				strcat(cmd, esc_highest);
-				strcat(cmd, " | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][:space:]*$\"");
+				strcat(cmd, " | grep \"^[+-][^+-]\" | grep -v \"^[-+]#\" | grep -v \"^[-+][[:space:]]*$\"");
 				
 				free(myfile);
 				free(esc_myfile);