version 1.254, 2020/12/30 10:03:16 |
version 1.255, 2021/01/10 21:20:46 |
Line 1168 Dir_FindFile(const char *name, SearchPat |
|
Line 1168 Dir_FindFile(const char *name, SearchPat |
|
if ((file = DirLookupSubdir(dot, name)) != NULL) |
if ((file = DirLookupSubdir(dot, name)) != NULL) |
return file; |
return file; |
} |
} |
if (cur && (file = DirLookupSubdir(cur, name)) != NULL) |
if (cur != NULL && |
|
(file = DirLookupSubdir(cur, name)) != NULL) |
return file; |
return file; |
} |
} |
|
|
Line 1186 Dir_FindFile(const char *name, SearchPat |
|
Line 1187 Dir_FindFile(const char *name, SearchPat |
|
} |
} |
|
|
if (seenDotLast) { |
if (seenDotLast) { |
if (dot && !checkedDot) { |
if (dot != NULL && !checkedDot) { |
checkedDot = TRUE; |
checkedDot = TRUE; |
if ((file = DirLookupSubdir(dot, name)) != NULL) |
if ((file = DirLookupSubdir(dot, name)) != NULL) |
return file; |
return file; |
} |
} |
if (cur && (file = DirLookupSubdir(cur, name)) != NULL) |
if (cur != NULL && |
|
(file = DirLookupSubdir(cur, name)) != NULL) |
return file; |
return file; |
} |
} |
|
|
Line 1219 Dir_FindFile(const char *name, SearchPat |
|
Line 1221 Dir_FindFile(const char *name, SearchPat |
|
*/ |
*/ |
DEBUG0(DIR, " Trying exact path matches...\n"); |
DEBUG0(DIR, " Trying exact path matches...\n"); |
|
|
if (!seenDotLast && cur && |
if (!seenDotLast && cur != NULL && |
((file = DirLookupAbs(cur, name, base)) != NULL)) { |
((file = DirLookupAbs(cur, name, base)) != NULL)) { |
if (file[0] == '\0') { |
if (file[0] == '\0') { |
free(file); |
free(file); |
Line 1241 Dir_FindFile(const char *name, SearchPat |
|
Line 1243 Dir_FindFile(const char *name, SearchPat |
|
} |
} |
} |
} |
|
|
if (seenDotLast && cur && |
if (seenDotLast && cur != NULL && |
((file = DirLookupAbs(cur, name, base)) != NULL)) { |
((file = DirLookupAbs(cur, name, base)) != NULL)) { |
if (file[0] == '\0') { |
if (file[0] == '\0') { |
free(file); |
free(file); |
Line 1418 ResolveFullName(GNode *gn) |
|
Line 1420 ResolveFullName(GNode *gn) |
|
fullName = ResolveMovedDepends(gn); |
fullName = ResolveMovedDepends(gn); |
|
|
DEBUG2(DIR, "Found '%s' as '%s'\n", |
DEBUG2(DIR, "Found '%s' as '%s'\n", |
gn->name, fullName ? fullName : "(not found)"); |
gn->name, fullName != NULL ? fullName : "(not found)"); |
} |
} |
|
|
if (fullName == NULL) |
if (fullName == NULL) |