From: Mark Wielaard <mark@klomp.org>
Date: Thu, 28 Mar 2013 22:52:14 +0000 (+0000)
Subject: For memcheck overlap filter_memcpy str[n]cpy and __GI_str[n]cpy are equal.
X-Git-Tag: svn/VALGRIND_3_9_0~335
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ec8df03c116e978a63b907af1f8166cebfb6eae;p=thirdparty%2Fvalgrind.git

For memcheck overlap filter_memcpy str[n]cpy and __GI_str[n]cpy are equal.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13349
---

diff --git a/memcheck/tests/filter_memcpy b/memcheck/tests/filter_memcpy
index 47741ba692..737304cfad 100755
--- a/memcheck/tests/filter_memcpy
+++ b/memcheck/tests/filter_memcpy
@@ -1,5 +1,8 @@
 #! /bin/sh
 
 # mc_replace_strmem.c intercepts various memcpy glibc versions.
+# mc_replace_strmem.c str[n]cpy and __GI_str[n]cpy are the same.
 ./filter_stderr "$@" |
-perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/"
+perl -p -e "s/: memcpy\@\@?GLIBC_[.1-9]+ \(mc_replace_strmem.c:...\)/: memcpy \(mc_replace_strmem.c:...\)/" |
+sed -e "s/: __GI_strcpy (mc_replace_strmem.c:/: strcpy (mc_replace_strmem.c:/" |
+sed -e "s/: __GI_strncpy (mc_replace_strmem.c:/: strncpy (mc_replace_strmem.c:/"