Module Name: src
Committed By: sjg
Date: Wed Apr 14 16:16:18 UTC 2010
Modified Files:
src/usr.bin/make: main.c
Log Message:
If argv[0] is not an absolute path, attempt to resolve it
using realpath() for setting .MAKE
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 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.177 src/usr.bin/make/main.c:1.178
--- src/usr.bin/make/main.c:1.177 Thu Apr 8 17:41:29 2010
+++ src/usr.bin/make/main.c Wed Apr 14 16:16:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.177 2010/04/08 17:41:29 sjg Exp $ */
+/* $NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.177 2010/04/08 17:41:29 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.178 2010/04/14 16:16:17 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.177 2010/04/08 17:41:29 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.178 2010/04/14 16:16:17 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -895,8 +895,16 @@
* MFLAGS also gets initialized empty, for compatibility.
*/
Parse_Init();
- Var_Set("MAKE", argv[0], VAR_GLOBAL, 0);
- Var_Set(".MAKE", argv[0], VAR_GLOBAL, 0);
+ if (argv[0][0] == '/') {
+ p1 = argv[0];
+ } else {
+ p1 = realpath(argv[0], mdpath);
+ if (!p1 || *p1 != '/') {
+ p1 = argv[0]; /* realpath failed */
+ }
+ }
+ Var_Set("MAKE", p1, VAR_GLOBAL, 0);
+ Var_Set(".MAKE", p1, VAR_GLOBAL, 0);
Var_Set(MAKEFLAGS, "", VAR_GLOBAL, 0);
Var_Set(MAKEOVERRIDES, "", VAR_GLOBAL, 0);
Var_Set("MFLAGS", "", VAR_GLOBAL, 0);
