system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-20 16:54:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

De-obfuscate and correct the include path handling for SysV style includes.

Browse source 
PR:		32759
Submitted by:	Mark Valentine
Reviewed by:	Matthew Emmerton" <matt@gsicomp.on.ca>
MFC after:	15 days
This commit is contained in:
Juli Mallett 2002-10-23 01:57:33 +00:00
parent 8b7f25d41d
commit 1d5e8e35b5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=105754
1 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
usr.bin/make/parse.c
View file

@ -1823,7 +1823,6 @@ ParseTraditionalInclude (char *file)
char *fullname; /* full pathname of file */
IFile *oldFile; /* state associated with current file */
char *cp; /* current position in file spec */
char *prefEnd;
/*
* Skip over whitespace
@ -1855,42 +1854,12 @@ ParseTraditionalInclude (char *file)
/*
* Now we know the file's name, we attempt to find the durn thing.
* A return of NULL indicates the file don't exist.
*
* Include files are first searched for relative to the including
* file's location. We don't want to cd there, of course, so we
* just tack on the old file's leading path components and call
* Dir_FindFile to see if we can locate the beast.
* XXX - this *does* search in the current directory, right?
* Search for it first on the -I search path, then on the .PATH
* search path, if not found in a -I directory.
*/
prefEnd = strrchr (fname, '/');
if (prefEnd != (char *)NULL) {
char *newName;
*prefEnd = '\0';
newName = str_concat (fname, file, STR_ADDSLASH);
fullname = Dir_FindFile (newName, parseIncPath);
if (fullname == (char *)NULL) {
fullname = Dir_FindFile(newName, dirSearchPath);
}
free (newName);
*prefEnd = '/';
} else {
fullname = (char *)NULL;
}
fullname = Dir_FindFile (file, parseIncPath);
if (fullname == (char *)NULL) {
/*
* System makefile or makefile wasn't found in same directory as
* included makefile. Search for it first on the -I search path,
* then on the .PATH search path, if not found in a -I directory.
* XXX: Suffix specific?
*/
fullname = Dir_FindFile (file, parseIncPath);
if (fullname == (char *)NULL) {
fullname = Dir_FindFile(file, dirSearchPath);
}
fullname = Dir_FindFile(file, dirSearchPath);
}
if (fullname == (char *)NULL) {