summaryrefslogtreecommitdiff
path: root/libc/stdlib
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2002-05-06 07:37:32 +0000
committerManuel Novoa III <mjn3@codepoet.org>2002-05-06 07:37:32 +0000
commitd07fdf8b9ece2c4339b325921add50792077bf97 (patch)
treeb0886656bdd854728f2d1c05597368c4739ecc1b /libc/stdlib
parent7f09a14cabbec158d683542e53f53ccfe75031fa (diff)
New locale support (in development). Supports LC_CTYPE, LC_NUMERIC,
LC_TIME, LC_MONETARY, and LC_MESSAGES for the SUSv3 items. Also, nl_langinfo() when real locale support is enabled. New implementation of ctype.h. New implementation of wctype.h. New implementation of most of the string functions (smaller). New implementation of the wcs/wmem functions. These are untested, but they're also just preprocessor-modified versions ot the corresponding str/mem functions. Tweaked qsort and new bsearch. Stuff still pending: stdlib.h and wchar.h mb<->wc functions. I actually have working versions of the stdlib ones, but the reentrant versions from wchar.h require some reworking. Basic replacement and translit support for wc->mb conversions. (groundwork laid). Simple-minded collate support such as was provided by the previous locale implementation. (mostly done -- 8-bit codesets only) Shared mmaping of the locale data and strerror message text.
Diffstat (limited to 'libc/stdlib')
-rw-r--r--libc/stdlib/Makefile5
-rw-r--r--libc/stdlib/stdlib.c181
2 files changed, 172 insertions, 14 deletions
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index 44a359434..64ae75d18 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -28,7 +28,8 @@ DIRS = $(MALLOC)
ALL_SUBDIRS = malloc malloc-930716 malloc-simple
MSRC = stdlib.c
-MOBJ = abs.o labs.o atoi.o atol.o strtol.o strtoul.o _stdlib_strto_l.o
+MOBJ = abs.o labs.o atoi.o atol.o strtol.o strtoul.o _stdlib_strto_l.o \
+ qsort.o bsearch.o
ifeq ($(HAS_LONG_LONG),true)
MOBJ += llabs.o atoll.o strtoll.o strtoull.o _stdlib_strto_ll.o
@@ -37,7 +38,7 @@ endif
MSRC2=atexit.c
MOBJ2=atexit.o on_exit.o __exit_handler.o exit.o
-CSRC = abort.c getenv.c mktemp.c qsort.c realpath.c bsearch.c \
+CSRC = abort.c getenv.c mktemp.c realpath.c \
mkstemp.c mkstemp64.c putenv.c rand.c random.c random_r.c setenv.c \
system.c div.c ldiv.c getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c
CSRC+= drand48.c drand48-iter.c drand48_r.c erand48.c erand48_r.c \
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index 40286f0e5..101debb40 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -27,30 +27,44 @@
#define _ISOC99_SOURCE /* for ULLONG primarily... */
#define _GNU_SOURCE
-#include <stdlib.h>
#include <limits.h>
#include <stdint.h>
#include <inttypes.h>
#include <ctype.h>
#include <errno.h>
#include <assert.h>
+#include <unistd.h>
+
+/* Work around gcc's refusal to create aliases. */
+#define atoi __ignore_atoi
+#define abs __ignore_abs
+#include <stdlib.h>
+#undef atoi
+#undef abs
extern unsigned long
_stdlib_strto_l(register const char * __restrict str,
char ** __restrict endptr, int base, int sflag);
+
+#if defined(ULLONG_MAX)
extern unsigned long long
_stdlib_strto_ll(register const char * __restrict str,
char ** __restrict endptr, int base, int sflag);
+#endif
-/* TODO: gcc reports an error due to prototype conflicts. Don't include
- * the header for the problem cases? */
-#define HEADER_ALIAS_PROBLEM
+/**********************************************************************/
+#ifdef L_atof
+double atof(const char *nptr)
+{
+ return strtod(nptr, (char **) NULL);
+}
+
+#endif
/**********************************************************************/
#ifdef L_abs
-#ifdef HEADER_ALIAS_PROBLEM
-/* #if UINT_MAX < ULONG_MAX */
+#if UINT_MAX < ULONG_MAX
int abs(int j)
{
@@ -63,8 +77,7 @@ int abs(int j)
/**********************************************************************/
#ifdef L_labs
-#ifndef HEADER_ALIAS_PROBLEM
-/* #if UINT_MAX == ULONG_MAX */
+#if UINT_MAX == ULONG_MAX
strong_alias(labs,abs)
#endif
@@ -102,8 +115,7 @@ long long int llabs(long long int j)
/**********************************************************************/
#ifdef L_atoi
-#ifdef HEADER_ALIAS_PROBLEM
-/* #if UINT_MAX < ULONG_MAX */
+#if UINT_MAX < ULONG_MAX
int atoi(const char *nptr)
{
@@ -116,8 +128,7 @@ int atoi(const char *nptr)
/**********************************************************************/
#ifdef L_atol
-#ifndef HEADER_ALIAS_PROBLEM
-/* #if UINT_MAX == ULONG_MAX */
+#if UINT_MAX == ULONG_MAX
strong_alias(atol,atoi)
#endif
@@ -446,3 +457,149 @@ unsigned long long _stdlib_strto_ll(register const char * __restrict str,
#endif
/**********************************************************************/
+/* Made _Exit() an alias for _exit(), as per C99. */
+/* #ifdef L__Exit */
+
+/* void _Exit(int status) */
+/* { */
+/* _exit(status); */
+/* } */
+
+/* #endif */
+/**********************************************************************/
+#ifdef L_bsearch
+
+void *bsearch(const void *key, const void *base, size_t /* nmemb */ high,
+ size_t size, int (*compar)(const void *, const void *))
+{
+ register char *p;
+ size_t low;
+ size_t mid;
+ int r;
+
+ if (size > 0) { /* TODO: change this to an assert?? */
+ low = 0;
+ while (low < high) {
+ mid = low + ((high - low) >> 1); /* Avoid possible overflow here. */
+ p = ((char *)base) + mid * size; /* Could overflow here... */
+ r = (*compar)(key, p); /* but that's an application problem! */
+ if (r > 0) {
+ low = mid + 1;
+ } else if (r < 0) {
+ high = mid;
+ } else {
+ return p;
+ }
+ }
+ }
+ return NULL;
+}
+
+#endif
+/**********************************************************************/
+#ifdef L_qsort
+
+/* This code is derived from a public domain shell sort routine by
+ * Ray Gardner and found in Bob Stout's snippets collection. The
+ * original code is included below in an #if 0/#endif block.
+ *
+ * I modified it to avoid the possibility of overflow in the wgap
+ * calculation, as well as to reduce the generated code size with
+ * bcc and gcc. */
+
+void qsort (void *base,
+ size_t nel,
+ size_t width,
+ int (*comp)(const void *, const void *))
+{
+ size_t wgap, i, j, k;
+ char tmp;
+
+ if ((nel > 1) && (width > 0)) {
+ assert( nel <= ((size_t)(-1)) / width ); /* check for overflow */
+ wgap = 0;
+ do {
+ wgap = 3 * wgap + 1;
+ } while (wgap < (nel-1)/3);
+ /* From the above, we know that either wgap == 1 < nel or */
+ /* ((wgap-1)/3 < (int) ((nel-1)/3) <= (nel-1)/3 ==> wgap < nel. */
+ wgap *= width; /* So this can not overflow if wnel doesn't. */
+ nel *= width; /* Convert nel to 'wnel' */
+ do {
+ i = wgap;
+ do {
+ j = i;
+ do {
+ register char *a;
+ register char *b;
+
+ j -= wgap;
+ a = j + ((char *)base);
+ b = a + wgap;
+ if ( (*comp)(a, b) <= 0 ) {
+ break;
+ }
+ k = width;
+ do {
+ tmp = *a;
+ *a++ = *b;
+ *b++ = tmp;
+ } while ( --k );
+ } while (j >= wgap);
+ i += width;
+ } while (i < nel);
+ wgap = (wgap - width)/3;
+ } while (wgap);
+ }
+}
+
+/* ---------- original snippets version below ---------- */
+
+#if 0
+/*
+** ssort() -- Fast, small, qsort()-compatible Shell sort
+**
+** by Ray Gardner, public domain 5/90
+*/
+
+#include <stddef.h>
+
+void ssort (void *base,
+ size_t nel,
+ size_t width,
+ int (*comp)(const void *, const void *))
+{
+ size_t wnel, gap, wgap, i, j, k;
+ char *a, *b, tmp;
+
+ wnel = width * nel;
+ for (gap = 0; ++gap < nel;)
+ gap *= 3;
+ while ( gap /= 3 )
+ {
+ wgap = width * gap;
+ for (i = wgap; i < wnel; i += width)
+ {
+ for (j = i - wgap; ;j -= wgap)
+ {
+ a = j + (char *)base;
+ b = a + wgap;
+ if ( (*comp)(a, b) <= 0 )
+ break;
+ k = width;
+ do
+ {
+ tmp = *a;
+ *a++ = *b;
+ *b++ = tmp;
+ } while ( --k );
+ if (j < wgap)
+ break;
+ }
+ }
+ }
+}
+#endif
+
+#endif
+/**********************************************************************/