--- src/usr.bin/make/main.c 2005/02/03 23:41:05 1.53 +++ src/usr.bin/make/main.c 2005/02/04 22:35:42 1.54 @@ -407,7 +407,7 @@ chdir_verify_path(const char *path, char if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) { if (chdir(path) == -1 || getcwd(obpath, MAXPATHLEN) == NULL) { warn("warning: %s", path); - return (0); + return (NULL); } return (obpath); } @@ -476,6 +476,7 @@ main(int argc, char **argv) const char *machine_arch = getenv("MACHINE_ARCH"); const char *machine_cpu = getenv("MACHINE_CPU"); char *cp = NULL, *start; + /* avoid faults on read-only strings */ static char syspath[] = _PATH_DEFSYSPATH; @@ -645,6 +646,7 @@ main(int argc, char **argv) { struct stat sa; + if (stat(curdir, &sa) == -1) err(2, "%s", curdir); }