projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove riscv64 bits/user.h contents
[musl]
/
src
/
string
/
strlcpy.c
diff --git
a/src/string/strlcpy.c
b/src/string/strlcpy.c
index
6aeb106
..
ffa0b0b
100644
(file)
--- a/
src/string/strlcpy.c
+++ b/
src/string/strlcpy.c
@@
-1,8
+1,7
@@
+#define _BSD_SOURCE
#include <string.h>
#include <string.h>
-#include <stdlib.h>
#include <stdint.h>
#include <limits.h>
#include <stdint.h>
#include <limits.h>
-#include "libc.h"
#define ALIGN (sizeof(size_t)-1)
#define ONES ((size_t)-1/UCHAR_MAX)
#define ALIGN (sizeof(size_t)-1)
#define ONES ((size_t)-1/UCHAR_MAX)
@@
-13,10
+12,12
@@
size_t strlcpy(char *d, const char *s, size_t n)
{
char *d0 = d;
size_t *wd;
{
char *d0 = d;
size_t *wd;
- const size_t *ws;
if (!n--) goto finish;
if (!n--) goto finish;
- if (((uintptr_t)s & ALIGN) != ((uintptr_t)d & ALIGN)) {
+#ifdef __GNUC__
+ typedef size_t __attribute__((__may_alias__)) word;
+ const word *ws;
+ 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 (; ((uintptr_t)s & ALIGN) && n && (*d=*s); n--, s++, d++);
if (n && *s) {
wd=(void *)d; ws=(const void *)s;
@@
-25,6
+26,7
@@
size_t strlcpy(char *d, const char *s, size_t n)
d=(void *)wd; s=(const void *)ws;
}
}
d=(void *)wd; s=(const void *)ws;
}
}
+#endif
for (; n && (*d=*s); n--, s++, d++);
*d = 0;
finish:
for (; n && (*d=*s); n--, s++, d++);
*d = 0;
finish: