===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/patch/pch.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/patch/pch.c	1996/09/24 04:19:29	1.7
--- src/usr.bin/patch/pch.c	1997/04/03 07:07:36	1.8
***************
*** 1,7 ****
! /*	$OpenBSD: pch.c,v 1.7 1996/09/24 04:19:29 millert Exp $	*/
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: pch.c,v 1.7 1996/09/24 04:19:29 millert Exp $";
  #endif /* not lint */
  
  #include "EXTERN.h"
--- 1,7 ----
! /*	$OpenBSD: pch.c,v 1.8 1997/04/03 07:07:36 imp Exp $	*/
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: pch.c,v 1.8 1997/04/03 07:07:36 imp Exp $";
  #endif /* not lint */
  
  #include "EXTERN.h"
***************
*** 306,312 ****
  	    oldname = fetchname(oldtmp, strippath, ok_to_create_file);
  	if (newtmp != Nullch)
  	    newname = fetchname(newtmp, strippath, ok_to_create_file);
! 	if (oldname && newname) {
  	    if (strlen(oldname) < strlen(newname))
  		filearg[0] = savestr(oldname);
  	    else
--- 306,314 ----
  	    oldname = fetchname(oldtmp, strippath, ok_to_create_file);
  	if (newtmp != Nullch)
  	    newname = fetchname(newtmp, strippath, ok_to_create_file);
! 	if (indname)
! 	    filearg[0] = savestr(indname);
! 	else if (oldname && newname) {
  	    if (strlen(oldname) < strlen(newname))
  		filearg[0] = savestr(oldname);
  	    else
***************
*** 316,323 ****
  	    filearg[0] = savestr(oldname);
  	else if (newname)
  	    filearg[0] = savestr(newname);
- 	else if (indname)
- 	    filearg[0] = savestr(indname);
      }
      if (bestguess) {
  	free(bestguess);
--- 318,323 ----