===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/patch.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/patch/patch.c	2004/06/14 18:26:33	1.39
--- src/usr.bin/patch/patch.c	2004/06/18 17:52:25	1.40
***************
*** 1,4 ****
! /*	$OpenBSD: patch.c,v 1.39 2004/06/14 18:26:33 otto Exp $	*/
  
  /*
   * patch - a program to apply diffs to original files
--- 1,4 ----
! /*	$OpenBSD: patch.c,v 1.40 2004/06/18 17:52:25 otto Exp $	*/
  
  /*
   * patch - a program to apply diffs to original files
***************
*** 27,33 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: patch.c,v 1.39 2004/06/14 18:26:33 otto Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 27,33 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: patch.c,v 1.40 2004/06/18 17:52:25 otto Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 629,636 ****
  		    || diff_type == UNI_DIFF)) {
  			say("Empty context always matches.\n");
  		}
! 		if (fuzz == 0)
! 			return (input_lines == 0 ? first_guess : 0);
  	}
  	if (max_neg_offset >= first_guess)	/* do not try lines < 0 */
  		max_neg_offset = first_guess - 1;
--- 629,641 ----
  		    || 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;