===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ctfconv/ctfstrip,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/ctfconv/ctfstrip	2017/08/11 14:24:24	1.2
--- src/usr.bin/ctfconv/ctfstrip	2017/08/11 15:08:16	1.3
***************
*** 1,6 ****
  #!/bin/sh
  #
! # $OpenBSD: ctfstrip,v 1.2 2017/08/11 14:24:24 mpi Exp $
  #
  # Copyright (c) 2017 Martin Pieuchot 
  #
--- 1,6 ----
  #!/bin/sh
  #
! # $OpenBSD: ctfstrip,v 1.3 2017/08/11 15:08:16 jasper Exp $
  #
  # Copyright (c) 2017 Martin Pieuchot 
  #
***************
*** 16,24 ****
  # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
! # Turn off Strict Bourne shell mode.
! set +o sh
  
  USAGE="usage: ${0##*/} [-S] [-o outfile] file"
  
  while getopts "o:S" opt; do
--- 16,30 ----
  # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
! set -o posix
  
+ cleanup() {
+ 	rm -f ${TMPFILE}
+ 	exit 1
+ }
+ 
+ trap "cleanup" 1 2 3 13 15
+ 
  USAGE="usage: ${0##*/} [-S] [-o outfile] file"
  
  while getopts "o:S" opt; do
***************
*** 36,49 ****
  fi
  
  LABEL="unknown"
! TMPFILE=$1.rawctf
  
! # Extract kernel verison
  if [[ "$1" == bsd* ]]; then
  	LABEL=`what $1 |tr -d '\n'|awk -F"$1	" '{ print $2 '\n' }'`
  fi
  
! ctfconv -o ${TMPFILE} -l "${LABEL}" $1 || exit 2
  
  objcopy --add-section .SUNW_ctf=${TMPFILE} ${STRIPFLAG} $1 ${OUTFILE}
  
--- 42,55 ----
  fi
  
  LABEL="unknown"
! TMPFILE=$(mktemp /tmp/.ctf.XXXXXXXXXX)
  
! # Extract kernel version
  if [[ "$1" == bsd* ]]; then
  	LABEL=`what $1 |tr -d '\n'|awk -F"$1	" '{ print $2 '\n' }'`
  fi
  
! ctfconv -o ${TMPFILE} -l "${LABEL}" $1 || cleanup
  
  objcopy --add-section .SUNW_ctf=${TMPFILE} ${STRIPFLAG} $1 ${OUTFILE}