From 1cc26da35c6638be9ca30eee93035793f9518232 Mon Sep 17 00:00:00 2001
From: Steffen Jaeckel <s@jaeckel.eu>
Date: Tue, 30 Sep 2014 10:53:05 +0200
Subject: [PATCH] fix coverity script

---
 coverity.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/coverity.sh b/coverity.sh
index 3230f78..c849461 100755
--- a/coverity.sh
+++ b/coverity.sh
@@ -1,16 +1,28 @@
 #!/bin/bash
 
-if [ $# -lt 3 ]
+if [ $# -lt 2 ]
 then
-  echo "usage is: ${0##*/} <path to coverity scan> <path to libtommath include files> <path to libtommath.a>"
-  echo "e.g. \"${0##*/} \"/usr/local/bin/coverity\" \"/path/to/libtommath\" /path/to/libtommath/libtommath.a\""
+  echo "usage is: ${0##*/} <path to coverity scan> <extra compiler options>"
+  echo "e.g. \"${0##*/} \"/usr/local/bin/coverity\" \"-DLTM_DESC -I/path/to/libtommath/\"\""
   exit -1
 fi
 
 PATH=$PATH:$1/bin
 
 make clean
-CFLAGS=" -O2 -DUSE_LTM -DLTM_DESC -I${2}" EXTRALIBS="${3}" cov-build --dir cov-int  make -f makefile -j3 IGNORE_SPEED=1 1>gcc_1.txt
+rm -r cov-int/
+
+myCflags=""
+myCflags="$myCflags -O2 ${2}"
+myCflags="$myCflags -pipe -Werror -Wpointer-arith -Winit-self -Wextra -Wall -Wformat -Wformat-security"
+
+CFLAGS="$myCflags" cov-build --dir cov-int  make -f makefile -j3 IGNORE_SPEED=1 1>gcc_1.txt
+
+if [ $? -ne 0 ]
+then
+  echo "make failed"
+  exit -1
+fi
 
 # zipup everything
 tar caf libtomcrypt.lzma cov-int
@@ -23,6 +35,6 @@ curl --form project=libtomcrypt \
   --form token=${mytoken} \
   --form email=${mymail} \
   --form file=@libtomcrypt.lzma \
-  --form version='"${myversion}"' \
-  --form description='"libtomcrypt version ${myversion}"' \
+  --form version=\"${myversion}\" \
+  --form description=\"libtomcrypt version ${myversion}\" \
   https://scan.coverity.com/builds?project=libtomcrypt