From b14395dea54e5debcc32f21ffdcb443aef399513 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 11 Nov 2003 07:22:02 +0000
Subject: [PATCH] Update.

2003-11-10  Carlos O'Donell  <carlos@baldric.uwo.ca>

	* io/ftwtest-sh: Fix nested sed commands.

2003-11-10  Jakub Jelinek  <jakub@redhat.com>

	* posix/regex_internal.h (re_string_char_size_at): Don't look beyond
	valid_len wide chars.
---
 ChangeLog     | 9 +++++++++
 io/ftwtest-sh | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9880e54..220de42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-10  Carlos O'Donell  <carlos@baldric.uwo.ca>
+
+	* io/ftwtest-sh: Fix nested sed commands.
+
+2003-11-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/regex_internal.h (re_string_char_size_at): Don't look beyond
+	valid_len wide chars.
+
 2003-11-09  Roland McGrath  <roland@redhat.com>
 
 	* manual/examples/dir2.c (one): Add const to argument type.
diff --git a/io/ftwtest-sh b/io/ftwtest-sh
index 2fed2ed..dc495d5 100644
--- a/io/ftwtest-sh
+++ b/io/ftwtest-sh
@@ -231,7 +231,7 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-siblings=lvl1 $tmpdir |
 # If lvl1b comes after lvl1, it shouldn't be printed, while if it
 # comes before, it should.
 catcmd=cat
-[ -n "`ls -U $tmpdir/foo/ | sed -n '/lvl1$/,${/lvl1b$/p}'`" ] \
+[ -n "`ls -U $tmpdir/foo/ | sed -n '/lvl1$/,${/lvl1b$/p;}'`" ] \
   && catcmd="grep -v lvl1b"
 
 $catcmd <<EOF | diff -u $testout - || exit 1
@@ -255,7 +255,7 @@ LD_LIBRARY_PATH=$objpfx $ldso $testprogram --skip-siblings=file@1b $tmpdir |
 # If file[23]@1b come after file@1b, it shouldn't be printed, while if they
 # come before, they should.
 regexp=`echo $(ls -U /tmp/ftwtest.d/foo/lvl1b \
-	       | sed -n '/file@1b$/,${/file[23]@1b$/p}') | sed 's, ,|,'`
+	       | sed -n '/file@1b$/,${/file[23]@1b$/p;}') | sed 's, ,|,'`
 catcmd=cat
 [ -n "$regexp" ] && catcmd="egrep -v $regexp"
 
-- 
2.7.4