d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give "Index" specified filenames preference over other filenames specified

Browse Source 
in the diff.  This makes it so that diffs containing files in different
subdirectories that have the same name not patch the same file.  For example
a diff with patches to Makefile, des/Makefile, usr.bin/Makefile would attempt
to patch Makefile three times.
This commit is contained in:
Justin T. Gibbs 1995-09-14 04:33:35 +00:00
parent f3ebe76761
commit 312b98f6bb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=10723
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/usr.bin/patch/pch.c
View File

@ -1,6 +1,9 @@
/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.4 1994/02/25 21:46:07 phk Exp $
/* $Header: /home/ncvs/src/gnu/usr.bin/patch/pch.c,v 1.5 1995/05/30 05:02:35 rgrimes Exp $
*
* $Log: pch.c,v $
* Revision 1.5 1995/05/30 05:02:35 rgrimes
* Remove trailing whitespace.
*
* Revision 1.4 1994/02/25 21:46:07 phk
* added the -C/-check again.
*
@ -355,12 +358,12 @@ intuit_diff_type()
else
filearg[0] = savestr(newname);
}
else if (indname)
filearg[0] = savestr(indname);
else if (oldname)
filearg[0] = savestr(oldname);
else if (newname)
filearg[0] = savestr(newname);
else if (indname)
filearg[0] = savestr(indname);
}
if (bestguess) {
free(bestguess);