* lib/mdate-sh: Avoid infinite loop with GNU ls when TIME_STYLE is set.

* tests/txinfo28.test: Set TIME_STYLE.
Report from Vincent Lefevre and James Youngman.

diff --git a/ChangeLog b/ChangeLog
index 1085ef8..a1ed349 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-06-28  Stepan Kasal  <kasal@ucw.cz>
+           Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * lib/mdate-sh: Avoid infinite loop with GNU ls when TIME_STYLE is set.
+       * tests/txinfo28.test: Set TIME_STYLE.
+       Report from Vincent Lefevre and James Youngman.
+
 2005-06-24  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * lib/Automake/Variable.pm (define, _new): Remember the helper

diff --git a/THANKS b/THANKS
index 5552ef5..32f0ad8 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -269,6 +269,7 @@ Ulrich Drepper              drepper@gnu.ai.mit.edu
 Ulrich Eckhardt                eckhardt@satorlaser.com
 Václav Haisman                V.Haisman@sh.cvut.cz
 Vadim Zeitlin          Vadim.zeitlin@dptmaths.ens-cachan.fr
+Vincent Lefevre                Vincent Lefevre <vincent@vinc17.org>
 Volker Boerchers       vboerchers@tecon.de
 Werner John            john@oswf.de
 Werner Koch            wk@isil.d.shuttle.de

diff --git a/lib/mdate-sh b/lib/mdate-sh
index 52156b3..cd916c0 100755 (executable)
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
 
-scriptversion=2005-05-14.22
+scriptversion=2005-06-29.22
 
 # Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
 # Foundation, Inc.
@@ -59,7 +59,15 @@ export LC_ALL
 LC_TIME=C
 export LC_TIME
 
-save_arg1="$1"
+# GNU ls changes its time format in response to the TIME_STYLE
+# variable.  Since we cannot assume `unset' works, revert this
+# variable to its documented default.
+if test "${TIME_STYLE+set}" = set; then
+  TIME_STYLE=posix-long-iso
+  export TIME_STYLE
+fi
+
+save_arg1=$1
 
 # Find out how to get the extended ls output of a file or directory.
 if ls -L /dev/null 1>/dev/null 2>&1; then

diff --git a/tests/txinfo28.test b/tests/txinfo28.test
index b79a933..ee4c8ce 100755 (executable)
--- a/tests/txinfo28.test
+++ b/tests/txinfo28.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -27,6 +27,11 @@ required='makeinfo tex texi2dvi-o'
 
 set -e
 
+# This setting, when honored by GNU ls, used to cause an infinite loop
+# in mdate-sh.
+TIME_STYLE="+%Y-%m-%d %H:%M:%S"
+export TIME_STYLE
+
 echo AC_OUTPUT >> configure.in
 
 cat > Makefile.am << 'END'