I've applied this patch to Automake git, and pulled it into Autoconf.
Cheers,
Ralf
* lib/Automake/FileUtils.pm (open_quote): New function.
(update_file, contents): Use it.
diff --git a/lib/Automake/FileUtils.pm b/lib/Automake/FileUtils.pm
index 6a60e22..34c48e3 100644
--- a/lib/Automake/FileUtils.pm
+++ b/lib/Automake/FileUtils.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 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
@@ -44,12 +44,38 @@ use Automake::ChannelDefs;
use vars qw (@ISA @EXPORT);
@ISA = qw (Exporter);
[EMAIL PROTECTED] = qw (&contents
[EMAIL PROTECTED] = qw (&open_quote &contents
&find_file &mtime
&update_file &up_to_date_p
&xsystem &xqx &dir_has_case_matching_file &reset_dir_cache);
+=item C<open_quote ($file_name)>
+
+Quote C<$file_name> for open.
+
+=cut
+
+# $FILE_NAME
+# open_quote ($FILE_NAME)
+# -----------------------
+# If the string $S is a well-behaved file name, simply return it.
+# If it starts with white space, prepend `./', if it ends with
+# white space, add `\0'. Return the new string.
+sub open_quote($)
+{
+ my ($s) = @_;
+ if ($s =~ m/^\s/)
+ {
+ $s = "./$s";
+ }
+ if ($s =~ m/\s$/)
+ {
+ $s = "$s\0";
+ }
+ return $s;
+}
+
=item C<find_file ($file_name, @include)>
Return the first path for a C<$file_name> in the C<include>s.
@@ -139,7 +165,7 @@ sub update_file ($$;$)
if ($to eq '-')
{
- my $in = new IO::File ("$from");
+ my $in = new IO::File ("< " . open_quote ($from));
my $out = new IO::File (">-");
while ($_ = $in->getline)
{
@@ -303,7 +329,7 @@ sub contents ($)
my ($file) = @_;
verb "reading $file";
local $/; # Turn on slurp-mode.
- my $f = new Automake::XFile "< $file";
+ my $f = new Automake::XFile "< " . open_quote ($file);
my $contents = $f->getline;
$f->close;
return $contents;
