diff options
author | Jakub Jelinek <jakub@redhat.com> | 2004-10-20 10:47:20 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-20 10:47:20 +0000 |
commit | 75c95410b7b80289663bf2ba828e84d2c7890369 (patch) | |
tree | 83f4b406b0d4d0a9bcf68f6c56feb00fc59406fa /debug | |
parent | e9e4030ae5f685547a9f7ead1362c7526aa88b80 (diff) |
Updated to fedora-glibc-20041018T0940
Diffstat (limited to 'debug')
-rw-r--r-- | debug/Makefile | 5 | ||||
-rwxr-xr-x | debug/catchsegv.sh | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/debug/Makefile b/debug/Makefile index fed60d78b5..6df06116b7 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -38,7 +38,7 @@ CFLAGS-vsprintf_chk.c = -D_IO_MTSAFE_IO CFLAGS-vsnprintf_chk.c = -D_IO_MTSAFE_IO CFLAGS-printf_chk.c = -D_IO_MTSAFE_IO $(exceptions) CFLAGS-fprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions) -CFLAGS-vprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions) +CFLAGS-vprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions) CFLAGS-vfprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions) CFLAGS-gets_chk.c = -D_IO_MTSAFE_IO $(exceptions) @@ -72,7 +72,8 @@ include ../Rules $(objpfx)catchsegv: catchsegv.sh $(common-objpfx)soversions.mk \ $(common-objpfx)config.make - sed -e 's|@VERSION@|$(version)|' -e 's|@SLIB@|$(slibdir)|' $< > $@.new + slibpfx=`echo $(slibdir)|sed 's/lib\(64\|\)$$/\\\\\\\\$$LIB/'`; \ + sed -e 's|@VERSION@|$(version)|' -e "s|@SLIB@|$$slibpfx|" $< > $@.new chmod 555 $@.new mv -f $@.new $@ diff --git a/debug/catchsegv.sh b/debug/catchsegv.sh index 853b108609..14556f712a 100755 --- a/debug/catchsegv.sh +++ b/debug/catchsegv.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998, 1999, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2001, 2003, 2004 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -39,7 +39,7 @@ if test $# -eq 0; then ;; --v | --ve | --ver | --vers | --versi | --versio | --version) echo 'catchsegv (GNU libc) @VERSION@' - echo 'Copyright (C) 2003 Free Software Foundation, Inc. + echo 'Copyright (C) 2004 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Written by Ulrich Drepper.' @@ -50,9 +50,7 @@ Written by Ulrich Drepper.' esac fi -segv_output=`basename "$prog"`.segv.$$ -# Make sure this output file does not exist. -rm -f "$segv_output" +segv_output=`mktemp ${TMPDIR:-/tmp}/segv_output.XXXXXX` || exit # Redirect stderr to avoid termination message from shell. (exec 3>&2 2>/dev/null @@ -65,7 +63,7 @@ exval=$? # Check for output. Even if the program terminated correctly it might # be that a minor process (clone) failed. Therefore we do not check the # exit code. -if test -f "$segv_output"; then +if test -s "$segv_output"; then # The program caught a signal. The output is in the file with the # name we have in SEGFAULT_OUTPUT_NAME. In the output the names of # functions in shared objects are available, but names in the static @@ -102,7 +100,7 @@ if test -f "$segv_output"; then ;; esac done) - rm -f "$segv_output" fi +rm -f "$segv_output" exit $exval |