Deleted Added
sdiff udiff text old ( 73152 ) new ( 82975 )
full compact
strtoull.c (73152) strtoull.c (82975)
1/*-
2 * Copyright (c) 1992, 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

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

32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93";
36#endif /* LIBC_SCCS and not lint */
37
38#ifndef lint
39static const char rcsid[] =
1/*-
2 * Copyright (c) 1992, 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

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

32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35static char sccsid[] = "@(#)strtouq.c 8.1 (Berkeley) 6/4/93";
36#endif /* LIBC_SCCS and not lint */
37
38#ifndef lint
39static const char rcsid[] =
40 "$FreeBSD: head/lib/libc/stdlib/strtoull.c 73152 2001-02-27 13:33:07Z obrien $";
40 "$FreeBSD: head/lib/libc/stdlib/strtoull.c 82975 2001-09-04 16:39:11Z ache $";
41#endif
42
43#include <sys/types.h>
44
45#include <limits.h>
46#include <errno.h>
47#include <ctype.h>
48#include <stdlib.h>
49
50/*
51 * Convert a string to an unsigned long long integer.
52 *
41#endif
42
43#include <sys/types.h>
44
45#include <limits.h>
46#include <errno.h>
47#include <ctype.h>
48#include <stdlib.h>
49
50/*
51 * Convert a string to an unsigned long long integer.
52 *
53 * Ignores `locale' stuff. Assumes that the upper and lower case
53 * Assumes that the upper and lower case
54 * alphabets and digits are each contiguous.
55 */
56unsigned long long
57strtoull(nptr, endptr, base)
58 const char *nptr;
59 char **endptr;
60 register int base;
61{
54 * alphabets and digits are each contiguous.
55 */
56unsigned long long
57strtoull(nptr, endptr, base)
58 const char *nptr;
59 char **endptr;
60 register int base;
61{
62 register const char *s = nptr;
62 register const char *s;
63 register unsigned long long acc;
64 register unsigned char c;
63 register unsigned long long acc;
64 register unsigned char c;
65 register unsigned long long qbase, cutoff;
65 register unsigned long long cutoff;
66 register int neg, any, cutlim;
67
68 /*
69 * See strtoq for comments as to the logic used.
70 */
71 s = nptr;
72 do {
73 c = *s++;

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

83 if ((base == 0 || base == 16) &&
84 c == '0' && (*s == 'x' || *s == 'X')) {
85 c = s[1];
86 s += 2;
87 base = 16;
88 }
89 if (base == 0)
90 base = c == '0' ? 8 : 10;
66 register int neg, any, cutlim;
67
68 /*
69 * See strtoq for comments as to the logic used.
70 */
71 s = nptr;
72 do {
73 c = *s++;

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

83 if ((base == 0 || base == 16) &&
84 c == '0' && (*s == 'x' || *s == 'X')) {
85 c = s[1];
86 s += 2;
87 base = 16;
88 }
89 if (base == 0)
90 base = c == '0' ? 8 : 10;
91 qbase = (unsigned)base;
92 cutoff = (unsigned long long)ULLONG_MAX / qbase;
93 cutlim = (unsigned long long)ULLONG_MAX % qbase;
94 for (acc = 0, any = 0;; c = *s++) {
91 any = 0;
92 if (base < 2 || base > 36)
93 goto noconv;
94
95 cutoff = ULLONG_MAX / base;
96 cutlim = ULLONG_MAX % base;
97 for (acc = 0; ; c = *s++) {
95 if (!isascii(c))
96 break;
97 if (isdigit(c))
98 c -= '0';
99 else if (isalpha(c))
100 c -= isupper(c) ? 'A' - 10 : 'a' - 10;
101 else
102 break;
103 if (c >= base)
104 break;
105 if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
106 any = -1;
107 else {
108 any = 1;
98 if (!isascii(c))
99 break;
100 if (isdigit(c))
101 c -= '0';
102 else if (isalpha(c))
103 c -= isupper(c) ? 'A' - 10 : 'a' - 10;
104 else
105 break;
106 if (c >= base)
107 break;
108 if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
109 any = -1;
110 else {
111 any = 1;
109 acc *= qbase;
112 acc *= base;
110 acc += c;
111 }
112 }
113 if (any < 0) {
114 acc = ULLONG_MAX;
115 errno = ERANGE;
113 acc += c;
114 }
115 }
116 if (any < 0) {
117 acc = ULLONG_MAX;
118 errno = ERANGE;
119 } else if (!any) {
120noconv:
121 errno = EINVAL;
116 } else if (neg)
117 acc = -acc;
122 } else if (neg)
123 acc = -acc;
118 if (endptr != 0)
124 if (endptr != NULL)
119 *endptr = (char *)(any ? s - 1 : nptr);
120 return (acc);
121}
125 *endptr = (char *)(any ? s - 1 : nptr);
126 return (acc);
127}