shellcheck cleanup on scripts; add release tags; sg_timeout: show data-in with -vvv

git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@679 6180dd3e-e324-4e3e-922d-17de1ae2f315

3 files changed, 53 insertions, 53 deletions

diff --git a/scripts/scsi_logging_level b/scripts/scsi_logging_level
index c7c6d095..89c759ab 100755
--- a/scripts/scsi_logging_level
+++ b/scripts/scsi_logging_level
@@ -30,10 +30,10 @@ SET=0
 GET=0
 CREATE=0
 
-OPTS=`getopt -o hvcgsa:E:T:S:I:M:L:H: --long \
+OPTS=$(getopt -o hvcgsa:E:T:S:I:M:L:H: --long \
 help,version,create,get,set,all:,error:,timeout:,scan:,ioctl:,\
 midlevel:,mlqueue:,mlcomplete:,lowlevel:,llqueue:,llcomplete:,\
-highlevel:,hlqueue:,hlcomplete: -n \'$SCRIPTNAME\' -- "$@"`
+highlevel:,hlqueue:,hlcomplete: -n \'$SCRIPTNAME\' -- "$@")
 eval set -- "$OPTS"
 
 # print version info
@@ -104,7 +104,7 @@ check_cmdline()
 {
     while true ; do
         case "$1" in
-            -a|--all)   _ALL=$2; check_level $2
+            -a|--all)   _ALL="$2"; check_level "$2"
                         shift 2;;
             -c|--create) CREATE=1;
                         shift 1;;
@@ -116,31 +116,31 @@ check_cmdline()
                         shift 1;;
             -v|--version) printversion
                         exit 0;;
-            -E|--error) _ERROR=$2; check_level $2
+            -E|--error) _ERROR="$2"; check_level "$2"
                         shift 2;;
-            -T|--timeout) _TIMEOUT=$2; check_level $2
+            -T|--timeout) _TIMEOUT="$2"; check_level "$2"
                         shift 2;;
-            -S|--scan)  _SCAN=$2; check_level $2
+            -S|--scan)  _SCAN="$2"; check_level "$2"
                         shift 2;;
-            -M|--midlevel) _ML=$2; check_level $2
+            -M|--midlevel) _ML="$2"; check_level "$2"
                         shift 2;;
-            --mlqueue)  _MLQUEUE=$2; check_level $2
+            --mlqueue)  _MLQUEUE="$2"; check_level "$2"
                         shift 2;;
-            --mlcomplete) _MLCOMPLETE=$2; check_level $2
+            --mlcomplete) _MLCOMPLETE="$2"; check_level "$2"
                         shift 2;;
-            -L|--lowlevel) _LL=$2; check_level $2
+            -L|--lowlevel) _LL="$2"; check_level "$2"
                         shift 2;;
-            --llqueue)  _LLQUEUE=$2; check_level $2
+            --llqueue)  _LLQUEUE="$2"; check_level "$2"
                         shift 2;;
-            --llcomplete) _LLCOMPLETE=$2; check_level $2
+            --llcomplete) _LLCOMPLETE="$2"; check_level "$2"
                         shift 2;;
-            -H|--highlevel) _HL=$2; check_level $2
+            -H|--highlevel) _HL="$2"; check_level "$2"
                         shift 2;;
-            --hlqueue)  _HLQUEUE=$2; check_level $2
+            --hlqueue)  _HLQUEUE="$2"; check_level "$2"
                         shift 2;;
-            --hlcomplete) _HLCOMPLETE=$2; check_level $2
+            --hlcomplete) _HLCOMPLETE="$2"; check_level "$2"
                         shift 2;;
-            -I|--ioctl) _IOCTL=$2; check_level $2
+            -I|--ioctl) _IOCTL="$2"; check_level "$2"
                         shift 2;;
             --) shift; break;;
             *) echo "Internal error!" ; exit 1;;
