From: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Tue, 27 Jan 2009 13:48:04 +0000 (+0100)
Subject: Quote traced macros passed from autom4te to M4.
X-Git-Tag: v2.63b~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f28c6e6564c2c9bdb0ac7e285cb3e24e673c7f5;p=thirdparty%2Fautoconf.git

Quote traced macros passed from autom4te to M4.

* bin/autom4te (handle_m4): Apply shell_quote to macro names.
* tests/tools.at (autom4te --trace and unusual macro names): New
test.
* THANKS: Update.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index e7d833fc4..4fdcce6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-27  Peter Breitenlohner  <peb@mppmu.mpg.de>  (tiny change)
+
+	Quote traced macros passed from autom4te to M4.
+	* bin/autom4te (handle_m4): Apply shell_quote to macro names.
+	* tests/tools.at (autom4te --trace and unusual macro names): New
+	test.
+	* THANKS: Update.
+
 2009-01-26  Eric Blake  <ebb9@byu.net>
 
 	Improve AC_DEFUN_ONCE semantics.
diff --git a/THANKS b/THANKS
index a3ae8c27f..54310b5f3 100644
--- a/THANKS
+++ b/THANKS
@@ -278,6 +278,7 @@ Paul Pogonyshev             ?
 Paul Townsend               ?
 Pavel Roskin                pavel_roskin@geocities.com
 Per Øyvind Karlsen          peroyvind@mandriva.org
+Peter Breitenlohner         peb@mppmu.mpg.de
 Peter Eisentraut            peter_e@gmx.net
 Peter Hendrickson           pdh@wiredyne.com
 Peter O'Gorman              peter@pogma.com
@@ -376,8 +377,8 @@ mode: text
 coding: utf-8
 End:
 
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+2008, 2009 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/bin/autom4te.in b/bin/autom4te.in
index 50c410cdc..4281e0301 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -6,8 +6,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
     if 0;
 
 # autom4te - Wrapper around M4 libraries.
-# Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009 Free
+# Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -466,7 +466,7 @@ sub handle_m4 ($@)
 	   . ' --debug=aflq'
 	   . (!exists $ENV{'AUTOM4TE_NO_FATAL'} ? ' --fatal-warning' : '')
 	   . " @M4_DEBUGFILE@=" . shell_quote ("$tcache" . $req->id . "t")
-	   . join (' --trace=',   '', sort @macro)
+	   . join (' --trace=', '', map { shell_quote ($_) } sort @macro)
 	   . " " . files_to_options (@ARGV)
 	   . " > " . shell_quote ("$ocache" . $req->id . "t"));
 
diff --git a/tests/tools.at b/tests/tools.at
index 3fa0fdb8a..9282e88f9 100644
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -2,8 +2,8 @@
 
 AT_BANNER([Executables (autoheader, autoupdate...).])
 
-# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007, 2008 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007, 2008, 2009 Free
+# Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -213,6 +213,19 @@ done
 AT_CLEANUP
 
 
+# autom4te --trace and unusual macro names
+# ----------------------------------------
+
+AT_SETUP([autom4te --trace and unusual macro names])
+
+AT_DATA([file.m4],
+[[
+]])
+AT_CHECK_AUTOM4TE([-t 'TR A CE' -t 'TR(A)CE' file.m4])
+
+AT_CLEANUP
+
+
 ## ------------------ ##
 ## autoconf --trace.  ##
 ## ------------------ ##