diff options
| author | Roland McGrath <roland@gnu.org> | 1996-01-17 00:46:59 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-01-17 00:46:59 +0000 |
| commit | da128169aaa250809ed2b143487d062708548fe3 (patch) | |
| tree | 2946b976d7bbc97a2450da3eb4c5de80c73c29da /stdlib | |
| parent | 294897f4a6c1ef2fe408e37670e2bfbb0bf8a77d (diff) | |
| download | glibc-da128169aaa250809ed2b143487d062708548fe3.tar.gz glibc-da128169aaa250809ed2b143487d062708548fe3.tar.xz glibc-da128169aaa250809ed2b143487d062708548fe3.zip | |
Sun Jan 14 01:01:10 1996 Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de>
* stdlib/strtol.c: Return correct pointer for strings like "0xyz" and base 0 or 16. * string/strxfrm.c: Handle case for LENGTH == 0 correct. * sunrpc/etc.rpc: Add some more known protocols. Sun Jan 14 01:01:10 1996 Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de> * stdlib/strtol.c: Return correct pointer for strings like "0xyz" and base 0 or 16. * string/strxfrm.c: Handle case for LENGTH == 0 correct. * sunrpc/etc.rpc: Add some more known protocols.
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/strtol.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/stdlib/strtol.c b/stdlib/strtol.c index d52f338c84..b06063c2c5 100644 --- a/stdlib/strtol.c +++ b/stdlib/strtol.c @@ -150,7 +150,7 @@ INTERNAL (strtol) (nptr, endptr, base, group) if (base < 0 || base == 1 || base > 36) base = 10; - s = nptr; + save = s = nptr; /* Skip white space. */ while (isspace (*s)) @@ -269,9 +269,17 @@ INTERNAL (strtol) (nptr, endptr, base, group) return (negative ? -i : i); noconv: - /* There was no number to convert. */ + /* We must handle a special case here: the base is 0 or 16 and the + first two characters and '0' and 'x', but the rest are no + hexadecimal digits. This is no error case. We return 0 and + ENDPTR points to the `x`. */ if (endptr != NULL) - *endptr = (char *) nptr; + if (save - nptr >= 2 && tolower (save[-1]) == 'x' && save[-2] == '0') + *endptr = (char *) &save[-1]; + else + /* There was no number to convert. */ + *endptr = (char *) nptr; + return 0L; } |