From 4b6f3d2ce1096f377d290136b6c84bcf60e786ec Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 25 Aug 2010 21:06:16 -0600 Subject: [PATCH] m4sh: revert regression in AS_TMPDIR Regression introduced in e0ac12089ea4c934029baf77741e659f0bebd653. * lib/m4sugar/m4sh.m4 (AS_TMPDIR): The previous patch trying to rename $tmp to $as_tmp was wrong; config.status relies on it. Signed-off-by: Eric Blake --- ChangeLog | 4 ++++ lib/m4sugar/m4sh.m4 | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbb2fbfd..71c764f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Eric Blake + m4sh: revert regression in AS_TMPDIR + * lib/m4sugar/m4sh.m4 (AS_TMPDIR): The previous patch trying to + rename $tmp to $as_tmp was wrong; config.status relies on it. + m4sh: reduce size of AS_VAR_TEST_SET * lib/m4sugar/m4sh.m4 (AS_VAR_TEST_SET): Make more compact. diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index facd70d9..2f8baec1 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -1615,17 +1615,20 @@ m4_define([_AS_LITERAL_HEREDOC_IF_NO], [$2]) # ------------------------------------------------- # Create as safely as possible a temporary directory in DIRECTORY # which name is inspired by PREFIX (should be 2-4 chars max). +# +# Even though $tmp does not fit our normal naming scheme of $as_*, +# it is a documented part of the public API and must not be changed. m4_define([AS_TMPDIR], [# Create a (secure) tmp directory for tmp files. m4_if([$2], [], [: "${TMPDIR=/tmp}"]) { - as_tmp=`(umask 077 && mktemp -d "m4_default([$2], + tmp=`(umask 077 && mktemp -d "m4_default([$2], [$TMPDIR])/$1XXXXXX") 2>/dev/null` && - test -d "$as_tmp" + test -d "$tmp" } || { - as_tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM - (umask 077 && mkdir "$as_tmp") + tmp=m4_default([$2], [$TMPDIR])/$1$$-$RANDOM + (umask 077 && mkdir "$tmp") } || AS_ERROR([cannot create a temporary directory in m4_default([$2], [$TMPDIR])])])# AS_TMPDIR -- 2.47.2