mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
6d52618b15
Thu Dec 19 23:28:33 1996 Ulrich Drepper <drepper@cygnus.com> * resolv/resolv.h: Update from BIND 4.9.5-P1. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/Banner: Update version number. Thu Dec 19 20:58:53 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dlfcn.h: Add extern "C" wrapper. * io/utime.h: Don't define NULL since this isn't allowed in POSIX. * io/sys/stat.h: Declare `lstat' only if __USE_BSD || __USE_XOPEN_EXTENDED. * locale/locale.h: Define NULL. * math/math.c: Don't include <errno.h> to define math errors. * stdlib/stdlib.h: Likewise. * posix/unistd.h: Don't declare environ. * posix/sys/utsname.h (struct utsname): Declare member domainname as __domainname is !__USE_GNU. * signal/signal.h: Declare size_t only if __USE_BSD || __USE_XOPEN_EXTENDED. * stdio/stdio.h: Don't declare cuserid when __USE_POSIX, but instead when __USE_XOPEN. * string/string.h: Define strndup only if __USE_GNU. * sysdeps/unix/sysv/linux/clock.c: New file. * sysdeps/unix/sysv/linux/timebits.h: Define CLOCKS_PER_SEC as 1000000 per X/Open standard. * features.h: Add code to recognize _POSIX_C_SOURCE value 199309. Define __USE_POSIX199309. * posix/unistd.h: Declare fdatasync only if __USE_POSIX199309. * time/time.c: Declare nanosleep only if __USE_POSIX199309. Patches by Rüdiger Helsch <rh@unifix.de>. * locale/locale.h: Add declaration of newlocale and freelocale. * new-malloc/Makefile (distibute): Add mtrace.awk. (dist-routines): Add mcheck and mtrace. (install-lib, non-lib.a): Define as libmcheck.a. * new-malloc/malloc.h: Add declaration of __malloc_initialized. * new-malloc/mcheck.c: New file. * new-malloc/mcheck.h: New file. * new-malloc/mtrace.c: New file. * new-malloc/mtrace.awk: New file. * posix/unistd.h: Correct prototype for usleep. * sysdeps/unix/bsd/usleep.c: De-ANSI-declfy. Correct return type. * sysdeps/unix/sysv/linux/usleep.c: Real implementation based on nanosleep. * signal/signal.h: Change protoype of __sigpause to take two arguments. Remove prototype for sigpause. Add two different macros named sigpause selected when __USE_BSD or __USE_XOPEN are defined. This is necessary since the old BSD definition of theis function collides with the X/Open definition. * sysdeps/posix/sigpause.c: Change function definition to also fit X/Open definition. * sysdeps/libm-i387/e_exp.S: Make sure stack is empty when the function is left. * sysdeps/libm-i387/e_expl.S: Likewise. Patch by HJ Lu. 1996-12-17 Paul Eggert <eggert@twinsun.com> * many, many files: Spelling corrections. * catgets/catgetsinfo.h (mmapped): Renamed from mmaped (in struct catalog_info.status). * mach/err_kern.sub (err_codes_unix), string/stratcliff.c (main): Fix spelling in message. * po/libc.pot: Fix spelling in message for `zic'; this anticipates a fix in the tzcode distribution. Wed Dec 18 15:48:02 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c: Implement ^ flag to cause output be converted to use upper case characters. * time/zic.c: Update from ADO tzcode1996n. Wed Dec 18 14:29:24 1996 Erik Naggum <erik@naggum.no> * time/strftime.c (add): Don't change global `i' until all is over. Define NULL is not already defined. Tue Dec 17 09:49:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/iovsprintf.c (_IO_vsprintf): Change `&sf' to `&sf._sbf._f' to avoid the need for a cast. * libio/iovsscanf.c (_IO_vsscanf): Likewise. * sunrpc/rpc/xdr.h: Add prototype for xdr_free.
220 lines
5.3 KiB
C
220 lines
5.3 KiB
C
/* Copyright (C) 1995, 1996 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 assumes that the first field in the node must be
|
|
the "key" field, which points to the datum. It is very tricky
|
|
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;
|
|
}
|
|
weak_alias (__tsearch, tsearch)
|
|
|
|
|
|
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;
|
|
}
|
|
weak_alias (__tfind, tfind)
|
|
|
|
|
|
/* 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;
|
|
}
|
|
weak_alias (__tdelete, tdelete)
|
|
|
|
|
|
/* 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);
|
|
}
|
|
weak_alias (__twalk, twalk)
|