From 43403d166ab0742d0a67f1d197e056e4c7109035 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov <ru@FreeBSD.org> Date: Wed, 25 Apr 2001 14:22:38 +0000 Subject: [PATCH] Make ${.OBJDIR} canonical. Reviewed by: bde --- usr.bin/make/main.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index dc8c8c864f7f..4ba3a6a8e364 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -418,19 +418,11 @@ chdir_verify_path(path, obpath) struct stat sb; if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) { - if (chdir(path)) { + if (chdir(path) == -1 || getcwd(obpath, MAXPATHLEN) == NULL) { warn("warning: %s", path); return 0; } - else { - if (path[0] != '/') { - (void) snprintf(obpath, MAXPATHLEN, "%s/%s", - curdir, path); - return obpath; - } - else - return path; - } + return obpath; } return 0;