diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-04-19 12:56:29 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-04-19 12:56:29 -0400 |
| commit | 1bf725eda7a06713825b0609c9b39c55cf5ab76a (patch) | |
| tree | 5cc16c44cdd3c571ac9b806aced07b2a7eb75f1e /src/stdlib/wcstol.c | |
| parent | cb81b6947c0277a6a27ddc699d716e9cf2b524aa (diff) | |
| download | musl-1bf725eda7a06713825b0609c9b39c55cf5ab76a.tar.gz musl-1bf725eda7a06713825b0609c9b39c55cf5ab76a.tar.xz musl-1bf725eda7a06713825b0609c9b39c55cf5ab76a.zip | |
further fixes to leading space issue (forgot the wide versions)
Diffstat (limited to 'src/stdlib/wcstol.c')
| -rw-r--r-- | src/stdlib/wcstol.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/stdlib/wcstol.c b/src/stdlib/wcstol.c index 822bcf1a..840bb0a6 100644 --- a/src/stdlib/wcstol.c +++ b/src/stdlib/wcstol.c @@ -27,6 +27,7 @@ static size_t do_read(FILE *f, unsigned char *buf, size_t len) static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsigned long long lim) { + wchar_t *t = (wchar_t *)s; unsigned char buf[64]; FILE f = {0}; f.flags = 0; @@ -35,12 +36,13 @@ static unsigned long long wcstox(const wchar_t *s, wchar_t **p, int base, unsign f.buf_size = sizeof buf - 4; f.lock = -1; f.read = do_read; - f.cookie = (void *)s; + while (iswspace(*t)) t++; + f.cookie = (void *)t; shlim(&f, 0); unsigned long long y = __intscan(&f, base, 1, lim); if (p) { size_t cnt = shcnt(&f); - *p = (wchar_t *)s + cnt; + *p = cnt ? t + cnt : (wchar_t *)s; } return y; } |