[PATCH] libc: point 3 more files from libc/ to musl/

[Waldemar Kozaczuk]

This patch adds 2 aliases using aliases.ld so that we
can point 3 files from libc/ to musl/. One of the files
simply has not changed significantly on musl side so
we point it to musl/ version.

The diff between libc/ and musl/src/ versions:

```
DIFF: [/multibyte/mbrlen.c]
12c12
< #include "internal.h"
---
> //#include "internal.h"
18a19,20
>
> size_t __mbrlen (const char *, size_t, mbstate_t *) __attribute__ ((weak, alias ("mbrlen")));

DIFF: [/string/strlcat.c]
3a4,5
> size_t strlcpy(char *d, const char *s, size_t n);
>

DIFF: [/string/strtok_r.c]
1a2
> #include <libc.h>
3c4,5
< char *strtok_r(char *restrict s, const char *restrict sep, char **restrict p)
---
> #undef strtok_r
> char *strtok_r(char *__restrict s, const char *__restrict sep, char **__restrict p)
12a15,16
>
> weak_alias(strtok_r, __strtok_r);
```

Signed-off-by: Waldemar Kozaczuk <jwkoz...@gmail.com>
---
Makefile | 6 +++---
libc/aliases.ld | 6 ++++++
libc/multibyte/mbrlen.c | 20 --------------------
libc/string/strlcat.c | 11 -----------
libc/string/strtok_r.c | 16 ----------------
5 files changed, 9 insertions(+), 50 deletions(-)
delete mode 100644 libc/multibyte/mbrlen.c
delete mode 100644 libc/string/strlcat.c
delete mode 100644 libc/string/strtok_r.c

diff --git a/Makefile b/Makefile
index 78590d40..fb4f62c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1327,7 +1327,7 @@ musl += signal/siginterrupt.o
musl += multibyte/btowc.o
musl += multibyte/internal.o
musl += multibyte/mblen.o
-libc += multibyte/mbrlen.o
+musl += multibyte/mbrlen.o
musl += multibyte/mbrtowc.o
musl += multibyte/mbsinit.o
musl += multibyte/mbsnrtowcs.o
@@ -1583,7 +1583,7 @@ libc += string/__strcpy_chk.o
musl += string/strcspn.o
musl += string/strdup.o
libc += string/strerror_r.o
-libc += string/strlcat.o
+musl += string/strlcat.o
musl += string/strlcpy.o
musl += string/strlen.o
musl += string/strncasecmp.o
@@ -1603,7 +1603,7 @@ libc += string/strsignal.o
musl += string/strspn.o
musl += string/strstr.o
musl += string/strtok.o
-libc += string/strtok_r.o
+musl += string/strtok_r.o
musl += string/strverscmp.o
musl += string/swab.o
musl += string/wcpcpy.o
diff --git a/libc/aliases.ld b/libc/aliases.ld
index a44b7572..09f29097 100644
--- a/libc/aliases.ld
+++ b/libc/aliases.ld
@@ -23,3 +23,9 @@ __pow_finite = pow;
__finite = finite;
__finitef = finitef;
__finitel = finitel;
+
+/* multibyte */
+__mbrlen = mbrlen;
+
+/* string */
+__strtok_r = strtok_r;
diff --git a/libc/multibyte/mbrlen.c b/libc/multibyte/mbrlen.c
deleted file mode 100644
index 827f1da5..00000000
--- a/libc/multibyte/mbrlen.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
-#include <stdlib.h>
-#include <inttypes.h>
-#include <wchar.h>
-#include <errno.h>
-
-//#include "internal.h"
-
-size_t mbrlen(const char *restrict s, size_t n, mbstate_t *restrict st)
-{
- static unsigned internal;
- return mbrtowc(0, s, n, st ? st : (mbstate_t *)&internal);
-}
-
-size_t __mbrlen (const char *, size_t, mbstate_t *) __attribute__ ((weak, alias ("mbrlen")));
diff --git a/libc/string/strlcat.c b/libc/string/strlcat.c
deleted file mode 100644
index 0cb27b47..00000000
--- a/libc/string/strlcat.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#define _BSD_SOURCE
-#include <string.h>
-
-size_t strlcpy(char *d, const char *s, size_t n);
-
-size_t strlcat(char *d, const char *s, size_t n)
-{
- size_t l = strnlen(d, n);
- if (l == n) return l + strlen(s);
- return l + strlcpy(d+l, s, n-l);
-}
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c
deleted file mode 100644
index eea8fec3..00000000
--- a/libc/string/strtok_r.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <string.h>
-#include <libc.h>
-
-#undef strtok_r
-char *strtok_r(char *__restrict s, const char *__restrict sep, char **__restrict p)
-{
- if (!s && !(s = *p)) return NULL;
- s += strspn(s, sep);
- if (!*s) return *p = 0;
- *p = s + strcspn(s, sep);
- if (**p) *(*p)++ = 0;
- else *p = 0;
- return s;
-}
-
-weak_alias(strtok_r, __strtok_r);
--
2.26.2

[Commit Bot]

From: Waldemar Kozaczuk <jwkoz...@gmail.com>
Committer: Nadav Har'El <n...@scylladb.com>
Branch: master

libc: point 3 more files from libc/ to musl/

This patch adds 2 aliases using aliases.ld so that we
can point 3 files from libc/ to musl/. One of the files
simply has not changed significantly on musl side so
we point it to musl/ version.

The diff between libc/ and musl/src/ versions:

```
DIFF: [/multibyte/mbrlen.c]
12c12
< #include "internal.h"

Message-Id: <20200811014427.1...@gmail.com>

---
diff --git a/Makefile b/Makefile

--- a/libc/aliases.ld
+++ b/libc/aliases.ld
@@ -23,3 +23,9 @@ __pow_finite = pow;
__finite = finite;
__finitef = finitef;
__finitel = finitel;
+
+/* multibyte */
+__mbrlen = mbrlen;
+
+/* string */
+__strtok_r = strtok_r;
diff --git a/libc/multibyte/mbrlen.c b/libc/multibyte/mbrlen.c

--- a/libc/multibyte/mbrlen.c
+++ b/libc/multibyte/mbrlen.c

@@ -1,20 +0,0 @@
-/*
- * This code was written by Rich Felker in 2010; no copyright is claimed.
- * This code is in the public domain. Attribution is appreciated but
- * unnecessary.
- */
-
-#include <stdlib.h>
-#include <inttypes.h>
-#include <wchar.h>
-#include <errno.h>
-
-//#include "internal.h"
-
-size_t mbrlen(const char *restrict s, size_t n, mbstate_t *restrict st)
-{
- static unsigned internal;
- return mbrtowc(0, s, n, st ? st : (mbstate_t *)&internal);
-}
-
-size_t __mbrlen (const char *, size_t, mbstate_t *) __attribute__ ((weak, alias ("mbrlen")));
diff --git a/libc/string/strlcat.c b/libc/string/strlcat.c

--- a/libc/string/strlcat.c
+++ b/libc/string/strlcat.c

@@ -1,11 +0,0 @@
-#define _BSD_SOURCE
-#include <string.h>
-
-size_t strlcpy(char *d, const char *s, size_t n);
-
-size_t strlcat(char *d, const char *s, size_t n)
-{
- size_t l = strnlen(d, n);
- if (l == n) return l + strlen(s);
- return l + strlcpy(d+l, s, n-l);
-}
diff --git a/libc/string/strtok_r.c b/libc/string/strtok_r.c

--- a/libc/string/strtok_r.c
+++ b/libc/string/strtok_r.c