Module Name: src
Committed By: rillig
Date: Mon Apr 19 16:35:11 UTC 2021
Modified Files:
src/usr.bin/make: main.c
Log Message:
make: avoid double slash in name of temporary directory
If the environment variable TMPDIR is not set, make uses a default path
that includes a trailing '/'.
For extra correctness it always appended an extra '/', leading to paths
of the form '/tmp//makeXXXXXX'. This looked suspicious, as if there had
been a forgotten empty part between the two '/'. Avoid this ambiguity
by replacing '//' with '/'.
To generate a diff of this commit:
cvs rdiff -u -r1.538 -r1.539 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.538 src/usr.bin/make/main.c:1.539
--- src/usr.bin/make/main.c:1.538 Wed Apr 14 17:24:48 2021
+++ src/usr.bin/make/main.c Mon Apr 19 16:35:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.538 2021/04/14 17:24:48 rillig Exp $ */
+/* $NetBSD: main.c,v 1.539 2021/04/19 16:35:11 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.538 2021/04/14 17:24:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.539 2021/04/19 16:35:11 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -2198,7 +2198,7 @@ getTmpdir(void)
return tmpdir;
/* Honor $TMPDIR but only if it is valid. Ensure it ends with '/'. */
- (void)Var_Subst("${TMPDIR:tA:U" _PATH_TMP "}/",
+ (void)Var_Subst("${TMPDIR:tA:U" _PATH_TMP ":S,/$,,W}/",
SCOPE_GLOBAL, VARE_WANTRES, &tmpdir);
/* TODO: handle errors */
