openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File icase.diff of Package grep (Revision 0218e7516b4e0a1229ea610d7b5f6392)

Currently displaying revision 0218e7516b4e0a1229ea610d7b5f6392 , Show latest

--- src/grep.c
+++ src/grep.c
@@ -789,28 +789,10 @@ print_line_middle (const char *beg, cons
   size_t match_offset;
   const char *cur = beg;
   const char *mid = NULL;
-  char *buf;		/* XXX */
-  const char *ibeg;	/* XXX */
-
-  if (match_icase)	/* XXX - None of the -i stuff should be here.  */
-    {
-      int i = lim - beg;
-
-      ibeg = buf = (char *) xmalloc(i);
-      /* This can't possibly be correct with UTF-8,
-	 but it's equivalent to what was there so far.  */
-      while (--i >= 0)
-	buf[i] = tolower(beg[i]);
-    }
-  else
-    {
-      buf = NULL;
-      ibeg = beg;
-    }
 
   while (   lim > cur
-	 && ((match_offset = execute(ibeg, lim - beg, &match_size,
-				     ibeg + (cur - beg))) != (size_t) -1))
+	 && ((match_offset = execute(beg, lim - beg, &match_size,
+				     beg + (cur - beg))) != (size_t) -1))
     {
       char const *b = beg + match_offset;
 
@@ -854,9 +836,6 @@ print_line_middle (const char *beg, cons
       cur = b + match_size;
     }
 
-  if (buf)
-    free(buf);	/* XXX */
-
   if (only_matching)
     cur = lim;
   else if (mid)
--- src/search.c
+++ src/search.c
@@ -193,10 +193,8 @@ GEAcompile (char const *pattern, size_t 
   size_t total = size;
   char const *motif = pattern;
 
-#if 0
   if (match_icase)
     syntax_bits |= RE_ICASE;
-#endif
   re_set_syntax (syntax_bits);
   dfasyntax (syntax_bits, match_icase, eolbyte);

Places

File icase.diff of Package grep (Revision 0218e7516b4e0a1229ea610d7b5f6392)

Places