diff options
| -rw-r--r-- | package/x11r7/xlib_libFS/xlib_libFS-susv3-legacy.patch | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/package/x11r7/xlib_libFS/xlib_libFS-susv3-legacy.patch b/package/x11r7/xlib_libFS/xlib_libFS-susv3-legacy.patch index ce6b99040..90dde5ee8 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS-susv3-legacy.patch +++ b/package/x11r7/xlib_libFS/xlib_libFS-susv3-legacy.patch @@ -1,4 +1,10 @@ -libFS: use memcpy instead of bcopy +From: Peter Korsgaard <jacmet@sunsite.dk> +Subject: [PATCH] libFS: use memmove instead of bcopy + +bcopy is marked as legacy in SuSv3 and not available in the default +configuration of uClibc. Replace with memmove proposed by SuSv3. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> --- src/FSOpenServ.c | 2 +- src/FSlibInt.c | 2 +- @@ -15,7 +21,7 @@ Index: libFS-1.0.0/src/FSOpenServ.c return (FSServer *) 0; } - bcopy(ad, alts[i].name, altlen); -+ memcpy(alts[i].name, ad, altlen); ++ memmove(alts[i].name, ad, altlen); alts[i].name[altlen] = '\0'; ad += altlen + ((4 - (altlen + 2)) & 3); } @@ -28,7 +34,7 @@ Index: libFS-1.0.0/src/FSlibInt.c { if (svr->bufptr + (len) <= svr->bufmax) { - bcopy(data, svr->bufptr, (int) len); -+ memcpy(svr->bufptr, data, (int) len); ++ memmove(svr->bufptr, data, (int) len); svr->bufptr += ((len) + 3) & ~3; } else { _FSSend(svr, data, len); @@ -41,7 +47,7 @@ Index: libFS-1.0.0/src/FSlibint.h #define Data(svr, data, len) \ if (svr->bufptr + (len) <= svr->bufmax) {\ - bcopy(data, svr->bufptr, (int)len);\ -+ memcpy(svr->bufptr, data, (int)len); \ ++ memmove(svr->bufptr, data, (int)len); \ svr->bufptr += ((len) + 3) & ~3;\ } else\ _FSSend(svr, data, len) @@ -50,7 +56,7 @@ Index: libFS-1.0.0/src/FSlibint.h { register char *cpvar; \ for (cpvar = (char *) start; endcond; cpvar = NEXTPTR(cpvar,type), decr) { \ - type dummy; bcopy (cpvar, (char *) &dummy, SIZEOF(type)); \ -+ type dummy; memcpy ((char *) &dummy, cpvar, SIZEOF(type)); \ ++ type dummy; memmove ((char *) &dummy, cpvar, SIZEOF(type)); \ tpvar = (type *) cpvar; #define ENDITERATE }} @@ -63,7 +69,7 @@ Index: libFS-1.0.0/src/FSlibos.h #if (MSKCNT>4) -#define COPYBITS(src, dst) bcopy((caddr_t) src, (caddr_t) dst, sizeof(FdSet)) -+#define COPYBITS(src, dst) memcpy((caddr_t) dst, (caddr_t) src, sizeof(FdSet)) ++#define COPYBITS(src, dst) memmove((caddr_t) dst, (caddr_t) src, sizeof(FdSet)) #define CLEARBITS(buf) bzero((caddr_t) buf, sizeof(FdSet)) #define MASKANDSETBITS(dst, b1, b2) \ { int cri; \ |