From: Liubov Dmitrieva <ldmitrie@sourceware.org>
Date: Thu, 29 Aug 2013 13:08:14 +0000 (+0400)
Subject: Inappropriate code style for Intel MPX in string/strcpy.c and wcsmbc/wcscpy.c
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f93ec08c4a30887c516ea7a6d4c2d8af8d541e03;p=thirdparty%2Fglibc.git

Inappropriate code style for Intel MPX in string/strcpy.c and wcsmbc/wcscpy.c
Fix the code if MPX is enabled.
---

diff --git a/string/strcpy.c b/string/strcpy.c
index b71f7536bca..04278eceb94 100644
--- a/string/strcpy.c
+++ b/string/strcpy.c
@@ -26,6 +26,7 @@ char *
 strcpy (dest, src)
      char *dest;
      const char *src;
+#ifndef __CHKP__
 {
   char c;
   char *s = (char *) src;
@@ -40,4 +41,12 @@ strcpy (dest, src)
 
   return dest;
 }
+#else
+{
+  const char  *ret = dest;
+  while ((*dest++ = *src++) != '\0');
+  return ret;
+}
+#endif
+
 libc_hidden_builtin_def (strcpy)
diff --git a/wcsmbs/wcscpy.c b/wcsmbs/wcscpy.c
index 3b1e0c62454..3113cf589c0 100644
--- a/wcsmbs/wcscpy.c
+++ b/wcsmbs/wcscpy.c
@@ -25,6 +25,7 @@ wchar_t *
 wcscpy (dest, src)
      wchar_t *dest;
      const wchar_t *src;
+#ifndef __CHKP__
 {
   wint_t c;
   wchar_t *wcp;
@@ -56,3 +57,11 @@ wcscpy (dest, src)
 
   return dest;
 }
+#else
+{
+  const wchar_t *ret = dest;
+  while ((*dest++ = *src++) != L'\0');
+  return ret;
+
+}
+#endif