diff options
-rw-r--r-- | cmake/ConfigureChecks.cmake | 2 | ||||
-rw-r--r-- | cmake/config.h.cmake | 12 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | tools/Makefile.am | 2 | ||||
-rw-r--r-- | tools/dbus-send.c | 12 | ||||
-rw-r--r-- | tools/strtoll.c | 166 | ||||
-rw-r--r-- | tools/strtoull.c | 145 |
8 files changed, 1 insertions, 342 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index f4680f9b..3d4e0f2b 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -50,8 +50,6 @@ check_symbol_exists(socketpair "sys/socket.h" HAVE_SOCKETPAIR) # check_symbol_exists(setlocale "locale.h" HAVE_SETLOCALE) # dbus-test-main.c check_symbol_exists(localeconv "locale.h" HAVE_LOCALECONV) # dbus-sysdeps.c check_symbol_exists(poll "poll.h" HAVE_POLL) # dbus-sysdeps-unix.c -check_symbol_exists(strtoll "stdlib.h" HAVE_STRTOLL) # dbus-send.c -check_symbol_exists(strtoull "stdlib.h" HAVE_STRTOULL) # dbus-send.c set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE) check_symbol_exists(pipe2 "fcntl.h;unistd.h" HAVE_PIPE2) check_symbol_exists(accept4 "sys/socket.h" HAVE_ACCEPT4) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 44b79c03..88992149 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -185,12 +185,6 @@ /* Define to 1 if you have localeconv */ #cmakedefine HAVE_LOCALECONV 1 -/* Define to 1 if you have strtoll */ -#cmakedefine HAVE_STRTOLL 1 - -/* Define to 1 if you have strtoull */ -#cmakedefine HAVE_STRTOULL 1 - /* Define to 1 if you have pip2 */ #cmakedefine HAVE_PIPE2 1 @@ -256,12 +250,6 @@ # define gid_t int # else typedef int mode_t; -# if !defined(_WIN32_WCE) -# define strtoll _strtoi64 -# define strtoull _strtoui64 -# define HAVE_STRTOLL 1 -# define HAVE_STRTOULL 1 -# endif # endif #endif // defined(_WIN32) || defined(_WIN64) diff --git a/configure.ac b/configure.ac index e4b75e42..73ca1d23 100644 --- a/configure.ac +++ b/configure.ac @@ -403,8 +403,6 @@ setlocale setresuid setrlimit socketpair -strtoll -strtoull unsetenv usleep ]) diff --git a/meson.build b/meson.build index c6089c4b..a97e90cf 100644 --- a/meson.build +++ b/meson.build @@ -595,8 +595,6 @@ check_functions = [ 'setresuid', 'setrlimit', 'socketpair', - 'strtoll', - 'strtoull', 'unsetenv', 'usleep', ] diff --git a/tools/Makefile.am b/tools/Makefile.am index dee5f862..5488b54d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -140,7 +140,7 @@ SUFFIXES = .rc dbus_update_activation_environment_SOURCES += disable-uac.rc endif -EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c Win32.Manifest +EXTRA_DIST = run-with-tmp-session-bus.sh Win32.Manifest CLEANFILES = \ run-with-tmp-session-bus.conf \ $(nodist_dbus_update_activation_environment_SOURCES) diff --git a/tools/dbus-send.c b/tools/dbus-send.c index 86858c50..3063290f 100644 --- a/tools/dbus-send.c +++ b/tools/dbus-send.c @@ -27,18 +27,6 @@ #include <dbus/dbus.h> #include "dbus/dbus-internals.h" -#ifndef HAVE_STRTOLL -#undef strtoll -#define strtoll mystrtoll -#include "strtoll.c" -#endif - -#ifndef HAVE_STRTOULL -#undef strtoull -#define strtoull mystrtoull -#include "strtoull.c" -#endif - #ifdef DBUS_WINCE #ifndef strdup #define strdup _strdup diff --git a/tools/strtoll.c b/tools/strtoll.c deleted file mode 100644 index 00f14c3c..00000000 --- a/tools/strtoll.c +++ /dev/null @@ -1,166 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "config.h" - -#include <limits.h> -#ifdef HAVE_ERRNO_H -#include <errno.h> -#endif -#include <stdlib.h> -#ifdef DBUS_WINCE -#include <windows.h> -#endif - -#ifndef isspace -#define isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\r' || (c) == '\n') -#endif - -/* Minimum and maximum values a `signed long long int' can hold. */ -#ifndef LLONG_MAX -# define LLONG_MAX 9223372036854775807LL -#endif - -#ifndef LLONG_MIN -# define LLONG_MIN (-LLONG_MAX - 1LL) -#endif -/* Maximum value an `unsigned long long int' can hold. (Minimum is 0.) */ -#ifndef ULLONG_MAX -# define ULLONG_MAX 18446744073709551615ULL -#endif -/* - * Convert a string to a long long integer. - * - * Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -long long strtoll (const char*, char **, int); - -long long -strtoll(const char * nptr, char ** endptr, int base) -{ - const char *s; - unsigned long long acc; - char c; - unsigned long long cutoff; - int neg, any, cutlim; - - /* - * Skip white space and pick up leading +/- sign if any. - * If base is 0, allow 0x for hex and 0 for octal, else - * assume decimal; if base is already 16, allow 0x. - */ - s = nptr; - do { - c = *s++; - } while (isspace((unsigned char)c)); - if (c == '-') { - neg = 1; - c = *s++; - } else { - neg = 0; - if (c == '+') - c = *s++; - } - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X') && - ((s[1] >= '0' && s[1] <= '9') || - (s[1] >= 'A' && s[1] <= 'F') || - (s[1] >= 'a' && s[1] <= 'f'))) { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - acc = any = 0; - if (base < 2 || base > 36) - goto noconv; - - /* - * Compute the cutoff value between legal numbers and illegal - * numbers. That is the largest legal value, divided by the - * base. An input number that is greater than this value, if - * followed by a legal input character, is too big. One that - * is equal to this value may be valid or not; the limit - * between valid and invalid numbers is then based on the last - * digit. For instance, if the range for quads is - * [-9223372036854775808..9223372036854775807] and the input base - * is 10, cutoff will be set to 922337203685477580 and cutlim to - * either 7 (neg==0) or 8 (neg==1), meaning that if we have - * accumulated a value > 922337203685477580, or equal but the - * next digit is > 7 (or 8), the number is too big, and we will - * return a range error. - * - * Set 'any' if any `digits' consumed; make it negative to indicate - * overflow. - */ - cutoff = neg ? (unsigned long long)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX - : LLONG_MAX; - cutlim = cutoff % base; - cutoff /= base; - for ( ; ; c = *s++) { - if (c >= '0' && c <= '9') - c -= '0'; - else if (c >= 'A' && c <= 'Z') - c -= 'A' - 10; - else if (c >= 'a' && c <= 'z') - c -= 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) - any = -1; - else { - any = 1; - acc *= base; - acc += c; - } - } - if (any < 0) { - acc = neg ? LLONG_MIN : LLONG_MAX; -#ifdef DBUS_WINCE - SetLastError (ERROR_ARITHMETIC_OVERFLOW); -#else - errno = ERANGE; -#endif - } else if (!any) { -noconv: -#ifdef DBUS_WINCE - SetLastError (ERROR_INVALID_PARAMETER); -#else - errno = EINVAL; -#endif - } else if (neg) - acc = -acc; - if (endptr != NULL) - *endptr = (char *)(any ? s - 1 : nptr); - return (acc); -} diff --git a/tools/strtoull.c b/tools/strtoull.c deleted file mode 100644 index 35595542..00000000 --- a/tools/strtoull.c +++ /dev/null @@ -1,145 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "config.h" - -#include <limits.h> -#ifdef HAVE_ERRNO_H -#include <errno.h> -#endif -#include <stdlib.h> -#ifdef DBUS_WINCE -#include <windows.h> -#endif - -#ifndef isspace -#define isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\r' || (c) == '\n') -#endif - -/* Minimum and maximum values a `signed long long int' can hold. */ -#ifndef LLONG_MAX -# define LLONG_MAX 9223372036854775807LL -#endif - -#ifndef LLONG_MIN -# define LLONG_MIN (-LLONG_MAX - 1LL) -#endif -/* Maximum value an `unsigned long long int' can hold. (Minimum is 0.) */ -#ifndef ULLONG_MAX -# define ULLONG_MAX 18446744073709551615ULL -#endif - -/* - * Convert a string to an unsigned long long integer. - * - * Assumes that the upper and lower case - * alphabets and digits are each contiguous. - */ -unsigned long long strtoull (const char *, char **, int); - -unsigned long long -strtoull(const char * nptr, char ** endptr, int base) -{ - const char *s; - unsigned long long acc; - char c; - unsigned long long cutoff; - int neg, any, cutlim; - - /* - * See strtoq for comments as to the logic used. - */ - s = nptr; - do { - c = *s++; - } while (isspace((unsigned char)c)); - if (c == '-') { - neg = 1; - c = *s++; - } else { - neg = 0; - if (c == '+') - c = *s++; - } - if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X') && - ((s[1] >= '0' && s[1] <= '9') || - (s[1] >= 'A' && s[1] <= 'F') || - (s[1] >= 'a' && s[1] <= 'f'))) { - c = s[1]; - s += 2; - base = 16; - } - if (base == 0) - base = c == '0' ? 8 : 10; - acc = any = 0; - if (base < 2 || base > 36) - goto noconv; - - cutoff = ULLONG_MAX / base; - cutlim = ULLONG_MAX % base; - for ( ; ; c = *s++) { - if (c >= '0' && c <= '9') - c -= '0'; - else if (c >= 'A' && c <= 'Z') - c -= 'A' - 10; - else if (c >= 'a' && c <= 'z') - c -= 'a' - 10; - else - break; - if (c >= base) - break; - if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim)) - any = -1; - else { - any = 1; - acc *= base; - acc += c; - } - } - if (any < 0) { - acc = ULLONG_MAX; -#ifdef DBUS_WINCE - SetLastError (ERROR_ARITHMETIC_OVERFLOW); -#else - errno = ERANGE; -#endif - } else if (!any) { -noconv: -#ifdef DBUS_WINCE - SetLastError (ERROR_INVALID_PARAMETER); -#else - errno = EINVAL; -#endif - } else if (neg) - acc = -acc; - if (endptr != NULL) - *endptr = (char *)(any ? s - 1 : nptr); - return (acc); -} |