From 930193ee842c96cee441ad202df8518e13c89ca2 Mon Sep 17 00:00:00 2001
From: jay <jay>
Date: Sat, 11 Dec 2004 19:30:21 +0000
Subject: [PATCH] Fixed Savannah bug #11280

---
 THANKS                             | 1 +
 configure.in                       | 2 +-
 find/testsuite/Makefile.am         | 2 ++
 find/testsuite/config/unix.exp     | 2 +-
 find/testsuite/find.gnu/printf.exp | 6 ++++++
 find/testsuite/find.gnu/printf.xo  | 7 +++++++
 6 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 find/testsuite/find.gnu/printf.exp
 create mode 100644 find/testsuite/find.gnu/printf.xo

diff --git a/THANKS b/THANKS
index 0a6e9fb..ee034b2 100644
--- a/THANKS
+++ b/THANKS
@@ -15,6 +15,7 @@ Steve Revilak
 Solar Designer <solar@openwall.com>
 John Levon
 Geoff Clare
+Andreas Metzler
 
 Suggestion for locate's ignore-case code:
 Matt Mueller <donut@azstarnet.com>
diff --git a/configure.in b/configure.in
index 344b1c0..f7034b3 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_CONFIG_MACRO_DIR(gnulib/m4)
 dnl Set of available languages.
 ALL_LINGUAS="da de es et fr gl id it ko nl pl pt_BR ru sv tr sk"
 
-AM_INIT_AUTOMAKE(findutils, 4.2.10)
+AM_INIT_AUTOMAKE(findutils, 4.2.11-CVS)
 
 AC_SUBST(INCLUDES)dnl
 AC_ARG_ENABLE(id-cache,
diff --git a/find/testsuite/Makefile.am b/find/testsuite/Makefile.am
index 97ab373..e23a220 100644
--- a/find/testsuite/Makefile.am
+++ b/find/testsuite/Makefile.am
@@ -12,6 +12,8 @@ EXTRA_DIST = config/unix.exp \
 		find.gnu/name-opt.exp \
 		find.gnu/perm.exp \
 		find.gnu/perm.xo \
+		find.gnu/printf.exp \
+		find.gnu/printf.xo \
 		find.gnu/prune-default-print.exp \
 		find.gnu/prune-default-print.xo  \
 		find.posix/sv-bug-11175.exp \
diff --git a/find/testsuite/config/unix.exp b/find/testsuite/config/unix.exp
index 79500c9..3f033f7 100644
--- a/find/testsuite/config/unix.exp
+++ b/find/testsuite/config/unix.exp
@@ -119,6 +119,6 @@ proc find_start { passfail options {infile ""}} {
 # Called by runtest.
 # Clean up (remove temporary files) before runtest exits.
 proc find_exit {} {
-    catch "exec rm -f find.out"
+    #catch "exec rm -f find.out"
     exec echo hello
 }
diff --git a/find/testsuite/find.gnu/printf.exp b/find/testsuite/find.gnu/printf.exp
new file mode 100644
index 0000000..af78f0b
--- /dev/null
+++ b/find/testsuite/find.gnu/printf.exp
@@ -0,0 +1,6 @@
+exec rm -rf tmp
+exec mkdir tmp
+exec touch tmp/file
+exec chmod 600 tmp/file
+find_start p {tmp -type f -printf "%d\n" -printf "%f\n" -printf "%h\n" -printf "%H\n" -printf "%m\n" -printf "%p\n" -printf "%P\n"}
+exec rm -rf tmp
diff --git a/find/testsuite/find.gnu/printf.xo b/find/testsuite/find.gnu/printf.xo
new file mode 100644
index 0000000..1cbe68d
--- /dev/null
+++ b/find/testsuite/find.gnu/printf.xo
@@ -0,0 +1,7 @@
+1
+file
+tmp
+tmp
+600
+tmp/file
+file
-- 
2.11.4.GIT