mirror/patch
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/patch.git synced 2026-01-27 01:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try applying hunks at offsets that can't work

Browse Source 
* src/patch.c (locate_hunk): Start trying to apply the hunk at the minimum
offset which puts the hunk in the valid range of lines. This will often still
be offset 0.
This commit is contained in:
Andreas Gruenbacher 2015-01-20 12:00:24 +01:00
parent ae88d1c270
commit 19285e563a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/patch.c
View File

@ -33,6 +33,7 @@
#include <xalloc.h>
#include <gl_linked_list.h>
#include <gl_xlist.h>
#include <minmax.h>
/* procedures */
@ -1107,8 +1108,8 @@ locate_hunk (lin fuzz)
lin min_where = last_frozen_line + 1 - (prefix_context - prefix_fuzz);
lin max_pos_offset = max_where - first_guess;
lin max_neg_offset = first_guess - min_where;
lin max_offset = (max_pos_offset < max_neg_offset
? max_neg_offset : max_pos_offset);
lin max_offset = MAX(max_pos_offset, max_neg_offset);
lin min_offset;
if (!pat_lines) /* null range matches always */
return first_guess;
@ -1154,7 +1155,10 @@ locate_hunk (lin fuzz)
return 0;
}
for (offset = 0; offset <= max_offset; offset++) {
min_offset = max_pos_offset < 0 ? first_guess - max_where
: max_neg_offset < 0 ? first_guess - min_where
: 0;
for (offset = min_offset; offset <= max_offset; offset++) {
char numbuf0[LINENUM_LENGTH_BOUND + 1];
char numbuf1[LINENUM_LENGTH_BOUND + 1];
if (offset <= max_pos_offset
@ -1166,7 +1170,7 @@ locate_hunk (lin fuzz)
in_offset += offset;
return first_guess+offset;
}
if (0 < offset && offset <= max_neg_offset
if (offset <= max_neg_offset
&& patch_match (first_guess, -offset, prefix_fuzz, suffix_fuzz)) {
if (debug & 1)
say ("Offset changing from %s to %s\n",