csexec-symbiotic.sh: Improve the wrapper script

* `linux-ld` and `--argv0` arguments are now skipped automatically
* Arguments for symbiotic are now parsed correctly

Author: lzaoral

csexec-symbiotic.sh

@@ -1,26 +1,49 @@
-#!/bin/bash
+#!/usr/bin/bash
 
-# USAGE:
-#
-# 1) Build the source with gllvm and CFLAGS internally used by Symbiotic.
-# 2) CSEXEC_WRAP_DONT_USE_LD=1 \
-#    CSEXEC_WRAP_CMD=$'csexec-symbiotic.sh\a--prp=memsafety' make check
-# 3) Wait for some time.
-# 4) ...
-# 5) Profit!
+usage() {
+  cat << EOF
+USAGE:
+1) Build the source with gllvm and CFLAGS internally used by Symbiotic and
+   LDFLAGS='-Wl,--dynamic-linker=/usr/bin/csexec-loader'.
+2) CSEXEC_WRAP_CMD=$'csexec-symbiotic.sh\a--prp=memsafety' make check
+3) Wait for some time.
+4) ...
+5) Profit!
+EOF
+}
 
 set -e
 
-SYMBIOTIC_ARGS="$1"
-BINARY="$2"
-BINARY_ARGV="$3"
+if [ $# -eq 0 ]; then
+  usage
+  exit 1
+fi
+
+i=1
+while [ ! -e ${!i} ]; do
+  SYMBIOTIC_ARGS="$SYMBIOTIC_ARGS ${!i}"
+  ((i++))
+done
+
+# Skip LD_LINUX_SO
+((i++))
+
+# Skip --argv0
+if [ ${!i} = "--argv0" ]; then
+  ((i += 2))
+fi
+
+BINARY="${!i}"
+((i++))
+
+BINARY_ARGV="${!i}"
+((i++))
 
-i=4
 while [ $i -le $# ]; do
   BINARY_ARGV="$BINARY_ARGV,${!i}"
   ((i++))
 done
 
 get-bc "$BINARY" 1> /dev/tty 2>&1
-echo "Executing $SYMBIOTIC_ARGS --argv='$BINARY_ARGV' $BINARY.bc" 1> /dev/tty 2>&1
-symbiotic $SYMBIOTIC_ARGS --argv="'$BINARY_ARGV'" "$BINARY.bc" 1> /dev/tty 2>&1
+echo "Executing 'symbiotic$SYMBIOTIC_ARGS --argv='$BINARY_ARGV' $BINARY.bc'" 1> /dev/tty 2>&1
+exec symbiotic $SYMBIOTIC_ARGS --argv="'$BINARY_ARGV'" "$BINARY.bc" 1> /dev/tty 2>&1

do_SRPM.sh

@@ -58,7 +58,7 @@ tar -Jcf "symbiotic-$VER.tar.xz" "symbiotic-$VER"
 cat > symbiotic.spec << EOF
 Name:       $PKG
 Version:    $VER
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Tool for analysis of sequential computer programs written in C
 License:    Free
 URL:        https://github.com/staticafi/%{name}