@@ -149,7 +149,7 @@ check_cmdline()
 
     if [ -n "$*" ]
     then
-        invalid_cmdline invalid parameter $*
+        invalid_cmdline invalid parameter "$*"
     fi
 
     if [ $GET = "1" -a $SET = "1" ]
@@ -185,8 +185,8 @@ invalid_cmdline()
 get_logging_level()
 {
     echo "Current scsi logging level:"
-#   LEVEL=`sysctl -n dev.scsi.logging_level`
-    LEVEL=`cat /proc/sys/dev/scsi/logging_level`
+#   LEVEL=$(sysctl -n dev.scsi.logging_level)
+    LEVEL=$(cat /proc/sys/dev/scsi/logging_level)
     if [ $? != 0 ]
     then
         echo "$SCRIPTNAME: could not read scsi logging level" \
@@ -199,16 +199,16 @@ show_logging_level()
 {
     echo "/proc/sys/dev/scsi/logging_level = $LEVEL"
 
-    LOG_ERROR=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3))
-    LOG_TIMEOUT=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3))
-    LOG_SCAN=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3))
-    LOG_MLQUEUE=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3))
-    LOG_MLCOMPLETE=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3))
-    LOG_LLQUEUE=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3))
-    LOG_LLCOMPLETE=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3))
-    LOG_HLQUEUE=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3));
-    LOG_HLCOMPLETE=$(($LEVEL & 7)); LEVEL=$(($LEVEL>>3));
-    LOG_IOCTL=$(($LEVEL & 7))
+    LOG_ERROR=$((LEVEL & 7)); LEVEL=$((LEVEL>>3))
+    LOG_TIMEOUT=$((LEVEL & 7)); LEVEL=$((LEVEL>>3))
+    LOG_SCAN=$((LEVEL & 7)); LEVEL=$((LEVEL>>3))
+    LOG_MLQUEUE=$((LEVEL & 7)); LEVEL=$((LEVEL>>3))
+    LOG_MLCOMPLETE=$((LEVEL & 7)); LEVEL=$((LEVEL>>3))
+    LOG_LLQUEUE=$((LEVEL & 7)); LEVEL=$((LEVEL>>3))
+    LOG_LLCOMPLETE=$((LEVEL & 7)); LEVEL=$((LEVEL>>3))
+    LOG_HLQUEUE=$((LEVEL & 7)); LEVEL=$((LEVEL>>3));
+    LOG_HLCOMPLETE=$((LEVEL & 7)); LEVEL=$((LEVEL>>3));
+    LOG_IOCTL=$((LEVEL & 7))
 
     echo "SCSI_LOG_ERROR=$LOG_ERROR"
     echo "SCSI_LOG_TIMEOUT=$LOG_TIMEOUT"
@@ -236,19 +236,19 @@ set_logging_level()
 }
 create_logging_level()
 {
-    LEVEL=$(($LOG_IOCTL & 7)); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_HLCOMPLETE & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_HLQUEUE & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_LLCOMPLETE & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_LLQUEUE & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_MLCOMPLETE & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_MLQUEUE & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_SCAN & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_TIMEOUT & 7))); LEVEL=$(($LEVEL<<3))
-    LEVEL=$(($LEVEL|($LOG_ERROR & 7)))
+    LEVEL=$((LOG_IOCTL & 7)); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_HLCOMPLETE & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_HLQUEUE & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_LLCOMPLETE & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_LLQUEUE & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_MLCOMPLETE & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_MLQUEUE & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_SCAN & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_TIMEOUT & 7))); LEVEL=$((LEVEL<<3))
+    LEVEL=$((LEVEL|(LOG_ERROR & 7)))
 }
 
-check_cmdline $*
+check_cmdline "$*"
 
 if [ $SET = "1" ]
 then
