projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix spuriously slow check in twoway strstr/memmem cores
[musl]
/
src
/
multibyte
/
wcsnrtombs.c
diff --git
a/src/multibyte/wcsnrtombs.c
b/src/multibyte/wcsnrtombs.c
index
666f6f3
..
676932b
100644
(file)
--- a/
src/multibyte/wcsnrtombs.c
+++ b/
src/multibyte/wcsnrtombs.c
@@
-1,28
+1,18
@@
-/*
- * 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 <wchar.h>
-#include <errno.h>
-
-#include "internal.h"
-size_t wcsnrtombs(char *
dst, const wchar_t **wcs, size_t wn, size_t n, mbstate_t *
st)
+size_t wcsnrtombs(char *
restrict dst, const wchar_t **restrict wcs, size_t wn, size_t n, mbstate_t *restrict
st)
{
size_t l, cnt=0, n2;
char *s, buf[256];
const wchar_t *ws = *wcs;
{
size_t l, cnt=0, n2;
char *s, buf[256];
const wchar_t *ws = *wcs;
+ const wchar_t *tmp_ws;
if (!dst) s = buf, n = sizeof buf;
else s = dst;
if (!dst) s = buf, n = sizeof buf;
else s = dst;
- while ( n && ( (n2=wn)>=n || n2>32 ) ) {
+ while (
ws &&
n && ( (n2=wn)>=n || n2>32 ) ) {
if (n2>=n) n2=n;
if (n2>=n) n2=n;
-
wn -= n2
;
+
tmp_ws = ws
;
l = wcsrtombs(s, &ws, n2, 0);
if (!(l+1)) {
cnt = l;
l = wcsrtombs(s, &ws, n2, 0);
if (!(l+1)) {
cnt = l;
@@
-33,18
+23,20
@@
size_t wcsnrtombs(char *dst, const wchar_t **wcs, size_t wn, size_t n, mbstate_t
s += l;
n -= l;
}
s += l;
n -= l;
}
+ wn = ws ? wn - (ws - tmp_ws) : 0;
cnt += l;
}
cnt += l;
}
- while (n && wn) {
+
if (ws)
while (n && wn) {
l = wcrtomb(s, *ws, 0);
l = wcrtomb(s, *ws, 0);
- if (!(l+1)) {
- cnt = l;
+ if ((l+1)<=1) {
+ if (!l) ws = 0;
+ else cnt = l;
break;
}
ws++; wn--;
/* safe - this loop runs fewer than sizeof(buf) times */
s+=l; n-=l;
break;
}
ws++; wn--;
/* safe - this loop runs fewer than sizeof(buf) times */
s+=l; n-=l;
- cnt
++
;
+ cnt
+= l
;
}
if (dst) *wcs = ws;
return cnt;
}
if (dst) *wcs = ws;
return cnt;