diff options
| -rw-r--r-- | docs/uClibc_vs_SuSv3.txt | 4 | ||||
| -rwxr-xr-x | extra/scripts/getent | 19 | ||||
| -rw-r--r-- | ldso/libdl/libdl.c | 5 | ||||
| -rw-r--r-- | libc/stdlib/Makefile | 5 | ||||
| -rw-r--r-- | libc/stdlib/a64l.c | 66 | ||||
| -rw-r--r-- | libc/stdlib/l64a.c | 58 | ||||
| -rw-r--r-- | libc/stdlib/mktemp.c | 16 |
7 files changed, 158 insertions, 15 deletions
diff --git a/docs/uClibc_vs_SuSv3.txt b/docs/uClibc_vs_SuSv3.txt index b83f6d4ef..a5a9dcd49 100644 --- a/docs/uClibc_vs_SuSv3.txt +++ b/docs/uClibc_vs_SuSv3.txt @@ -58,8 +58,8 @@ interfaces pthread_cleanup_push and pthread_cleanup_pop. Omissions from obligatory interfaces: ------------------------------------- -stdlib.h: _Exit, a64l, l64a, lcong48, lldiv, mkstemp, posix_openpt; - mktemp, ecvt, fcvt +stdlib.h: _Exit, lcong48, lldiv, posix_openpt; + ecvt, fcvt ndbm.h: [all=9] dbm_* utmpx.h: [all=6] *utx* (but functions without "x" do exist!) nl_types.h: [all] catclose, catgets, catopen diff --git a/extra/scripts/getent b/extra/scripts/getent index c02149498..3a96d74f6 100755 --- a/extra/scripts/getent +++ b/extra/scripts/getent @@ -1,5 +1,5 @@ #!/bin/sh -# $Header: /var/cvs/uClibc/extra/scripts/getent,v 1.2 2005/02/02 14:18:01 solar Exp $ +# Script to replicate the `getent` binary that comes with glibc search_entry() { if [ -e "$1" ] ; then @@ -11,9 +11,19 @@ search_entry() { fi } +if [ -z "$1" ] ; then + echo "getent: wrong number of arguments" 1>&2 + exit 1 +fi + file="/etc/$1" string="dummy" +if [ ! -f "$file" ] ; then + echo "Unknown database: $1" 1>&2 + exit 1 +fi + #aliases|ethers|group|hosts|netgroup|networks|passwd|protocols|rpc|services|shadow) # dns based search is not supported for hosts|networks # ethers|netgroup (not done, needed)? @@ -48,6 +58,11 @@ case $1 in ;; esac -search_entry $file $2 +if [ -z "$2" ] ; then + cat $file + retval=$? +else + search_entry "$file" "$2" +fi exit $retval diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 08952094c..f8f90dfb7 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -452,7 +452,7 @@ void *dlsym(void *vhandle, const char *name) static int do_dlclose(void *vhandle, int need_fini) { - struct dyn_elf *rpnt, *rpnt1; + struct dyn_elf *rpnt, *rpnt1, *rpnt1_tmp; struct init_fini_list *runp, *tmp; ElfW(Phdr) *ppnt; struct elf_resolve *tpnt, *run_tpnt; @@ -541,8 +541,9 @@ static int do_dlclose(void *vhandle, int need_fini) for (rpnt1 = _dl_symbol_tables; rpnt1->next; rpnt1 = rpnt1->next) { if (rpnt1->next->dyn == tpnt) { _dl_if_debug_print("removing symbol_tables: %s\n", tpnt->libname); + rpnt1_tmp = rpnt1->next->next; free(rpnt1->next); - rpnt1->next = rpnt1->next->next; + rpnt1->next = rpnt1_tmp; if (rpnt1->next) rpnt1->next->prev = rpnt1; break; diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile index 40d03521f..210a2eeba 100644 --- a/libc/stdlib/Makefile +++ b/libc/stdlib/Makefile @@ -81,12 +81,13 @@ endif MSRC2 = atexit.c MOBJ2 = atexit.o on_exit.o __exit_handler.o exit.o -CSRC = abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c mkstemp64.c \ +CSRC = \ + abort.c getenv.c mkdtemp.c mktemp.c realpath.c mkstemp.c mkstemp64.c \ rand.c random.c random_r.c setenv.c system.c div.c ldiv.c lldiv.c \ getpt.c ptsname.c grantpt.c unlockpt.c gcvt.c drand48-iter.c jrand48.c \ jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c nrand48.c \ nrand48_r.c rand_r.c srand48.c srand48_r.c seed48.c seed48_r.c \ - valloc.c posix_memalign.c + valloc.c posix_memalign.c a64l.c l64a.c ifeq ($(UCLIBC_HAS_FLOATS),y) CSRC += drand48.c drand48_r.c erand48.c erand48_r.c endif diff --git a/libc/stdlib/a64l.c b/libc/stdlib/a64l.c new file mode 100644 index 000000000..23faf2744 --- /dev/null +++ b/libc/stdlib/a64l.c @@ -0,0 +1,66 @@ +/* Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.org>, August 1995. + + 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 <stdlib.h> + +#define TABLE_BASE 0x2e +#define TABLE_SIZE 0x4d + +#define XX ((char)0x40) + + +static const char a64l_table[TABLE_SIZE] = +{ + /* 0x2e */ 0, 1, + /* 0x30 */ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, XX, XX, XX, XX, XX, XX, + /* 0x40 */ XX, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + /* 0x50 */ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, XX, XX, XX, XX, XX, + /* 0x60 */ XX, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, + /* 0x70 */ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63 +}; + + +long int +a64l (string) + const char *string; +{ + const char *ptr = string; + unsigned long int result = 0ul; + const char *end = ptr + 6; + int shift = 0; + + do + { + unsigned index; + unsigned value; + + index = *ptr - TABLE_BASE; + if ((unsigned int) index >= TABLE_SIZE) + break; + value = (int) a64l_table[index]; + if (value == (int) XX) + break; + ++ptr; + result |= value << shift; + shift += 6; + } + while (ptr != end); + + return (long int) result; +} diff --git a/libc/stdlib/l64a.c b/libc/stdlib/l64a.c new file mode 100644 index 000000000..f3a249fed --- /dev/null +++ b/libc/stdlib/l64a.c @@ -0,0 +1,58 @@ +/* Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. + + 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 <stdlib.h> + +/* Conversion table. */ +static const char conv_table[64] = +{ + '.', '/', '0', '1', '2', '3', '4', '5', + '6', '7', '8', '9', 'A', 'B', 'C', 'D', + 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', + 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', + 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', + 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', + 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', + 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' +}; + +char * +l64a (n) + long int n; +{ + unsigned long int m = (unsigned long int) n; + static char result[7]; + int cnt; + + /* The standard says that only 32 bits are used. */ + m &= 0xffffffff; + + if (m == 0ul) + /* The value for N == 0 is defined to be the empty string. */ + return (char *) ""; + + for (cnt = 0; m > 0ul; ++cnt) + { + result[cnt] = conv_table[m & 0x3f]; + m >>= 6; + } + result[cnt] = '\0'; + + return result; +} diff --git a/libc/stdlib/mktemp.c b/libc/stdlib/mktemp.c index 57f9398b3..f3af1c15c 100644 --- a/libc/stdlib/mktemp.c +++ b/libc/stdlib/mktemp.c @@ -21,13 +21,15 @@ #include "../misc/internals/tempname.h" /* Generate a unique temporary file name from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the filename unique. */ -char * mktemp (char *template) + * The last six characters of TEMPLATE must be "XXXXXX"; + * they are replaced with a string that makes the filename unique. */ +char *mktemp(char *template) { - if (__gen_tempname (template, __GT_NOCREATE) < 0) - /* We return the null string if we can't find a unique file name. */ - template[0] = '\0'; + if (__gen_tempname (template, __GT_NOCREATE) < 0) + /* We return the null string if we can't find a unique file name. */ + template[0] = '\0'; - return template; + return template; } + +link_warning(mktemp, "the use of `mktemp' is dangerous, better use `mkstemp'") |