From 562809a2da3bd1b550992934f26bf597c8d7fb73 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 11 Jun 2011 15:55:49 +0000
Subject: [PATCH] /etc/init.d/scst: Improved /etc/scst.conf parsing robustness
 for manually edited scst.conf files

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3569 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/init.d/scst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scstadmin/init.d/scst b/scstadmin/init.d/scst
index 801593540..9b9d77fed 100755
--- a/scstadmin/init.d/scst
+++ b/scstadmin/init.d/scst
@@ -81,10 +81,10 @@ parse_scst_conf() {
     if [ ! -e $SCST_CFG ]; then
         return 1
     fi
+    local nonblanks="[^ 	]\{1,\}"
     local blanks="[ 	]\{1,\}"
-    SCST_MODULES="scst `
-        sed -n -e 's/^HANDLER'"$blanks"'\(.*\)'"$blanks"'{$/\1/p' -e 's/^\[HANDLER'"$blanks"'\(.*\)\]$/\1/p' \
-          $SCST_CFG \
+    SCST_MODULES="scst `sed -n -e 's/^HANDLER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{$/\1/p' \
+                         -e 's/^\[HANDLER'"$blanks"'\('"$nonblanks"'\)\]$/\1/p' $SCST_CFG \
         | while read h; do
             case "$h" in
                 dev_cdrom)      echo scst_cdrom;;
@@ -98,15 +98,15 @@ parse_scst_conf() {
                 vdisk*|vcdrom)  echo scst_vdisk;;
                 *)              echo "$h";;
             esac
-        done | sort -u;
-        sed -n 's/^TARGET_DRIVER'"$blanks"'\(.*\)'"$blanks"'{$/\1/p' $SCST_CFG | while read d; do
+        done | sort -u` \
+        `sed -n 's/^TARGET_DRIVER'"$blanks"'\('"$nonblanks"'\)'"$blanks"'{$/\1/p' $SCST_CFG | while read d; do
             case "$d" in
                 iscsi)    echo iscsi_scst;;
                 qla2x00t) echo qla2x00tgt;;
                 *)        echo "$d";;
             esac
-        done | sort -u
-        ` $SCST_TARGET_MODULES"
+        done | sort -u` \
+        $SCST_TARGET_MODULES"
     if using_iscsi; then
         case "`uname -m`" in
             x86_64|i686)