Module Name: src
Committed By: sjg
Date: Sat Oct 31 06:18:21 UTC 2020
Modified Files:
src/usr.bin/make: main.c
Log Message:
Do not use an objdir that is not writable.
To generate a diff of this commit:
cvs rdiff -u -r1.412 -r1.413 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.412 src/usr.bin/make/main.c:1.413
--- src/usr.bin/make/main.c:1.412 Fri Oct 30 20:30:44 2020
+++ src/usr.bin/make/main.c Sat Oct 31 06:18:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.412 2020/10/30 20:30:44 rillig Exp $ */
+/* $NetBSD: main.c,v 1.413 2020/10/31 06:18:21 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.412 2020/10/30 20:30:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.413 2020/10/31 06:18:21 sjg Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -721,7 +721,7 @@ Main_SetObjdir(const char *fmt, ...)
/* look for the directory and try to chdir there */
if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
- if (chdir(path)) {
+ if (access(path, W_OK) || chdir(path)) {
(void)fprintf(stderr, "make warning: %s: %s.\n",
path, strerror(errno));
} else {
