From 24527d6f996112608e7896e2ec5c4b1c473f8c6f Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Wed, 4 Nov 2009 18:10:48 +0100
Subject: [PATCH] Fix spurious failure of style.test.

* src/sanity/style.test: Make sure sh does not abort when read
exits with false.
---
 ChangeLog             | 7 +++++++
 src/sanity/style.test | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dcab7fe9c..de0dc5b7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-04  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Fix spurious failure of style.test.
+
+	* src/sanity/style.test: Make sure sh does not abort when read
+	exits with false.
+
 2009-11-04  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Fix a longstanding bug reported by Kristin Y. Rozier..
diff --git a/src/sanity/style.test b/src/sanity/style.test
index bd83e51c4..39cf264f5 100755
--- a/src/sanity/style.test
+++ b/src/sanity/style.test
@@ -1,4 +1,3 @@
-
 #! /bin/sh
 
 # Ensure consistent style by catching common improper constructs.
@@ -180,9 +179,9 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
 	;;
     esac
 
-
     $fail && echo "$file" >>failures
-  done
+
+  done || : # Make sure sh does not abort when read exits with false.
 done
 
 if test -f failures; then
@@ -191,3 +190,5 @@ if test -f failures; then
    rm failures
    exit 1;
 fi
+
+exit 0