Module Name: src
Committed By: sjg
Date: Tue Apr 20 17:18:08 UTC 2010
Modified Files:
src/usr.bin/make: main.c
Log Message:
On some systems realpath will prefix make with cwd, so make sure
we can stat(2) the value for .MAKE
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 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.178 src/usr.bin/make/main.c:1.179
--- src/usr.bin/make/main.c:1.178 Wed Apr 14 16:16:17 2010
+++ src/usr.bin/make/main.c Tue Apr 20 17:18:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $ */
+/* $NetBSD: main.c,v 1.179 2010/04/20 17:18:08 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.179 2010/04/20 17:18:08 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.179 2010/04/20 17:18:08 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -899,7 +899,7 @@
p1 = argv[0];
} else {
p1 = realpath(argv[0], mdpath);
- if (!p1 || *p1 != '/') {
+ if (!p1 || *p1 != '/' || stat(p1, &sb) < 0) {
p1 = argv[0]; /* realpath failed */
}
}
