diff options
author | Roland McGrath <roland@gnu.org> | 1995-09-17 20:23:15 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1995-09-17 20:23:15 +0000 |
commit | 60478656fad8d8a487e9bc52d025f69767c3262b (patch) | |
tree | 0ae0836023f1c2f80064e7611f91d19c482208d9 /misc/tsearch.c | |
parent | 9fd18b6c1b397e1af82a0b544f10f946c73864b6 (diff) | |
download | glibc-60478656fad8d8a487e9bc52d025f69767c3262b.tar glibc-60478656fad8d8a487e9bc52d025f69767c3262b.tar.gz glibc-60478656fad8d8a487e9bc52d025f69767c3262b.tar.bz2 glibc-60478656fad8d8a487e9bc52d025f69767c3262b.zip |
Sat Sep 16 17:47:19 1995 Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de>
* elf/elf.h (AT_GID): Fix typo: Read -> Real.
* misc/efgvt_r.c: New file. Reentrant version of [efg]cvt functions.
* misc/efgcvt.c: Rewrite to use reentrant functions.
* misc/hsearch_r.c: New file. Reentrant version of functions from
hsearch family.
* misc/hsearch.c, misc/tsearch.c: New files.
* misc/Makefile (routines): Add efgcvt_r, hsearch_r, hsearch, tsearch.
* posix/unistd.h (ttyname_r): Add prototype for new function.
* stdlib/drand48_r.c, stdlib/erand48_r.c, stdlib/jrand48_r.c,
stdlib/lrand48_r.c, stdlib/mrand48_r.c, stdlib/nrand48_r.c,
stdlib/seed48_r.c, stdlib/srand48_r.c, stdlib/lcong48_r.c,
stdlib/drand48-iter.c: New files implementing reentrant versions
of functions from drand48 family.
* stdlib/seed48.c, stdlib/drand48.c, stdlib/erand48.c,
stdlib/jrand48.c, stdlib/lrand48.c, stdlib/mrand48.c,
stdlib/nrand48.c, stdlib/srand48.c, stdlib/lcong48.c:
Rewrite to use reentrant versions.
* stdlib/a64l.c, stdlib/l64a.c: New files. Implement a64l()
and l64a() functions from SysV library.
* stdlib/Makefile (routines): Add drand48_r, erand48_r, lrand48_r,
nrand48_r, mrand48_r, jrand48_r, srand48_r, seed48_r, lcong48_r,
drand48-iter, a64l, l64a.
* stdlib/stdlib.h: Declare them.
* stdlib/random_r.c: New file. Reentrant version of functions
from random family.
* stdlib/stdlib.h: Declare them.
* stdlib/random.c: Rewrite to use reentrant functions.
* string/strerror_r.c: New file. Reentrant version.
* string/strerror.c: Change for new _strerror_internal form.
* string/Makefile (routines): Add strerror_r.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Set default
value of user_entry to `_start'.
Close AT_ENTRY case with `break'.
* sysdeps/generic/strstr.c: New and much faster implementation
by Stephen R. van den Berg.
* sysdeps/generic/_strerror.c: _strerror_internal now takes
three argument and has and explicit buffer length.
* sysdeps/mach/_strerror.c: Change for new interface with three
arguments.
* stdio/perror.c, stdio/vfprintf.c: Callers changed.
* sysdeps/mach/hurd/ttyname_r.c: New file. Reentrant version.
* sysdeps/posix/ttyname_r.c: New file. Reentrant version.
* sysdeps/stub/ttyname_r: New file. Define as dummy function.
* sysdeps/posix/utimes.c: Include <utime.h> for prototype.
(utimes): First parameter to utime must be file, not path.
* sysdeps/posix/sysconf.c (__sysconf): Test for CLK_TCK in case
_SC_CLK_TCK and return it when available.
Test for STREAM_MAX in case _SC_STREAM_MAX and return it when
available.
Add case for _SC_2_LOCALEDEF which is now available.
* posix/sys/types.h [__USE_SVID] (key_t): New type.
* sysvipc/Makefile, sysvipc/ftok.c, sysvipc/sys/ipc.h,
sysvipc/sys/msg.h, sysvipc/sys/sem.h, sysvipc/sys/shm.h,
sysdeps/stub/sys/msq_buf.h, sysdeps/stub/sys/sem_buf.h,
sysdeps/stub/sys/shm_buf.h, sysdeps/stub/sys/ipc_buf.h,
sysdeps/stub/semctl.c, sysdeps/stub/semget.c, sysdeps/stub/semop.c,
sysdeps/stub/shmat.c, sysdeps/stub/shmctl.c, sysdeps/stub/shmdt.c,
sysdeps/stub/shmget.c, sysdeps/stub/msgctl.c, sysdeps/stub/msgget.c,
sysdeps/stub/msgrcv.c, sysdeps/stub/msgsnd.c: New files.
Add implementation of System V IPC.
Diffstat (limited to 'misc/tsearch.c')
-rw-r--r-- | misc/tsearch.c | 215 |
1 files changed, 215 insertions, 0 deletions
diff --git a/misc/tsearch.c b/misc/tsearch.c new file mode 100644 index 0000000000..cb06b7d8c8 --- /dev/null +++ b/misc/tsearch.c @@ -0,0 +1,215 @@ +/* Copyright (C) 1995 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* Tree search generalized from Knuth (6.2.2) Algorithm T just like + the AT&T man page says. + + The node_t structure is for internal use only, lint doesn't grok it. + + Written by reading the System V Interface Definition, not the code. + + Totally public domain. */ +/*LINTLIBRARY*/ + +#include <stdlib.h> +#include <search.h> + +/* This routine is not very bad. It makes many assumptions about + the compiler. It assumpts that the first field in node must be + the "key" field, which points to the datum. It is a very trick + stuff. H.J. */ + +typedef struct node_t +{ + const void *key; + struct node_t *left; + struct node_t *right; +} +node; + +/* Prototype fpr local function. */ +static void trecurse __P ((const void *vroot, __action_fn_t action, int level)); + + +/* find or insert datum into search tree. +char *key; key to be located +node **rootp; address of tree root +int (*compar)(); ordering function +*/ +void * +tsearch (key, vrootp, compar) + const void *key; + void **vrootp; + __compar_fn_t compar; +{ + node *q; + node **rootp = (node **) vrootp; + + if (rootp == NULL) + return NULL; + + while (*rootp != NULL) /* Knuth's T1: */ + { + int r; + + r = (*compar) (key, (*rootp)->key); + if (r == 0) /* T2: */ + return *rootp; /* we found it! */ + rootp = (r < 0) + ? &(*rootp)->left /* T3: follow left branch */ + : &(*rootp)->right; /* T4: follow right branch */ + } + + q = (node *) malloc (sizeof (node)); /* T5: key not found */ + if (q != NULL) /* make new node */ + { + *rootp = q; /* link new node to old */ + q->key = key; /* initialize new node */ + q->left = q->right = NULL; + } + + return q; +} + + +void * +tfind (key, vrootp, compar) + const void *key; + const void **vrootp; + __compar_fn_t compar; +{ + node **rootp = (node **) vrootp; + + if (rootp == NULL) + return NULL; + + while (*rootp != NULL) /* Knuth's T1: */ + { + int r; + + r = (*compar)(key, (*rootp)->key); + if (r == 0) /* T2: */ + return *rootp; /* we found it! */ + + rootp = (r < 0) + ? &(*rootp)->left /* T3: follow left branch */ + : &(*rootp)->right; /* T4: follow right branch */ + } + return NULL; +} + + +/* delete node with given key +char *key; key to be deleted +node **rootp; address of the root of tree +int (*compar)(); comparison function +*/ +void * +tdelete (key, vrootp, compar) + const void *key; + void **vrootp; + __compar_fn_t compar; +{ + node *p; + node *q; + node *r; + int cmp; + node **rootp = (node **) vrootp; + + if (rootp == NULL || (p = *rootp) == NULL) + return NULL; + + while ((cmp = (*compar) (key, (*rootp)->key)) != 0) + { + p = *rootp; + rootp = (cmp < 0) + ? &(*rootp)->left /* follow left branch */ + : &(*rootp)->right; /* follow right branch */ + if (*rootp == NULL) + return NULL; /* key not found */ + } + + r = (*rootp)->right; /* D1: */ + q = (*rootp)->left; + if (q == NULL) /* Left NULL? */ + q = r; + else if (r != NULL) /* Right link is NULL? */ + { + if (r->left == NULL) /* D2: Find successor */ + { + r->left = q; + q = r; + } + else + { /* D3: Find (struct node_t *)0 link */ + for (q = r->left; q->left != NULL; q = r->left) + r = q; + r->left = q->right; + q->left = (*rootp)->left; + q->right = (*rootp)->right; + } + } + free ((struct node_t *) *rootp); /* D4: Free node */ + *rootp = q; /* link parent to new node */ + return p; +} + + +/* Walk the nodes of a tree +node *root; Root of the tree to be walked +void (*action)(); Function to be called at each node +int level; +*/ +static void +trecurse (vroot, action, level) + const void *vroot; + __action_fn_t action; + int level; +{ + node *root = (node *) vroot; + + if (root->left == NULL && root->right == NULL) + (*action) (root, leaf, level); + else + { + (*action) (root, preorder, level); + if (root->left != NULL) + trecurse (root->left, action, level + 1); + (*action) (root, postorder, level); + if (root->right != NULL) + trecurse (root->right, action, level + 1); + (*action) (root, endorder, level); + } +} + + +/* void twalk(root, action) Walk the nodes of a tree +node *root; Root of the tree to be walked +void (*action)(); Function to be called at each node +PTR +*/ +void +twalk (vroot, action) + const void *vroot; + __action_fn_t action; +{ + const node *root = (node *) vroot; + + if (root != NULL && action != NULL) + trecurse (root, action, 0); +} |