diff options
| -rw-r--r-- | include/ctype.h | 121 | ||||
| -rw-r--r-- | include/unistd.h | 4 | ||||
| -rw-r--r-- | libc/inet/resolv.c | 8 | ||||
| -rw-r--r-- | libc/misc/ctype/ctype.c | 1 | ||||
| -rw-r--r-- | libc/string/generic/strverscmp.c | 117 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_ctype.h | 23 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/getdomainname.c | 8 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/ssp.c | 2 | ||||
| -rw-r--r-- | libm/float_wrappers.c | 2 | ||||
| -rw-r--r-- | libm/ldouble_wrappers.c | 10 |
10 files changed, 88 insertions, 208 deletions
diff --git a/include/ctype.h b/include/ctype.h index 4b73111fd..0cae94101 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -27,6 +27,69 @@ #include <features.h> #include <bits/types.h> +__BEGIN_DECLS +__BEGIN_NAMESPACE_STD + +/* The following names are all functions: + int isCHARACTERISTIC(int c); + which return nonzero iff C has CHARACTERISTIC. + For the meaning of the characteristic names, see the `enum' above. */ +extern int isalnum(int __c) __THROW; +libc_hidden_proto(isalnum) +extern int isalpha(int __c) __THROW; +libc_hidden_proto(isalpha) +extern int iscntrl(int __c) __THROW; +libc_hidden_proto(iscntrl) +extern int isdigit(int __c) __THROW; +libc_hidden_proto(isdigit) +extern int islower(int __c) __THROW; +libc_hidden_proto(islower) +extern int isgraph(int __c) __THROW; +libc_hidden_proto(isgraph) +extern int isprint(int __c) __THROW; +libc_hidden_proto(isprint) +extern int ispunct(int __c) __THROW; +libc_hidden_proto(ispunct) +extern int isspace(int __c) __THROW; +libc_hidden_proto(isspace) +extern int isupper(int __c) __THROW; +libc_hidden_proto(isupper) +extern int isxdigit(int __c) __THROW; +libc_hidden_proto(isxdigit) + + +/* Return the lowercase version of C. */ +extern int tolower(int __c) __THROW; +libc_hidden_proto(tolower) + +/* Return the uppercase version of C. */ +extern int toupper(int __c) __THROW; +libc_hidden_proto(toupper) + +#if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN +/* Return nonzero iff C is in the ASCII set + (i.e., is no more than 7 bits wide). */ +extern int isascii(int __c) __THROW; +libc_hidden_proto(isascii) +/* Return the part of C that is in the ASCII set + (i.e., the low-order 7 bits of C). */ +extern int toascii(int __c) __THROW; +#endif + +__END_NAMESPACE_STD + + +/* ISO C99 introduced one new function. */ +#ifdef __USE_ISOC99 +__BEGIN_NAMESPACE_C99 + +extern int isblank(int __c) __THROW; +libc_hidden_proto(isblank) + +__END_NAMESPACE_C99 +#endif +__END_DECLS + #ifndef __UCLIBC_HAS_CTYPE_TABLES__ /* "Stub locale": we are permanently in C/POSIX locale. @@ -150,70 +213,12 @@ libc_hidden_proto(__ctype_tolower) #define __isdigit_int(C) (((unsigned int)((C) - '0')) <= 9) #endif -__BEGIN_NAMESPACE_STD - -/* The following names are all functions: - int isCHARACTERISTIC(int c); - which return nonzero iff C has CHARACTERISTIC. - For the meaning of the characteristic names, see the `enum' above. */ -extern int isalnum(int __c) __THROW; -libc_hidden_proto(isalnum) -extern int isalpha(int __c) __THROW; -libc_hidden_proto(isalpha) -extern int iscntrl(int __c) __THROW; -libc_hidden_proto(iscntrl) -extern int isdigit(int __c) __THROW; -libc_hidden_proto(isdigit) -extern int islower(int __c) __THROW; -libc_hidden_proto(islower) -extern int isgraph(int __c) __THROW; -libc_hidden_proto(isgraph) -extern int isprint(int __c) __THROW; -libc_hidden_proto(isprint) -extern int ispunct(int __c) __THROW; -libc_hidden_proto(ispunct) -extern int isspace(int __c) __THROW; -libc_hidden_proto(isspace) -extern int isupper(int __c) __THROW; -libc_hidden_proto(isupper) -extern int isxdigit(int __c) __THROW; -libc_hidden_proto(isxdigit) - - -/* Return the lowercase version of C. */ -extern int tolower(int __c) __THROW; -libc_hidden_proto(tolower) - -/* Return the uppercase version of C. */ -extern int toupper(int __c) __THROW; -libc_hidden_proto(toupper) - -__END_NAMESPACE_STD - - -/* ISO C99 introduced one new function. */ -#ifdef __USE_ISOC99 -__BEGIN_NAMESPACE_C99 - -extern int isblank(int __c) __THROW; -libc_hidden_proto(isblank) - -__END_NAMESPACE_C99 -#endif - #ifdef __USE_GNU /* Test C for a set of character classes according to MASK. */ extern int isctype(int __c, int __mask) __THROW; #endif #if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN -/* Return nonzero iff C is in the ASCII set - (i.e., is no more than 7 bits wide). */ -extern int isascii(int __c) __THROW; -libc_hidden_proto(isascii) -/* Return the part of C that is in the ASCII set - (i.e., the low-order 7 bits of C). */ -extern int toascii(int __c) __THROW; /* These are the same as `toupper' and `tolower' except that they do not check the argument for being in the range of a `char'. */ extern int _toupper(int __c) __THROW; diff --git a/include/unistd.h b/include/unistd.h index eb0d94595..30621634a 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -908,13 +908,15 @@ extern int sethostname (__const char *__name, size_t __len) This call is restricted to the super-user. */ extern int sethostid (long int __id) __THROW __wur; -#if defined __UCLIBC_BSD_SPECIFIC__ +#if defined __UCLIBC_BSD_SPECIFIC__ || defined UCLIBC_INTERNAL /* Get and set the NIS (aka YP) domain name, if any. Called just like `gethostname' and `sethostname'. The NIS domain name is usually the empty string when not using NIS. */ extern int getdomainname (char *__name, size_t __len) __THROW __nonnull ((1)) __wur; libc_hidden_proto(getdomainname) +#endif +#if defined __UCLIBC_BSD_SPECIFIC__ extern int setdomainname (__const char *__name, size_t __len) __THROW __nonnull ((1)) __wur; #endif diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index b376b82b0..ecc7ce5cf 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -133,6 +133,14 @@ * */ +/* Nota bene: + The whole resolver code has several (severe) problems: + - it doesn't even build without IPv4, i.e. !UCLIBC_HAS_IPV4 but only IPv6 + - it is way too big + + Both points above are considered bugs, patches/reimplementations welcome. +*/ + #define __FORCE_GLIBC #include <features.h> #include <string.h> diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index a98d345d8..f90b40537 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -152,6 +152,7 @@ CTYPE_ALIAS(NAME) #define C_MACRO(X) PASTE2(__C_is,X)(c) #define CTYPE_NAME(X) is ## X +#define CTYPE_DEF(NAME) libc_hidden_def(is ## NAME) #define IS_FUNC_BODY(NAME) \ int CTYPE_NAME(NAME) (int c) \ diff --git a/libc/string/generic/strverscmp.c b/libc/string/generic/strverscmp.c index 74ae4c6ad..e69de29bb 100644 --- a/libc/string/generic/strverscmp.c +++ b/libc/string/generic/strverscmp.c @@ -1,117 +0,0 @@ -/* GNU's strverscmp() function, taken from glibc 2.3.2 sources - */ - -/* Compare strings while treating digits characters numerically. - Copyright (C) 1997, 2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jean-François Bignolles <bignolle@ecoledoc.ibp.fr>, 1997. - - Derived work for uClibc by Hai Zaar, Codefidence Ltd <haizaar@codefidence.com> - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include <string.h> -#include <ctype.h> -#include <stdint.h> - - -/* states: S_N: normal, S_I: comparing integral part, S_F: comparing - fractional parts, S_Z: idem but with leading Zeroes only */ -#define S_N 0x0 -#define S_I 0x4 -#define S_F 0x8 -#define S_Z 0xC - -/* result_type: CMP: return diff; LEN: compare using len_diff/diff */ -#define CMP 2 -#define LEN 3 - -/* using more efficient isdigit() */ -#undef isdigit -#define isdigit(a) ((unsigned)((a) - '0') <= 9) - -/* Compare S1 and S2 as strings holding indices/version numbers, - returning less than, equal to or greater than zero if S1 is less than, - equal to or greater than S2 (for more info, see the texinfo doc). -*/ -int strverscmp (const char *s1, const char *s2) -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - int state; - int diff; - - /* Symbol(s) 0 [1-9] others (padding) - Transition (10) 0 (01) d (00) x (11) - */ - static const uint8_t next_state[] = - { - /* state x d 0 - */ - /* S_N */ S_N, S_I, S_Z, S_N, - /* S_I */ S_N, S_I, S_I, S_I, - /* S_F */ S_N, S_F, S_F, S_F, - /* S_Z */ S_N, S_F, S_Z, S_Z - }; - - static const int8_t result_type[] = - { - /* state x/x x/d x/0 x/- d/x d/d d/0 d/- - 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ - - /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_I */ CMP, -1, -1, CMP, +1, LEN, LEN, CMP, - +1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, - /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_Z */ CMP, +1, +1, CMP, -1, CMP, CMP, CMP, - -1, CMP, CMP, CMP - }; - - if (p1 == p2) - return 0; - - c1 = *p1++; - c2 = *p2++; - /* Hint: '0' is a digit too. */ - state = S_N | ((c1 == '0') + (isdigit (c1) != 0)); - - while ((diff = c1 - c2) == 0 && c1 != '\0') - { - state = next_state[state]; - c1 = *p1++; - c2 = *p2++; - state |= (c1 == '0') + (isdigit (c1) != 0); - } - - state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))]; - - switch (state) - { - case CMP: - return diff; - - case LEN: - while (isdigit (*p1++)) - if (!isdigit (*p2++)) - return 1; - - return isdigit (*p2) ? -1 : diff; - - default: - return state; - } -} diff --git a/libc/sysdeps/linux/common/bits/uClibc_ctype.h b/libc/sysdeps/linux/common/bits/uClibc_ctype.h index 9150b4870..9fe1f5fc4 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_ctype.h +++ b/libc/sysdeps/linux/common/bits/uClibc_ctype.h @@ -95,29 +95,6 @@ /**********************************************************************/ __BEGIN_DECLS -extern int isalnum(int c) __THROW; -extern int isalpha(int c) __THROW; -#ifdef __USE_ISOC99 -extern int isblank(int c) __THROW; -#endif -extern int iscntrl(int c) __THROW; -extern int isdigit(int c) __THROW; -extern int isgraph(int c) __THROW; -extern int islower(int c) __THROW; -extern int isprint(int c) __THROW; -extern int ispunct(int c) __THROW; -extern int isspace(int c) __THROW; -extern int isupper(int c) __THROW; -extern int isxdigit(int c) __THROW; - -extern int tolower(int c) __THROW; -extern int toupper(int c) __THROW; - -#if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN -extern int isascii(int c) __THROW; -extern int toascii(int c) __THROW; -#endif - #if defined _LIBC && (defined NOT_IN_libc || defined IS_IN_libc) /* These are uClibc-specific. */ # define __isdigit_char(c) ((unsigned char)((c) - '0') <= 9) diff --git a/libc/sysdeps/linux/common/getdomainname.c b/libc/sysdeps/linux/common/getdomainname.c index 20b09610a..cdea2172a 100644 --- a/libc/sysdeps/linux/common/getdomainname.c +++ b/libc/sysdeps/linux/common/getdomainname.c @@ -16,7 +16,11 @@ /* Experimentally off - libc_hidden_proto(strcpy) */ /* libc_hidden_proto(uname) */ -int getdomainname(char *name, size_t len) +int +#ifndef __UCLIBC_BSD_SPECIFIC__ +attribute_hidden +#endif +getdomainname(char *name, size_t len) { struct utsname uts; @@ -42,5 +46,7 @@ int getdomainname(char *name, size_t len) #endif return 0; } +# ifdef __UCLIBC_BSD_SPECIFIC__ libc_hidden_def(getdomainname) +# endif #endif diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c index 8a84e4893..8682ddcf2 100644 --- a/libc/sysdeps/linux/common/ssp.c +++ b/libc/sysdeps/linux/common/ssp.c @@ -63,7 +63,7 @@ static void block_signals(void) sigaction(SSP_SIGTYPE, &sa, NULL); } -static void ssp_write(int fd, const char *msg1, const char *msg2, const char *msg3) __cold +static void __cold ssp_write(int fd, const char *msg1, const char *msg2, const char *msg3) { write(fd, msg1, strlen(msg1)); write(fd, msg2, strlen(msg2)); diff --git a/libm/float_wrappers.c b/libm/float_wrappers.c index 22258f1fa..93d56c3c9 100644 --- a/libm/float_wrappers.c +++ b/libm/float_wrappers.c @@ -388,7 +388,7 @@ float fmaf (float x, float y, float z) } #endif -#ifdef L_scalbf +#if defined L_scalbf && defined __UCLIBC_SUSV3_LEGACY__ float scalbf (float x, float y) { return (float) scalb( (double)x, (double)y ); diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c index 32cafb632..61940cb12 100644 --- a/libm/ldouble_wrappers.c +++ b/libm/ldouble_wrappers.c @@ -16,8 +16,6 @@ #include "math.h" #include <complex.h> -#define STRINGIZE(s) #s - #define WRAPPER1(func) \ long double func##l(long double x) \ { \ @@ -71,7 +69,7 @@ long double func##l(long double x) \ __asm ( \ " fldt %1\n" \ " fstpl %1\n" \ - " jmp " STRINGIZE(__GI_##func) "\n" \ + " jmp " __stringify(__GI_##func) "\n" \ : "=t" (st_top) \ : "m" (x) \ ); \ @@ -84,7 +82,7 @@ int func##l(long double x) \ __asm ( \ " fldt %1\n" \ " fstpl %1\n" \ - " jmp " STRINGIZE(__GI_##func) "\n" \ + " jmp " __stringify(__GI_##func) "\n" \ : "=a" (ret) \ : "m" (x) \ ); \ @@ -97,7 +95,7 @@ long func##l(long double x) \ __asm ( \ " fldt %1\n" \ " fstpl %1\n" \ - " jmp " STRINGIZE(__GI_##func) "\n" \ + " jmp " __stringify(__GI_##func) "\n" \ : "=a" (ret) \ : "m" (x) \ ); \ @@ -110,7 +108,7 @@ long long func##l(long double x) \ __asm ( \ " fldt %1\n" \ " fstpl %1\n" \ - " jmp " STRINGIZE(__GI_##func) "\n" \ + " jmp " __stringify(__GI_##func) "\n" \ : "=A" (ret) \ : "m" (x) \ ); \ |