toolchain/gcc/patches/4.6.1/305-libmudflap-susv3-legacy.patch

   1 --- a/libmudflap/mf-hooks2.c
   2 +++ b/libmudflap/mf-hooks2.c
   3 @@ -421,7 +421,7 @@ WRAPPER2(void, bzero, void *s, size_t n)
   4  {
   5    TRACE ("%s\n", __PRETTY_FUNCTION__);
   6    MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
   7 -  bzero (s, n);
   8 +  memset (s, 0, n);
   9  }
  10
  11
  12 @@ -431,7 +431,7 @@ WRAPPER2(void, bcopy, const void *src, v
  13    TRACE ("%s\n", __PRETTY_FUNCTION__);
  14    MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
  15    MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
  16 -  bcopy (src, dest, n);
  17 +  memmove (dest, src, n);
  18  }
  19
  20
  21 @@ -441,7 +441,7 @@ WRAPPER2(int, bcmp, const void *s1, cons
  22    TRACE ("%s\n", __PRETTY_FUNCTION__);
  23    MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
  24    MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
  25 -  return bcmp (s1, s2, n);
  26 +  return n == 0 ? 0 : memcmp (s1, s2, n);
  27  }
  28
  29
  30 @@ -450,7 +450,7 @@ WRAPPER2(char *, index, const char *s, i
  31    size_t n = strlen (s);
  32    TRACE ("%s\n", __PRETTY_FUNCTION__);
  33    MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
  34 -  return index (s, c);
  35 +  return strchr (s, c);
  36  }
  37
  38
  39 @@ -459,7 +459,7 @@ WRAPPER2(char *, rindex, const char *s,
  40    size_t n = strlen (s);
  41    TRACE ("%s\n", __PRETTY_FUNCTION__);
  42    MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
  43 -  return rindex (s, c);
  44 +  return strrchr (s, c);
  45  }
  46
  47  /* XXX:  stpcpy, memccpy */