Deleted Added
full compact
strtol.c (83024) strtol.c (87016)
1/*-
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*-
2 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/lib/libc/stdlib/strtol.c 83024 2001-09-04 21:28:01Z ache $
33 * $FreeBSD: head/lib/libc/stdlib/strtol.c 87016 2001-11-28 00:48:11Z ache $
34 */
35
36#if defined(LIBC_SCCS) && !defined(lint)
37static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93";
38#endif /* LIBC_SCCS and not lint */
39
40#include <limits.h>
41#include <ctype.h>

--- 6 unchanged lines hidden (view full) ---

48 *
49 * Assumes that the upper and lower case
50 * alphabets and digits are each contiguous.
51 */
52long
53strtol(nptr, endptr, base)
54 const char *nptr;
55 char **endptr;
34 */
35
36#if defined(LIBC_SCCS) && !defined(lint)
37static char sccsid[] = "@(#)strtol.c 8.1 (Berkeley) 6/4/93";
38#endif /* LIBC_SCCS and not lint */
39
40#include <limits.h>
41#include <ctype.h>

--- 6 unchanged lines hidden (view full) ---

48 *
49 * Assumes that the upper and lower case
50 * alphabets and digits are each contiguous.
51 */
52long
53strtol(nptr, endptr, base)
54 const char *nptr;
55 char **endptr;
56 register int base;
56 int base;
57{
57{
58 register const char *s;
59 register unsigned long acc;
60 register unsigned char c;
61 register unsigned long cutoff;
62 register int neg, any, cutlim;
58 const char *s;
59 unsigned long acc;
60 unsigned char c;
61 unsigned long cutoff;
62 int neg, any, cutlim;
63
64 /*
65 * Skip white space and pick up leading +/- sign if any.
66 * If base is 0, allow 0x for hex and 0 for octal, else
67 * assume decimal; if base is already 16, allow 0x.
68 */
69 s = nptr;
70 do {

--- 11 unchanged lines hidden (view full) ---

82 c == '0' && (*s == 'x' || *s == 'X')) {
83 c = s[1];
84 s += 2;
85 base = 16;
86 }
87 if (base == 0)
88 base = c == '0' ? 8 : 10;
89 acc = any = 0;
63
64 /*
65 * Skip white space and pick up leading +/- sign if any.
66 * If base is 0, allow 0x for hex and 0 for octal, else
67 * assume decimal; if base is already 16, allow 0x.
68 */
69 s = nptr;
70 do {

--- 11 unchanged lines hidden (view full) ---

82 c == '0' && (*s == 'x' || *s == 'X')) {
83 c = s[1];
84 s += 2;
85 base = 16;
86 }
87 if (base == 0)
88 base = c == '0' ? 8 : 10;
89 acc = any = 0;
90 if (base < 2 || base > 36)
90 if (base < 2)
91 goto noconv;
92
93 /*
94 * Compute the cutoff value between legal numbers and illegal
95 * numbers. That is the largest legal value, divided by the
96 * base. An input number that is greater than this value, if
97 * followed by a legal input character, is too big. One that
98 * is equal to this value may be valid or not; the limit
99 * between valid and invalid numbers is then based on the last
100 * digit. For instance, if the range for longs is
101 * [-2147483648..2147483647] and the input base is 10,
102 * cutoff will be set to 214748364 and cutlim to either
103 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
104 * a value > 214748364, or equal but the next digit is > 7 (or 8),
105 * the number is too big, and we will return a range error.
106 *
107 * Set 'any' if any `digits' consumed; make it negative to indicate
108 * overflow.
109 */
91 goto noconv;
92
93 /*
94 * Compute the cutoff value between legal numbers and illegal
95 * numbers. That is the largest legal value, divided by the
96 * base. An input number that is greater than this value, if
97 * followed by a legal input character, is too big. One that
98 * is equal to this value may be valid or not; the limit
99 * between valid and invalid numbers is then based on the last
100 * digit. For instance, if the range for longs is
101 * [-2147483648..2147483647] and the input base is 10,
102 * cutoff will be set to 214748364 and cutlim to either
103 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
104 * a value > 214748364, or equal but the next digit is > 7 (or 8),
105 * the number is too big, and we will return a range error.
106 *
107 * Set 'any' if any `digits' consumed; make it negative to indicate
108 * overflow.
109 */
110 cutoff = neg ? -(LONG_MIN + LONG_MAX) + (unsigned long)LONG_MAX
110 cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX
111 : LONG_MAX;
112 cutlim = cutoff % base;
113 cutoff /= base;
114 for ( ; ; c = *s++) {
111 : LONG_MAX;
112 cutlim = cutoff % base;
113 cutoff /= base;
114 for ( ; ; c = *s++) {
115 if (!isascii(c))
116 break;
117 if (isdigit(c))
118 c -= '0';
119 else if (isalpha(c))
115 if (isxdigit(c))
116 c = digittoint(c);
117 else if (isascii(c) && isalpha(c))
120 c -= isupper(c) ? 'A' - 10 : 'a' - 10;
121 else
122 break;
123 if (c >= base)
124 break;
125 if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
126 any = -1;
127 else {

--- 17 unchanged lines hidden ---
118 c -= isupper(c) ? 'A' - 10 : 'a' - 10;
119 else
120 break;
121 if (c >= base)
122 break;
123 if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
124 any = -1;
125 else {

--- 17 unchanged lines hidden ---