| Index: fusl/src/string/strlcpy.c
|
| diff --git a/fusl/src/string/strlcpy.c b/fusl/src/string/strlcpy.c
|
| index 193d724130eca36d7939819e2d7ec94889dca3ef..66dd5163e5568ba925c84f350e1177a5b34faecd 100644
|
| --- a/fusl/src/string/strlcpy.c
|
| +++ b/fusl/src/string/strlcpy.c
|
| @@ -4,29 +4,34 @@
|
| #include <limits.h>
|
| #include "libc.h"
|
|
|
| -#define ALIGN (sizeof(size_t)-1)
|
| -#define ONES ((size_t)-1/UCHAR_MAX)
|
| -#define HIGHS (ONES * (UCHAR_MAX/2+1))
|
| -#define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
|
| +#define ALIGN (sizeof(size_t) - 1)
|
| +#define ONES ((size_t)-1 / UCHAR_MAX)
|
| +#define HIGHS (ONES * (UCHAR_MAX / 2 + 1))
|
| +#define HASZERO(x) ((x)-ONES & ~(x)&HIGHS)
|
|
|
| -size_t strlcpy(char *d, const char *s, size_t n)
|
| -{
|
| - char *d0 = d;
|
| - size_t *wd;
|
| - const size_t *ws;
|
| +size_t strlcpy(char* d, const char* s, size_t n) {
|
| + char* d0 = d;
|
| + size_t* wd;
|
| + const size_t* ws;
|
|
|
| - if (!n--) goto finish;
|
| - if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
|
| - for (; ((uintptr_t)s & ALIGN) && n && (*d=*s); n--, s++, d++);
|
| - if (n && *s) {
|
| - wd=(void *)d; ws=(const void *)s;
|
| - for (; n>=sizeof(size_t) && !HASZERO(*ws);
|
| - n-=sizeof(size_t), ws++, wd++) *wd = *ws;
|
| - d=(void *)wd; s=(const void *)ws;
|
| - }
|
| - }
|
| - for (; n && (*d=*s); n--, s++, d++);
|
| - *d = 0;
|
| + if (!n--)
|
| + goto finish;
|
| + if (((uintptr_t)s & ALIGN) == ((uintptr_t)d & ALIGN)) {
|
| + for (; ((uintptr_t)s & ALIGN) && n && (*d = *s); n--, s++, d++)
|
| + ;
|
| + if (n && *s) {
|
| + wd = (void*)d;
|
| + ws = (const void*)s;
|
| + for (; n >= sizeof(size_t) && !HASZERO(*ws);
|
| + n -= sizeof(size_t), ws++, wd++)
|
| + *wd = *ws;
|
| + d = (void*)wd;
|
| + s = (const void*)ws;
|
| + }
|
| + }
|
| + for (; n && (*d = *s); n--, s++, d++)
|
| + ;
|
| + *d = 0;
|
| finish:
|
| - return d-d0 + strlen(s);
|
| + return d - d0 + strlen(s);
|
| }
|
|
|