Attachment 18160 Details for Bug 32759 – file.diff

[patch] file.diff

file.diff (text/plain), 2.12 KB, created by Mark Valentine on 2001-12-12 18:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Valentine

Created: 2001-12-12 18:30:00 UTC

Size: 2.12 KB

patch

obsolete

>Index: usr.bin/make/parse.c
>===================================================================
>RCS file: /usr/cvs/src/usr.bin/make/parse.c,v
>retrieving revision 1.22
>diff -u -r1.22 parse.c
>--- usr.bin/make/parse.c	28 Aug 1999 01:03:35 -0000	1.22
>+++ usr.bin/make/parse.c	11 Dec 2001 19:46:31 -0000
>@@ -1830,7 +1830,6 @@
>     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
>@@ -1862,42 +1861,12 @@
> 
>     /*
>      * 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) {

Actions: View | Diff

Attachments on bug 32759: 18160