grep: Fix paths in patch

They had a leading "./" which "git apply" doesn't seem to ignore.
This commit is contained in:
Ingo Weinhold
2013-05-27 04:23:37 +02:00
parent d6439dab79
commit 7e03f12fa3

View File

@@ -1,6 +1,6 @@
diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c
--- ./grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000
+++ ./grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000
diff -Naur grep-2.14-original/lib/fts.c grep-2.14/lib/fts.c
--- grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000
+++ grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000
@@ -1278,6 +1278,7 @@
nlink_t nlinks;
bool nostat;
@@ -20,9 +20,9 @@ diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c
/*
* Nlinks is the number of possible entries of type directory in the
diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c
--- ./grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000
+++ ./grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000
diff -Naur grep-2.14-original/lib/regcomp.c grep-2.14/lib/regcomp.c
--- grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000
+++ grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000
@@ -952,10 +952,10 @@
internal_function
init_word_char (re_dfa_t *dfa)
@@ -35,9 +35,9 @@ diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c
if (BE (dfa->map_notascii == 0, 1))
{
bitset_word_t bits0 = 0x00000000;
diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c
--- ./grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000
+++ ./grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000
diff -Naur grep-2.14-original/src/dfasearch.c grep-2.14/src/dfasearch.c
--- grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000
+++ grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000
@@ -216,6 +216,7 @@
int backref;
regoff_t start;
@@ -55,9 +55,9 @@ diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c
mb_case_map_apply (map, &off, &len);
*match_size = len;
ret_val = off;
diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c
--- ./grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000
+++ ./grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000
diff -Naur grep-2.14-original/src/kwsearch.c grep-2.14/src/kwsearch.c
--- grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000
+++ grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000
@@ -39,9 +39,9 @@
? mbtolower (pattern, &psize, &map)
: pattern);
@@ -104,9 +104,9 @@ diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c
mb_case_map_apply (map, &off, &len);
*match_size = len;
diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c
--- ./grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000
+++ ./grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000
diff -Naur grep-2.14-original/src/main.c grep-2.14/src/main.c
--- grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000
+++ grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000
@@ -460,6 +460,7 @@
if (SEEK_HOLE != SEEK_END && usable_st_size (st))
{
@@ -140,9 +140,9 @@ diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c
if (fstat (STDOUT_FILENO, &tmp_stat) == 0 && S_ISREG (tmp_stat.st_mode))
out_stat = tmp_stat;
diff -Naur ./grep-2.14-original/src/searchutils.c ./grep-2.14/src/searchutils.c
--- ./grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000
+++ ./grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000
diff -Naur grep-2.14-original/src/searchutils.c grep-2.14/src/searchutils.c
--- grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000
+++ grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000
@@ -80,6 +80,7 @@
static mb_len_map_t *len_map;
static size_t outalloc;