diff --git a/scripts/scsi_mandat b/scripts/scsi_mandat
index 6de86586..7c11a408 100755
--- a/scripts/scsi_mandat
+++ b/scripts/scsi_mandat
@@ -37,7 +37,7 @@ timeout=0
 unit_attention=0
 aborted_command=0
 
-total_err=0
+## total_err=0
 
 usage()
 {
@@ -77,23 +77,23 @@ for command in "sg_inq" "sg_luns" "sg_turs" "sg_requests" "sg_vpd" \
                 "sg_vpd -i" "sg_senddiag -t"
 do
   if [ $quiet -eq 0 ]
-    then echo "$command" $verbose $1
+    then echo "$command" $verbose "$1"
   fi
 
   if [ $verbose ]
   then
     if [ $log -eq 0 ]
     then
-      $command $verbose $1
+      $command $verbose "$1"
     else
-      $command $verbose $1 >> scsi_mandat.err 2>> scsi_mandat.err
+      $command $verbose "$1" >> scsi_mandat.err 2>> scsi_mandat.err
     fi
   else
     if [ $log -eq 0 ]
     then
-      $command $1 > /dev/null 2>> /dev/null
+      $command "$1" > /dev/null 2>> /dev/null
     else
-      $command $1 > /dev/null 2>> scsi_mandat.err
+      $command "$1" > /dev/null 2>> scsi_mandat.err
     fi
   fi
   res=$?
@@ -108,7 +108,7 @@ do
     11) echo "  aborted command" ; let aborted_command=$aborted_command+1 ;;
     15) echo "  file error with $1 " ; let file_err=$file_err+1 ;;
     20) echo "  no sense" ; let other_err=$other_err+1 ;;
-    21) echo "  recovered error" ; let recovered_err=$recovered_err+1 ;;
+    21) echo "  recovered error" ; let recovered=$recovered+1 ;;
     33) echo "  timeout" ; let timeout=$timeout+1 ;;
     97) echo "  response fails sanity" ; let sanity=$sanity+1 ;;
     98) echo "  other SCSI error" ; let other_err=$other_err+1 ;;
diff --git a/scripts/scsi_satl b/scripts/scsi_satl
index 60994225..c79249bc 100755
--- a/scripts/scsi_satl
+++ b/scripts/scsi_satl
@@ -45,7 +45,7 @@ timeout=0
 unit_attention=0
 aborted_command=0
 
-total_err=0
+## total_err=0
 
 usage()
 {
@@ -83,19 +83,19 @@ for command in "sg_inq" "sg_vpd" "sg_vpd -p di" "sg_vpd -p ai" "sg_luns" \
                "sg_sat_identify"
 do
   if [ $quiet -eq 0 ]
-    then echo "$command" $1
+    then echo "$command" "$1"
   fi
 
   if [ $log -eq 0 ]
   then
     if [ $verbose ]
     then
-      $command $verbose $1 > /dev/null
+      $command $verbose "$1" > /dev/null
     else
-      $command $1 > /dev/null 2>> /dev/null
+      $command "$1" > /dev/null 2>> /dev/null
     fi
   else
-    $command $verbose $1 > /dev/null 2>> scsi_satl.err
+    $command $verbose "$1" > /dev/null 2>> scsi_satl.err
   fi
   res=$?
   case "$res" in
@@ -109,7 +109,7 @@ do
     11) echo "  aborted command" ; let aborted_command=$aborted_command+1 ;;
     15) echo "  file error with $1 " ; let file_err=$file_err+1 ;;
     20) echo "  no sense" ; let other_err=$other_err+1 ;;
-    21) echo "  recovered error" ; let recovered_err=$recovered_err+1 ;;
+    21) echo "  recovered error" ; let recovered=$recovered+1 ;;
     33) echo "  timeout" ; let timeout=$timeout+1 ;;
     97) echo "  response fails sanity" ; let sanity=$sanity+1 ;;
     98) echo "  other SCSI error" ; let other_err=$other_err+1 ;;