[Logcheck-commits] Hannes von Haugwitz: s/logcheck: reenabled globbing of logfile names

Hannes von Haugwitz hvh-guest at alioth.debian.org
Fri Jul 8 12:26:45 UTC 2011


Module: logcheck
Branch: master
Commit: d076526104cd6795744468ddcd6d0391d2a0b82d
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=d076526104cd6795744468ddcd6d0391d2a0b82d

Author: Hannes von Haugwitz <hannes at vonhaugwitz.com>
Date:   Fri Jul  8 14:00:40 2011 +0200

s/logcheck: reenabled globbing of logfile names

* closes: #616103
* this commit reverts the changes of b42f6ed2
* #319169 is now solved by setting the IFS accordingly

---

 debian/changelog |    1 +
 src/logcheck     |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 754fe18..3d080d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ logcheck (1.3.14) unstable; urgency=low
   [ Hannes von Haugwitz ]
   * src/logcheck:
     - added numeric timezone information to subject line
+    - reenabled globbing of logfile names (closes: #616103)
   * docs/README.logcheck-database:
     - mention logcheck-test in 'TESTING RULES' section
   * ignore.d.workstation/wpasupplicant:
diff --git a/src/logcheck b/src/logcheck
index ac75c1c..5878795 100755
--- a/src/logcheck
+++ b/src/logcheck
@@ -662,9 +662,11 @@ fi
 mkdir "$TMPDIR/logoutput" \
     || error "Could not mkdir for log files"
 if [ ! "$LOGFILE" ] && [ -r "$LOGFILES_LIST" ]; then
-    egrep --text -v "(^#|^[[:space:]]*$)" "$LOGFILES_LIST" | while read file; do
+    SAVEIFS=$IFS; IFS=$(echo -en "\n\b");
+    for file in $(egrep --text -v "(^#|^[[:space:]]*$)" "$LOGFILES_LIST"); do
 	logoutput "$file"
     done
+    IFS=$SAVEIFS
 elif [ "$LOGFILE" ]; then
     if [ -f "$LOGFILE" ] && [ -r "$LOGFILE" ]; then
         logoutput "$LOGFILE"




More information about the Logcheck-commits mailing list