gnome-utils r8533 - trunk/gsearchtool

[dcransto svn gnome org]

Author: dcransto
Date: Mon Mar 30 01:23:25 2009
New Revision: 8533
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8533&view=rev

Log:
2009-03-29  Dennis Cranston  <dennis_cranston yahoo com>

        * gsearchtool.c (setup_case_insensitive_arguments): If grep
        supports the -I argument then use it. Bug 568840.



Modified:
   trunk/gsearchtool/ChangeLog
   trunk/gsearchtool/gsearchtool.c

Modified: trunk/gsearchtool/gsearchtool.c
==============================================================================
--- trunk/gsearchtool/gsearchtool.c	(original)
+++ trunk/gsearchtool/gsearchtool.c	Mon Mar 30 01:23:25 2009
@@ -274,9 +274,22 @@
  	g_spawn_command_line_sync (grep_cmd, NULL, &cmd_stderr, NULL, NULL);
 
 	if ((cmd_stderr != NULL) && (strlen (cmd_stderr) == 0)) {
- 		GSearchOptionTemplates[SEARCH_CONSTRAINT_CONTAINS_THE_TEXT].option =
-		    g_strdup_printf ("'!' -type p -exec %s -i -c '%%s' {} \\;", GREP_COMMAND);
- 	}
+		g_free (cmd_stderr);
+		g_free (grep_cmd);
+		
+		/* check grep command for -I argument compatibility, bug 568840 */
+		grep_cmd = g_strdup_printf ("%s -i -I 'string' /dev/null", GREP_COMMAND);
+	 	g_spawn_command_line_sync (grep_cmd, NULL, &cmd_stderr, NULL, NULL);
+		
+		if ((cmd_stderr != NULL) && (strlen (cmd_stderr) == 0)) {
+	 		GSearchOptionTemplates[SEARCH_CONSTRAINT_CONTAINS_THE_TEXT].option =
+			    g_strdup_printf ("'!' -type p -exec %s -i -I -c '%%s' {} \\;", GREP_COMMAND);
+ 		}
+		else {
+	 		GSearchOptionTemplates[SEARCH_CONSTRAINT_CONTAINS_THE_TEXT].option =
+			    g_strdup_printf ("'!' -type p -exec %s -i -c '%%s' {} \\;", GREP_COMMAND);		
+		}		
+	}
 	else {
  		GSearchOptionTemplates[SEARCH_CONSTRAINT_CONTAINS_THE_TEXT].option =
 		    g_strdup_printf ("'!' -type p -exec %s -c '%%s' {} \\;", GREP_COMMAND);