=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/patch.c,v retrieving revision 1.45 retrieving revision 1.46 diff -c -r1.45 -r1.46 *** src/usr.bin/patch/patch.c 2007/04/18 21:52:24 1.45 --- src/usr.bin/patch/patch.c 2008/08/20 18:28:46 1.46 *************** *** 1,4 **** ! /* $OpenBSD: patch.c,v 1.45 2007/04/18 21:52:24 sobrado Exp $ */ /* * patch - a program to apply diffs to original files --- 1,4 ---- ! /* $OpenBSD: patch.c,v 1.46 2008/08/20 18:28:46 otto Exp $ */ /* * patch - a program to apply diffs to original files *************** *** 27,33 **** */ #ifndef lint ! static const char rcsid[] = "$OpenBSD: patch.c,v 1.45 2007/04/18 21:52:24 sobrado Exp $"; #endif /* not lint */ #include --- 27,33 ---- */ #ifndef lint ! static const char rcsid[] = "$OpenBSD: patch.c,v 1.46 2008/08/20 18:28:46 otto Exp $"; #endif /* not lint */ #include *************** *** 631,643 **** || diff_type == UNI_DIFF)) { say("Empty context always matches.\n"); } ! if (diff_type == CONTEXT_DIFF ! || diff_type == NEW_CONTEXT_DIFF ! || diff_type == UNI_DIFF) { ! if (fuzz == 0) ! return (input_lines == 0 ? first_guess : 0); ! } else ! return (first_guess); } if (max_neg_offset >= first_guess) /* do not try lines < 0 */ max_neg_offset = first_guess - 1; --- 631,637 ---- || diff_type == UNI_DIFF)) { say("Empty context always matches.\n"); } ! return (first_guess); } if (max_neg_offset >= first_guess) /* do not try lines < 0 */ max_neg_offset = first_guess - 1;