Wrappers improved

sclang

@@ -1,13 +1,3 @@
 #!/bin/sh
-# USAGE: sclang [stfs flags] -- [clang flags]
 
-STFW_FLAGS=
-
-while [ $1 != '--' ]; do
-   STFW_FLAGS=$STFW_FLAGS' '$1
-   shift
-done
-
-shift
-
-clang $* 2>&1 | ./stfw.py $STFW_FLAGS
+./wrapper.sh "clang" $0 $*

sclang++

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./wrapper.sh "clang++" $0 $*

sg++

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./wrapper.sh "g++ -Wall" $0 $*

sgcc

@@ -1,13 +1,3 @@
 #!/bin/sh
-# USAGE: sgcc [stfs flags] -- [gcc flags]
 
-STFW_FLAGS=
-
-while [ $1 != '--' ]; do
-   STFW_FLAGS=$STFW_FLAGS' '$1
-   shift
-done
-
-shift
-
-gcc -Wall $* 2>&1 | ./stfw.py $STFW_FLAGS
+./wrapper.sh "gcc -Wall" $0 $*

wrapper.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+executable=$1
+shift
+script=$1
+shift
+
+function usage() {
+   echo "Wrapper usage: $script [stfw flags] -- [gcc flags]"
+   echo -n "Utility "
+   ./stfw.py --help
+}
+
+STFW_FLAGS=
+
+while [ \( "$1" != '--' \) -a -n "$1" ]; do
+   if [ \( $1 == '--help' \) -o \( $1 == '-h' \) ]; then
+      usage
+      exit 0
+   fi
+   STFW_FLAGS=$STFW_FLAGS' '$1
+   shift
+done
+
+if [ -z $1 ]; then
+   usage
+   exit 0
+fi
+
+shift
+
+$executable $* 2>&1 | ./stfw.py $STFW_FLAGS