mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
move AVL routines into -llutil
update misc notices
This commit is contained in:
Kurt Zeilenga
parent
a6bc746900
commit
2c21fdcecb
29 changed files with 979 additions and 2164 deletions
9
INSTALL
9
INSTALL
|
|
@ -94,13 +94,14 @@ configuration directory (normally /usr/local/etc/openldap).
|
||||||
slapd.conf Standalone LDAP daemon
|
slapd.conf Standalone LDAP daemon
|
||||||
schema/*.schema Schema Definitions
|
schema/*.schema Schema Definitions
|
||||||
|
|
||||||
End of OpenLDAP INSTALL file.
|
---
|
||||||
|
|
||||||
$OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
|
$OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
|
||||||
17:09:26 kurt Exp $
|
17:09:26 kurt Exp $
|
||||||
|
|
||||||
Copyright 1998-2003 The OpenLDAP Foundation, Redwood City,
|
This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
California, USA. All rights reserved.
|
|
||||||
|
Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted only as authorized by the OpenLDAP
|
modification, are permitted only as authorized by the OpenLDAP
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
# Master Makefile for OpenLDAP
|
# Master Makefile for OpenLDAP
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
|
||||||
6
README
6
README
|
|
@ -26,8 +26,10 @@ Contributing
|
||||||
---
|
---
|
||||||
$OpenLDAP$
|
$OpenLDAP$
|
||||||
|
|
||||||
Copyright 1998-2003 The OpenLDAP Foundation, Redwood City,
|
This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
California, USA. All rights reserved.
|
|
||||||
|
Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted only as authorized by the OpenLDAP
|
modification, are permitted only as authorized by the OpenLDAP
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
/* Copyright 1998-2003 The OpenLDAP Foundation
|
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
*
|
||||||
|
* Copyright 1998-2003 The OpenLDAP Foundation
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
dnl OpenLDAP Autoconf Macros
|
dnl OpenLDAP Autoconf Macros
|
||||||
dnl $OpenLDAP$
|
dnl $OpenLDAP$
|
||||||
|
dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
dnl
|
dnl
|
||||||
dnl Copyright 1998-2003 The OpenLDAP Foundation.
|
dnl Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
# build.mak: nmake for MSVC builds
|
# build.mak: nmake for MSVC builds
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#! /bin/sh -
|
#! /bin/sh -
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
@ -9,6 +11,7 @@
|
||||||
## A copy of this license is available in the file LICENSE in the
|
## A copy of this license is available in the file LICENSE in the
|
||||||
## top-level directory of the distribution or, alternatively, at
|
## top-level directory of the distribution or, alternatively, at
|
||||||
## <http://www.OpenLDAP.org/license.html>.
|
## <http://www.OpenLDAP.org/license.html>.
|
||||||
|
|
||||||
cc_r -ME $* > /dev/null
|
cc_r -ME $* > /dev/null
|
||||||
cat *.u
|
cat *.u
|
||||||
rm *.u
|
rm *.u
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
:: $OpenLDAP$
|
:: $OpenLDAP$
|
||||||
|
:: This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
::
|
||||||
:: Copyright 1998-2003 The OpenLDAP Foundation.
|
:: Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
:: All rights reserved.
|
:: All rights reserved.
|
||||||
::
|
::
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
# Create a version.c file
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
@ -10,9 +13,7 @@
|
||||||
## A copy of this license is available in the file LICENSE in the
|
## A copy of this license is available in the file LICENSE in the
|
||||||
## top-level directory of the distribution or, alternatively, at
|
## top-level directory of the distribution or, alternatively, at
|
||||||
## <http://www.OpenLDAP.org/license.html>.
|
## <http://www.OpenLDAP.org/license.html>.
|
||||||
#
|
|
||||||
# Create a version.c file
|
|
||||||
#
|
|
||||||
PACKAGE=OpenLDAP
|
PACKAGE=OpenLDAP
|
||||||
VERSION=unknown
|
VERSION=unknown
|
||||||
SYMBOL=__Version
|
SYMBOL=__Version
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
dnl OpenLDAP Autoconf Macros
|
dnl OpenLDAP Autoconf Macros
|
||||||
dnl $OpenLDAP$
|
dnl $OpenLDAP$
|
||||||
|
dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
dnl
|
dnl
|
||||||
dnl Copyright 1998-2003 The OpenLDAP Foundation.
|
dnl Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,6 @@ LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
|
||||||
LDAP_LIBLDBM_A_no =
|
LDAP_LIBLDBM_A_no =
|
||||||
LDAP_LIBLDBM_A_yes = $(LDAP_LIBDIR)/libldbm/libldbm.a
|
LDAP_LIBLDBM_A_yes = $(LDAP_LIBDIR)/libldbm/libldbm.a
|
||||||
|
|
||||||
LDAP_LIBAVL_A = $(LDAP_LIBDIR)/libavl/libavl.a
|
|
||||||
LDAP_LIBLDBM_A = $(LDAP_LIBLDBM_A_@BUILD_LDBM@)
|
LDAP_LIBLDBM_A = $(LDAP_LIBLDBM_A_@BUILD_LDBM@)
|
||||||
LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a
|
LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a
|
||||||
LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a
|
LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a
|
||||||
|
|
@ -165,7 +164,7 @@ LDAP_L = $(LDAP_LIBLUTIL_A) \
|
||||||
$(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
|
$(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
|
||||||
SLURPD_L = $(LDAP_LIBLUTIL_A) \
|
SLURPD_L = $(LDAP_LIBLUTIL_A) \
|
||||||
$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||||||
SLAPD_L = $(LDAP_LIBAVL_A) $(LDAP_LIBLDBM_A) \
|
SLAPD_L = $(LDAP_LIBLDBM_A) \
|
||||||
$(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
|
$(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
|
||||||
$(SLURPD_L)
|
$(SLURPD_L)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
/*
|
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
*
|
||||||
* Copyright 1998-2003 The OpenLDAP Foundation.
|
* Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
@ -10,7 +12,7 @@
|
||||||
## A copy of this license is available in the file LICENSE in the
|
## A copy of this license is available in the file LICENSE in the
|
||||||
## top-level directory of the distribution or, alternatively, at
|
## top-level directory of the distribution or, alternatively, at
|
||||||
## <http://www.OpenLDAP.org/license.html>.
|
## <http://www.OpenLDAP.org/license.html>.
|
||||||
#
|
|
||||||
DIR=`dirname $0`
|
DIR=`dirname $0`
|
||||||
. $DIR/version.var
|
. $DIR/version.var
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
@ -10,7 +12,6 @@
|
||||||
## A copy of this license is available in the file LICENSE in the
|
## A copy of this license is available in the file LICENSE in the
|
||||||
## top-level directory of the distribution or, alternatively, at
|
## top-level directory of the distribution or, alternatively, at
|
||||||
## <http://www.OpenLDAP.org/license.html>.
|
## <http://www.OpenLDAP.org/license.html>.
|
||||||
#
|
|
||||||
ol_package=OpenLDAP
|
ol_package=OpenLDAP
|
||||||
ol_major=2
|
ol_major=2
|
||||||
ol_minor=X
|
ol_minor=X
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
dnl $OpenLDAP$
|
dnl $OpenLDAP$
|
||||||
|
dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
dnl
|
dnl
|
||||||
dnl Copyright 1998-2003 The OpenLDAP Foundation.
|
dnl Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
dnl All rights reserved.
|
dnl All rights reserved.
|
||||||
|
|
@ -20,6 +21,8 @@ define([AC_INIT_BINSH],
|
||||||
# $]OpenLDAP[$
|
# $]OpenLDAP[$
|
||||||
# from] translit([$OpenLDAP$], $")] [
|
# from] translit([$OpenLDAP$], $")] [
|
||||||
|
|
||||||
|
# This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
#
|
||||||
# Copyright 1998-2003 The OpenLDAP Foundation.
|
# Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
|
|
@ -2933,7 +2936,6 @@ clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
|
||||||
clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
|
clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
|
||||||
include/Makefile:build/top.mk:include/Makefile.in \
|
include/Makefile:build/top.mk:include/Makefile.in \
|
||||||
libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \
|
libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \
|
||||||
libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk \
|
|
||||||
libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
|
libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
|
||||||
libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
|
libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
|
||||||
libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk \
|
libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk \
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,18 @@
|
||||||
/* $OpenLDAP$ */
|
/* $OpenLDAP$ */
|
||||||
/*
|
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
* Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
|
*
|
||||||
|
* Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted only as authorized by the OpenLDAP
|
* modification, are permitted only as authorized by the OpenLDAP
|
||||||
* Public License. A copy of this license is available at
|
* Public License.
|
||||||
* http://www.OpenLDAP.org/license.html or in file LICENSE in the
|
*
|
||||||
* top-level directory of the distribution.
|
* A copy of this license is available in file LICENSE in the
|
||||||
|
* top-level directory of the distribution or, alternatively, at
|
||||||
|
* <http://www.OpenLDAP.org/license.html>.
|
||||||
*/
|
*/
|
||||||
/* Portions
|
/* Portions Copyright (c) 1990 Regents of the University of Michigan.
|
||||||
* Copyright (c) 1990 Regents of the University of Michigan.
|
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms are permitted
|
* Redistribution and use in source and binary forms are permitted
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
/* include/portable.h.in. Generated automatically from configure.in by autoheader. */
|
/* include/portable.h.in. Generated automatically from configure.in by autoheader. */
|
||||||
/* Copyright 1998-2003 The OpenLDAP Foundation
|
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
*
|
||||||
|
* Copyright 1998-2003 The OpenLDAP Foundation
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
# Libraries Makefile for OpenLDAP
|
# Libraries Makefile for OpenLDAP
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
@ -16,7 +18,6 @@ SUBDIRS= \
|
||||||
liblber \
|
liblber \
|
||||||
liblunicode \
|
liblunicode \
|
||||||
libldap libldap_r \
|
libldap libldap_r \
|
||||||
libavl \
|
|
||||||
libldbm \
|
libldbm \
|
||||||
librewrite
|
librewrite
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
# LIBAVL
|
|
||||||
# $OpenLDAP$
|
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
|
||||||
## All rights reserved.
|
|
||||||
##
|
|
||||||
## Redistribution and use in source and binary forms, with or without
|
|
||||||
## modification, are permitted only as authorized by the OpenLDAP
|
|
||||||
## Public License.
|
|
||||||
##
|
|
||||||
## A copy of this license is available in the file LICENSE in the
|
|
||||||
## top-level directory of the distribution or, alternatively, at
|
|
||||||
## <http://www.OpenLDAP.org/license.html>.
|
|
||||||
|
|
||||||
SRCS = avl.c testavl.c
|
|
||||||
XSRCS = version.c
|
|
||||||
OBJS = avl.o
|
|
||||||
|
|
||||||
LDAP_INCDIR= ../../include
|
|
||||||
LDAP_LIBDIR= ../../libraries
|
|
||||||
|
|
||||||
LIBRARY = libavl.a
|
|
||||||
PROGRAMS = testavl
|
|
||||||
XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
|
|
||||||
|
|
||||||
testavl: $(XLIBS) testavl.o
|
|
||||||
$(LTLINK) -o $@ testavl.o $(LIBS)
|
|
||||||
|
|
@ -1,774 +0,0 @@
|
||||||
/* avl.c - routines to implement an avl tree */
|
|
||||||
/* $OpenLDAP$ */
|
|
||||||
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
|
||||||
*
|
|
||||||
* Copyright 1998-2003 The OpenLDAP Foundation.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted only as authorized by the OpenLDAP
|
|
||||||
* Public License.
|
|
||||||
*
|
|
||||||
* A copy of this license is available in the file LICENSE in the
|
|
||||||
* top-level directory of the distribution or, alternatively, at
|
|
||||||
* <http://www.OpenLDAP.org/license.html>.
|
|
||||||
*/
|
|
||||||
/* Portions Copyright (c) 1993 Regents of the University of Michigan.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms are permitted
|
|
||||||
* provided that this notice is preserved and that due credit is given
|
|
||||||
* to the University of Michigan at Ann Arbor. The name of the University
|
|
||||||
* may not be used to endorse or promote products derived from this
|
|
||||||
* software without specific prior written permission. This software
|
|
||||||
* is provided ``as is'' without express or implied warranty.
|
|
||||||
*/
|
|
||||||
/* This work was originally developed by the University of Michigan
|
|
||||||
* (as part of U-MICH LDAP).
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "portable.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <ac/stdlib.h>
|
|
||||||
|
|
||||||
#ifdef CSRIMALLOC
|
|
||||||
#define ber_memalloc malloc
|
|
||||||
#define ber_memrealloc realloc
|
|
||||||
#define ber_memfree free
|
|
||||||
#else
|
|
||||||
#include "lber.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define AVL_INTERNAL
|
|
||||||
#include "avl.h"
|
|
||||||
|
|
||||||
#define ROTATERIGHT(x) { \
|
|
||||||
Avlnode *tmp;\
|
|
||||||
if ( *(x) == NULL || (*(x))->avl_left == NULL ) {\
|
|
||||||
(void) fputs("RR error\n", stderr); exit( EXIT_FAILURE ); \
|
|
||||||
}\
|
|
||||||
tmp = (*(x))->avl_left;\
|
|
||||||
(*(x))->avl_left = tmp->avl_right;\
|
|
||||||
tmp->avl_right = *(x);\
|
|
||||||
*(x) = tmp;\
|
|
||||||
}
|
|
||||||
#define ROTATELEFT(x) { \
|
|
||||||
Avlnode *tmp;\
|
|
||||||
if ( *(x) == NULL || (*(x))->avl_right == NULL ) {\
|
|
||||||
(void) fputs("RL error\n", stderr); exit( EXIT_FAILURE ); \
|
|
||||||
}\
|
|
||||||
tmp = (*(x))->avl_right;\
|
|
||||||
(*(x))->avl_right = tmp->avl_left;\
|
|
||||||
tmp->avl_left = *(x);\
|
|
||||||
*(x) = tmp;\
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ravl_insert - called from avl_insert() to do a recursive insert into
|
|
||||||
* and balance of an avl tree.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
ravl_insert(
|
|
||||||
Avlnode **iroot,
|
|
||||||
void* data,
|
|
||||||
int *taller,
|
|
||||||
AVL_CMP fcmp, /* comparison function */
|
|
||||||
AVL_DUP fdup, /* function to call for duplicates */
|
|
||||||
int depth
|
|
||||||
)
|
|
||||||
{
|
|
||||||
int rc, cmp, tallersub;
|
|
||||||
Avlnode *l, *r;
|
|
||||||
|
|
||||||
if ( *iroot == 0 ) {
|
|
||||||
if ( (*iroot = (Avlnode *) ber_memalloc( sizeof( Avlnode ) ))
|
|
||||||
== NULL ) {
|
|
||||||
return( -1 );
|
|
||||||
}
|
|
||||||
(*iroot)->avl_left = 0;
|
|
||||||
(*iroot)->avl_right = 0;
|
|
||||||
(*iroot)->avl_bf = 0;
|
|
||||||
(*iroot)->avl_data = data;
|
|
||||||
*taller = 1;
|
|
||||||
return( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
cmp = (*fcmp)( data, (*iroot)->avl_data );
|
|
||||||
|
|
||||||
/* equal - duplicate name */
|
|
||||||
if ( cmp == 0 ) {
|
|
||||||
*taller = 0;
|
|
||||||
return( (*fdup)( (*iroot)->avl_data, data ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* go right */
|
|
||||||
else if ( cmp > 0 ) {
|
|
||||||
rc = ravl_insert( &((*iroot)->avl_right), data, &tallersub,
|
|
||||||
fcmp, fdup, depth );
|
|
||||||
if ( tallersub )
|
|
||||||
switch ( (*iroot)->avl_bf ) {
|
|
||||||
case LH : /* left high - balance is restored */
|
|
||||||
(*iroot)->avl_bf = EH;
|
|
||||||
*taller = 0;
|
|
||||||
break;
|
|
||||||
case EH : /* equal height - now right heavy */
|
|
||||||
(*iroot)->avl_bf = RH;
|
|
||||||
*taller = 1;
|
|
||||||
break;
|
|
||||||
case RH : /* right heavy to start - right balance */
|
|
||||||
r = (*iroot)->avl_right;
|
|
||||||
switch ( r->avl_bf ) {
|
|
||||||
case LH : /* double rotation left */
|
|
||||||
l = r->avl_left;
|
|
||||||
switch ( l->avl_bf ) {
|
|
||||||
case LH : (*iroot)->avl_bf = EH;
|
|
||||||
r->avl_bf = RH;
|
|
||||||
break;
|
|
||||||
case EH : (*iroot)->avl_bf = EH;
|
|
||||||
r->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
case RH : (*iroot)->avl_bf = LH;
|
|
||||||
r->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
l->avl_bf = EH;
|
|
||||||
ROTATERIGHT( (&r) )
|
|
||||||
(*iroot)->avl_right = r;
|
|
||||||
ROTATELEFT( iroot )
|
|
||||||
*taller = 0;
|
|
||||||
break;
|
|
||||||
case EH : /* This should never happen */
|
|
||||||
break;
|
|
||||||
case RH : /* single rotation left */
|
|
||||||
(*iroot)->avl_bf = EH;
|
|
||||||
r->avl_bf = EH;
|
|
||||||
ROTATELEFT( iroot )
|
|
||||||
*taller = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
*taller = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* go left */
|
|
||||||
else {
|
|
||||||
rc = ravl_insert( &((*iroot)->avl_left), data, &tallersub,
|
|
||||||
fcmp, fdup, depth );
|
|
||||||
if ( tallersub )
|
|
||||||
switch ( (*iroot)->avl_bf ) {
|
|
||||||
case LH : /* left high to start - left balance */
|
|
||||||
l = (*iroot)->avl_left;
|
|
||||||
switch ( l->avl_bf ) {
|
|
||||||
case LH : /* single rotation right */
|
|
||||||
(*iroot)->avl_bf = EH;
|
|
||||||
l->avl_bf = EH;
|
|
||||||
ROTATERIGHT( iroot )
|
|
||||||
*taller = 0;
|
|
||||||
break;
|
|
||||||
case EH : /* this should never happen */
|
|
||||||
break;
|
|
||||||
case RH : /* double rotation right */
|
|
||||||
r = l->avl_right;
|
|
||||||
switch ( r->avl_bf ) {
|
|
||||||
case LH : (*iroot)->avl_bf = RH;
|
|
||||||
l->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
case EH : (*iroot)->avl_bf = EH;
|
|
||||||
l->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
case RH : (*iroot)->avl_bf = EH;
|
|
||||||
l->avl_bf = LH;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
r->avl_bf = EH;
|
|
||||||
ROTATELEFT( (&l) )
|
|
||||||
(*iroot)->avl_left = l;
|
|
||||||
ROTATERIGHT( iroot )
|
|
||||||
*taller = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case EH : /* equal height - now left heavy */
|
|
||||||
(*iroot)->avl_bf = LH;
|
|
||||||
*taller = 1;
|
|
||||||
break;
|
|
||||||
case RH : /* right high - balance is restored */
|
|
||||||
(*iroot)->avl_bf = EH;
|
|
||||||
*taller = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
*taller = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return( rc );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_insert -- insert a node containing data data into the avl tree
|
|
||||||
* with root root. fcmp is a function to call to compare the data portion
|
|
||||||
* of two nodes. it should take two arguments and return <, >, or == 0,
|
|
||||||
* depending on whether its first argument is <, >, or == its second
|
|
||||||
* argument (like strcmp, e.g.). fdup is a function to call when a duplicate
|
|
||||||
* node is inserted. it should return 0, or -1 and its return value
|
|
||||||
* will be the return value from avl_insert in the case of a duplicate node.
|
|
||||||
* the function will be called with the original node's data as its first
|
|
||||||
* argument and with the incoming duplicate node's data as its second
|
|
||||||
* argument. this could be used, for example, to keep a count with each
|
|
||||||
* node.
|
|
||||||
*
|
|
||||||
* NOTE: this routine may malloc memory
|
|
||||||
*/
|
|
||||||
|
|
||||||
int
|
|
||||||
avl_insert( Avlnode **root, void* data, AVL_CMP fcmp, AVL_DUP fdup )
|
|
||||||
{
|
|
||||||
int taller;
|
|
||||||
|
|
||||||
return( ravl_insert( root, data, &taller, fcmp, fdup, 0 ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* right_balance() - called from delete when root's right subtree has
|
|
||||||
* been shortened because of a deletion.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
right_balance( Avlnode **root )
|
|
||||||
{
|
|
||||||
int shorter = -1;
|
|
||||||
Avlnode *r, *l;
|
|
||||||
|
|
||||||
switch( (*root)->avl_bf ) {
|
|
||||||
case RH: /* was right high - equal now */
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
shorter = 1;
|
|
||||||
break;
|
|
||||||
case EH: /* was equal - left high now */
|
|
||||||
(*root)->avl_bf = LH;
|
|
||||||
shorter = 0;
|
|
||||||
break;
|
|
||||||
case LH: /* was right high - balance */
|
|
||||||
l = (*root)->avl_left;
|
|
||||||
switch ( l->avl_bf ) {
|
|
||||||
case RH : /* double rotation left */
|
|
||||||
r = l->avl_right;
|
|
||||||
switch ( r->avl_bf ) {
|
|
||||||
case RH :
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
l->avl_bf = LH;
|
|
||||||
break;
|
|
||||||
case EH :
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
l->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
case LH :
|
|
||||||
(*root)->avl_bf = RH;
|
|
||||||
l->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
r->avl_bf = EH;
|
|
||||||
ROTATELEFT( (&l) )
|
|
||||||
(*root)->avl_left = l;
|
|
||||||
ROTATERIGHT( root )
|
|
||||||
shorter = 1;
|
|
||||||
break;
|
|
||||||
case EH : /* right rotation */
|
|
||||||
(*root)->avl_bf = LH;
|
|
||||||
l->avl_bf = RH;
|
|
||||||
ROTATERIGHT( root );
|
|
||||||
shorter = 0;
|
|
||||||
break;
|
|
||||||
case LH : /* single rotation right */
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
l->avl_bf = EH;
|
|
||||||
ROTATERIGHT( root )
|
|
||||||
shorter = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return( shorter );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* left_balance() - called from delete when root's left subtree has
|
|
||||||
* been shortened because of a deletion.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static int
|
|
||||||
left_balance( Avlnode **root )
|
|
||||||
{
|
|
||||||
int shorter = -1;
|
|
||||||
Avlnode *r, *l;
|
|
||||||
|
|
||||||
switch( (*root)->avl_bf ) {
|
|
||||||
case LH: /* was left high - equal now */
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
shorter = 1;
|
|
||||||
break;
|
|
||||||
case EH: /* was equal - right high now */
|
|
||||||
(*root)->avl_bf = RH;
|
|
||||||
shorter = 0;
|
|
||||||
break;
|
|
||||||
case RH: /* was right high - balance */
|
|
||||||
r = (*root)->avl_right;
|
|
||||||
switch ( r->avl_bf ) {
|
|
||||||
case LH : /* double rotation left */
|
|
||||||
l = r->avl_left;
|
|
||||||
switch ( l->avl_bf ) {
|
|
||||||
case LH :
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
r->avl_bf = RH;
|
|
||||||
break;
|
|
||||||
case EH :
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
r->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
case RH :
|
|
||||||
(*root)->avl_bf = LH;
|
|
||||||
r->avl_bf = EH;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
l->avl_bf = EH;
|
|
||||||
ROTATERIGHT( (&r) )
|
|
||||||
(*root)->avl_right = r;
|
|
||||||
ROTATELEFT( root )
|
|
||||||
shorter = 1;
|
|
||||||
break;
|
|
||||||
case EH : /* single rotation left */
|
|
||||||
(*root)->avl_bf = RH;
|
|
||||||
r->avl_bf = LH;
|
|
||||||
ROTATELEFT( root );
|
|
||||||
shorter = 0;
|
|
||||||
break;
|
|
||||||
case RH : /* single rotation left */
|
|
||||||
(*root)->avl_bf = EH;
|
|
||||||
r->avl_bf = EH;
|
|
||||||
ROTATELEFT( root )
|
|
||||||
shorter = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return( shorter );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ravl_delete() - called from avl_delete to do recursive deletion of a
|
|
||||||
* node from an avl tree. It finds the node recursively, deletes it,
|
|
||||||
* and returns shorter if the tree is shorter after the deletion and
|
|
||||||
* rebalancing.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static void*
|
|
||||||
ravl_delete( Avlnode **root, void* data, AVL_CMP fcmp, int *shorter )
|
|
||||||
{
|
|
||||||
int shortersubtree = 0;
|
|
||||||
int cmp;
|
|
||||||
void* savedata;
|
|
||||||
Avlnode *minnode, *savenode;
|
|
||||||
|
|
||||||
if ( *root == NULLAVL )
|
|
||||||
return( 0 );
|
|
||||||
|
|
||||||
cmp = (*fcmp)( data, (*root)->avl_data );
|
|
||||||
|
|
||||||
/* found it! */
|
|
||||||
if ( cmp == 0 ) {
|
|
||||||
savenode = *root;
|
|
||||||
savedata = savenode->avl_data;
|
|
||||||
|
|
||||||
/* simple cases: no left child */
|
|
||||||
if ( (*root)->avl_left == 0 ) {
|
|
||||||
*root = (*root)->avl_right;
|
|
||||||
*shorter = 1;
|
|
||||||
ber_memfree( (char *) savenode );
|
|
||||||
return( savedata );
|
|
||||||
/* no right child */
|
|
||||||
} else if ( (*root)->avl_right == 0 ) {
|
|
||||||
*root = (*root)->avl_left;
|
|
||||||
*shorter = 1;
|
|
||||||
ber_memfree( (char *) savenode );
|
|
||||||
return( savedata );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_getmin will return to us the smallest node greater
|
|
||||||
* than the one we are trying to delete. deleting this node
|
|
||||||
* from the right subtree is guaranteed to end in one of the
|
|
||||||
* simple cases above.
|
|
||||||
*/
|
|
||||||
|
|
||||||
minnode = (*root)->avl_right;
|
|
||||||
while ( minnode->avl_left != NULLAVL )
|
|
||||||
minnode = minnode->avl_left;
|
|
||||||
|
|
||||||
/* swap the data */
|
|
||||||
(*root)->avl_data = minnode->avl_data;
|
|
||||||
minnode->avl_data = savedata;
|
|
||||||
|
|
||||||
savedata = ravl_delete( &(*root)->avl_right, data, fcmp,
|
|
||||||
&shortersubtree );
|
|
||||||
|
|
||||||
if ( shortersubtree )
|
|
||||||
*shorter = right_balance( root );
|
|
||||||
else
|
|
||||||
*shorter = 0;
|
|
||||||
/* go left */
|
|
||||||
} else if ( cmp < 0 ) {
|
|
||||||
if ( (savedata = ravl_delete( &(*root)->avl_left, data, fcmp,
|
|
||||||
&shortersubtree )) == 0 ) {
|
|
||||||
*shorter = 0;
|
|
||||||
return( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* left subtree shorter? */
|
|
||||||
if ( shortersubtree )
|
|
||||||
*shorter = left_balance( root );
|
|
||||||
else
|
|
||||||
*shorter = 0;
|
|
||||||
/* go right */
|
|
||||||
} else {
|
|
||||||
if ( (savedata = ravl_delete( &(*root)->avl_right, data, fcmp,
|
|
||||||
&shortersubtree )) == 0 ) {
|
|
||||||
*shorter = 0;
|
|
||||||
return( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( shortersubtree )
|
|
||||||
*shorter = right_balance( root );
|
|
||||||
else
|
|
||||||
*shorter = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return( savedata );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_delete() - deletes the node containing data (according to fcmp) from
|
|
||||||
* the avl tree rooted at root.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void*
|
|
||||||
avl_delete( Avlnode **root, void* data, AVL_CMP fcmp )
|
|
||||||
{
|
|
||||||
int shorter;
|
|
||||||
|
|
||||||
return( ravl_delete( root, data, fcmp, &shorter ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
avl_inapply( Avlnode *root, AVL_APPLY fn, void* arg, int stopflag )
|
|
||||||
{
|
|
||||||
if ( root == 0 )
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
|
|
||||||
if ( root->avl_left != 0 )
|
|
||||||
if ( avl_inapply( root->avl_left, fn, arg, stopflag )
|
|
||||||
== stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
if ( (*fn)( root->avl_data, arg ) == stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
if ( root->avl_right == 0 )
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
else
|
|
||||||
return( avl_inapply( root->avl_right, fn, arg, stopflag ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
avl_postapply( Avlnode *root, AVL_APPLY fn, void* arg, int stopflag )
|
|
||||||
{
|
|
||||||
if ( root == 0 )
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
|
|
||||||
if ( root->avl_left != 0 )
|
|
||||||
if ( avl_postapply( root->avl_left, fn, arg, stopflag )
|
|
||||||
== stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
if ( root->avl_right != 0 )
|
|
||||||
if ( avl_postapply( root->avl_right, fn, arg, stopflag )
|
|
||||||
== stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
return( (*fn)( root->avl_data, arg ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
avl_preapply( Avlnode *root, AVL_APPLY fn, void* arg, int stopflag )
|
|
||||||
{
|
|
||||||
if ( root == 0 )
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
|
|
||||||
if ( (*fn)( root->avl_data, arg ) == stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
if ( root->avl_left != 0 )
|
|
||||||
if ( avl_preapply( root->avl_left, fn, arg, stopflag )
|
|
||||||
== stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
if ( root->avl_right == 0 )
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
else
|
|
||||||
return( avl_preapply( root->avl_right, fn, arg, stopflag ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_apply -- avl tree root is traversed, function fn is called with
|
|
||||||
* arguments arg and the data portion of each node. if fn returns stopflag,
|
|
||||||
* the traversal is cut short, otherwise it continues. Do not use -6 as
|
|
||||||
* a stopflag, as this is what is used to indicate the traversal ran out
|
|
||||||
* of nodes.
|
|
||||||
*/
|
|
||||||
|
|
||||||
int
|
|
||||||
avl_apply( Avlnode *root, AVL_APPLY fn, void* arg, int stopflag, int type )
|
|
||||||
{
|
|
||||||
switch ( type ) {
|
|
||||||
case AVL_INORDER:
|
|
||||||
return( avl_inapply( root, fn, arg, stopflag ) );
|
|
||||||
case AVL_PREORDER:
|
|
||||||
return( avl_preapply( root, fn, arg, stopflag ) );
|
|
||||||
case AVL_POSTORDER:
|
|
||||||
return( avl_postapply( root, fn, arg, stopflag ) );
|
|
||||||
default:
|
|
||||||
fprintf( stderr, "Invalid traversal type %d\n", type );
|
|
||||||
return( -1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* NOTREACHED */
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_prefixapply - traverse avl tree root, applying function fprefix
|
|
||||||
* to any nodes that match. fcmp is called with data as its first arg
|
|
||||||
* and the current node's data as its second arg. it should return
|
|
||||||
* 0 if they match, < 0 if data is less, and > 0 if data is greater.
|
|
||||||
* the idea is to efficiently find all nodes that are prefixes of
|
|
||||||
* some key... Like avl_apply, this routine also takes a stopflag
|
|
||||||
* and will return prematurely if fmatch returns this value. Otherwise,
|
|
||||||
* AVL_NOMORE is returned.
|
|
||||||
*/
|
|
||||||
|
|
||||||
int
|
|
||||||
avl_prefixapply(
|
|
||||||
Avlnode *root,
|
|
||||||
void* data,
|
|
||||||
AVL_CMP fmatch,
|
|
||||||
void* marg,
|
|
||||||
AVL_CMP fcmp,
|
|
||||||
void* carg,
|
|
||||||
int stopflag
|
|
||||||
)
|
|
||||||
{
|
|
||||||
int cmp;
|
|
||||||
|
|
||||||
if ( root == 0 )
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
|
|
||||||
cmp = (*fcmp)( data, root->avl_data /* , carg */);
|
|
||||||
if ( cmp == 0 ) {
|
|
||||||
if ( (*fmatch)( root->avl_data, marg ) == stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
if ( root->avl_left != 0 )
|
|
||||||
if ( avl_prefixapply( root->avl_left, data, fmatch,
|
|
||||||
marg, fcmp, carg, stopflag ) == stopflag )
|
|
||||||
return( stopflag );
|
|
||||||
|
|
||||||
if ( root->avl_right != 0 )
|
|
||||||
return( avl_prefixapply( root->avl_right, data, fmatch,
|
|
||||||
marg, fcmp, carg, stopflag ) );
|
|
||||||
else
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
|
|
||||||
} else if ( cmp < 0 ) {
|
|
||||||
if ( root->avl_left != 0 )
|
|
||||||
return( avl_prefixapply( root->avl_left, data, fmatch,
|
|
||||||
marg, fcmp, carg, stopflag ) );
|
|
||||||
} else {
|
|
||||||
if ( root->avl_right != 0 )
|
|
||||||
return( avl_prefixapply( root->avl_right, data, fmatch,
|
|
||||||
marg, fcmp, carg, stopflag ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
return( AVL_NOMORE );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_free -- traverse avltree root, freeing the memory it is using.
|
|
||||||
* the dfree() is called to free the data portion of each node. The
|
|
||||||
* number of items actually freed is returned.
|
|
||||||
*/
|
|
||||||
|
|
||||||
int
|
|
||||||
avl_free( Avlnode *root, AVL_FREE dfree )
|
|
||||||
{
|
|
||||||
int nleft, nright;
|
|
||||||
|
|
||||||
if ( root == 0 )
|
|
||||||
return( 0 );
|
|
||||||
|
|
||||||
nleft = nright = 0;
|
|
||||||
if ( root->avl_left != 0 )
|
|
||||||
nleft = avl_free( root->avl_left, dfree );
|
|
||||||
|
|
||||||
if ( root->avl_right != 0 )
|
|
||||||
nright = avl_free( root->avl_right, dfree );
|
|
||||||
|
|
||||||
if ( dfree )
|
|
||||||
(*dfree)( root->avl_data );
|
|
||||||
ber_memfree( root );
|
|
||||||
|
|
||||||
return( nleft + nright + 1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_find -- search avltree root for a node with data data. the function
|
|
||||||
* cmp is used to compare things. it is called with data as its first arg
|
|
||||||
* and the current node data as its second. it should return 0 if they match,
|
|
||||||
* < 0 if arg1 is less than arg2 and > 0 if arg1 is greater than arg2.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void*
|
|
||||||
avl_find( Avlnode *root, const void* data, AVL_CMP fcmp )
|
|
||||||
{
|
|
||||||
int cmp;
|
|
||||||
|
|
||||||
while ( root != 0 && (cmp = (*fcmp)( data, root->avl_data )) != 0 ) {
|
|
||||||
if ( cmp < 0 )
|
|
||||||
root = root->avl_left;
|
|
||||||
else
|
|
||||||
root = root->avl_right;
|
|
||||||
}
|
|
||||||
|
|
||||||
return( root ? root->avl_data : 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_find_lin -- search avltree root linearly for a node with data data.
|
|
||||||
* the function cmp is used to compare things. it is called with data as its
|
|
||||||
* first arg and the current node data as its second. it should return 0 if
|
|
||||||
* they match, non-zero otherwise.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void*
|
|
||||||
avl_find_lin( Avlnode *root, const void* data, AVL_CMP fcmp )
|
|
||||||
{
|
|
||||||
void* res;
|
|
||||||
|
|
||||||
if ( root == 0 )
|
|
||||||
return( NULL );
|
|
||||||
|
|
||||||
if ( (*fcmp)( data, root->avl_data ) == 0 )
|
|
||||||
return( root->avl_data );
|
|
||||||
|
|
||||||
if ( root->avl_left != 0 )
|
|
||||||
if ( (res = avl_find_lin( root->avl_left, data, fcmp ))
|
|
||||||
!= NULL )
|
|
||||||
return( res );
|
|
||||||
|
|
||||||
if ( root->avl_right == 0 )
|
|
||||||
return( NULL );
|
|
||||||
else
|
|
||||||
return( avl_find_lin( root->avl_right, data, fcmp ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* NON-REENTRANT INTERFACE */
|
|
||||||
|
|
||||||
static void* *avl_list;
|
|
||||||
static int avl_maxlist;
|
|
||||||
static int avl_nextlist;
|
|
||||||
|
|
||||||
#define AVL_GRABSIZE 100
|
|
||||||
|
|
||||||
/* ARGSUSED */
|
|
||||||
static int
|
|
||||||
avl_buildlist( void* data, void* arg )
|
|
||||||
{
|
|
||||||
static int slots;
|
|
||||||
|
|
||||||
if ( avl_list == (void* *) 0 ) {
|
|
||||||
avl_list = (void* *) ber_memalloc(AVL_GRABSIZE * sizeof(void*));
|
|
||||||
slots = AVL_GRABSIZE;
|
|
||||||
avl_maxlist = 0;
|
|
||||||
} else if ( avl_maxlist == slots ) {
|
|
||||||
slots += AVL_GRABSIZE;
|
|
||||||
avl_list = (void* *) ber_memrealloc( (char *) avl_list,
|
|
||||||
(unsigned) slots * sizeof(void*));
|
|
||||||
}
|
|
||||||
|
|
||||||
avl_list[ avl_maxlist++ ] = data;
|
|
||||||
|
|
||||||
return( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* avl_getfirst() and avl_getnext() are provided as alternate tree
|
|
||||||
* traversal methods, to be used when a single function cannot be
|
|
||||||
* provided to be called with every node in the tree. avl_getfirst()
|
|
||||||
* traverses the tree and builds a linear list of all the nodes,
|
|
||||||
* returning the first node. avl_getnext() returns the next thing
|
|
||||||
* on the list built by avl_getfirst(). This means that avl_getfirst()
|
|
||||||
* can take a while, and that the tree should not be messed with while
|
|
||||||
* being traversed in this way, and that multiple traversals (even of
|
|
||||||
* different trees) cannot be active at once.
|
|
||||||
*/
|
|
||||||
|
|
||||||
void*
|
|
||||||
avl_getfirst( Avlnode *root )
|
|
||||||
{
|
|
||||||
if ( avl_list ) {
|
|
||||||
ber_memfree( (char *) avl_list);
|
|
||||||
avl_list = (void* *) 0;
|
|
||||||
}
|
|
||||||
avl_maxlist = 0;
|
|
||||||
avl_nextlist = 0;
|
|
||||||
|
|
||||||
if ( root == 0 )
|
|
||||||
return( 0 );
|
|
||||||
|
|
||||||
(void) avl_apply( root, avl_buildlist, (void*) 0, -1, AVL_INORDER );
|
|
||||||
|
|
||||||
return( avl_list[ avl_nextlist++ ] );
|
|
||||||
}
|
|
||||||
|
|
||||||
void*
|
|
||||||
avl_getnext( void )
|
|
||||||
{
|
|
||||||
if ( avl_list == 0 )
|
|
||||||
return( 0 );
|
|
||||||
|
|
||||||
if ( avl_nextlist == avl_maxlist ) {
|
|
||||||
ber_memfree( (void*) avl_list);
|
|
||||||
avl_list = (void* *) 0;
|
|
||||||
return( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
return( avl_list[ avl_nextlist++ ] );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* end non-reentrant code */
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
avl_dup_error( void* left, void* right )
|
|
||||||
{
|
|
||||||
return( -1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
avl_dup_ok( void* left, void* right )
|
|
||||||
{
|
|
||||||
return( 0 );
|
|
||||||
}
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
||||||
# Microsoft Developer Studio Project File - Name="libavl" - Package Owner=<4>
|
|
||||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
|
||||||
# ** DO NOT EDIT **
|
|
||||||
|
|
||||||
# TARGTYPE "Win32 (x86) Static Library" 0x0104
|
|
||||||
|
|
||||||
CFG=libavl - Win32 Single Debug
|
|
||||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
|
||||||
!MESSAGE use the Export Makefile command and run
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "libavl.mak".
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE You can specify a configuration when running NMAKE
|
|
||||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "libavl.mak" CFG="libavl - Win32 Single Debug"
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE Possible choices for configuration are:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE "libavl - Win32 Release" (based on "Win32 (x86) Static Library")
|
|
||||||
!MESSAGE "libavl - Win32 Debug" (based on "Win32 (x86) Static Library")
|
|
||||||
!MESSAGE "libavl - Win32 Single Debug" (based on "Win32 (x86) Static Library")
|
|
||||||
!MESSAGE "libavl - Win32 Single Release" (based on\
|
|
||||||
"Win32 (x86) Static Library")
|
|
||||||
!MESSAGE
|
|
||||||
|
|
||||||
# Begin Project
|
|
||||||
# PROP Scc_ProjName ""
|
|
||||||
# PROP Scc_LocalPath ""
|
|
||||||
CPP=cl.exe
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "libavl - Win32 Release"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "Release"
|
|
||||||
# PROP BASE Intermediate_Dir "Release"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "..\..\Release"
|
|
||||||
# PROP Intermediate_Dir "..\..\Release\libavl"
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LIB32=link.exe -lib
|
|
||||||
# ADD BASE LIB32 /nologo
|
|
||||||
# ADD LIB32 /nologo
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "libavl - Win32 Debug"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 1
|
|
||||||
# PROP BASE Output_Dir "Debug"
|
|
||||||
# PROP BASE Intermediate_Dir "Debug"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 1
|
|
||||||
# PROP Output_Dir "..\..\Debug"
|
|
||||||
# PROP Intermediate_Dir "..\..\Debug\libavl"
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LIB32=link.exe -lib
|
|
||||||
# ADD BASE LIB32 /nologo
|
|
||||||
# ADD LIB32 /nologo
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "libavl - Win32 Single Debug"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 1
|
|
||||||
# PROP BASE Output_Dir "libavl__"
|
|
||||||
# PROP BASE Intermediate_Dir "libavl__"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 1
|
|
||||||
# PROP Output_Dir "..\..\SDebug"
|
|
||||||
# PROP Intermediate_Dir "..\..\SDebug\libavl"
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LIB32=link.exe -lib
|
|
||||||
# ADD BASE LIB32 /nologo
|
|
||||||
# ADD LIB32 /nologo
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "libavl - Win32 Single Release"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "libavl_0"
|
|
||||||
# PROP BASE Intermediate_Dir "libavl_0"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "..\..\SRelease"
|
|
||||||
# PROP Intermediate_Dir "..\..\SRelease\libavl"
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
RSC=rc.exe
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LIB32=link.exe -lib
|
|
||||||
# ADD BASE LIB32 /nologo
|
|
||||||
# ADD LIB32 /nologo
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# Begin Target
|
|
||||||
|
|
||||||
# Name "libavl - Win32 Release"
|
|
||||||
# Name "libavl - Win32 Debug"
|
|
||||||
# Name "libavl - Win32 Single Debug"
|
|
||||||
# Name "libavl - Win32 Single Release"
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\avl.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\..\include\avl.h
|
|
||||||
# End Source File
|
|
||||||
# End Target
|
|
||||||
# End Project
|
|
||||||
|
|
@ -1,149 +0,0 @@
|
||||||
/* testavl.c - Test Tim Howes AVL code */
|
|
||||||
/* $OpenLDAP$ */
|
|
||||||
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
|
||||||
*
|
|
||||||
* Copyright 1998-2003 The OpenLDAP Foundation.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted only as authorized by the OpenLDAP
|
|
||||||
* Public License.
|
|
||||||
*
|
|
||||||
* A copy of this license is available in the file LICENSE in the
|
|
||||||
* top-level directory of the distribution or, alternatively, at
|
|
||||||
* <http://www.OpenLDAP.org/license.html>.
|
|
||||||
*/
|
|
||||||
/* Portions Copyright (c) 1993 Regents of the University of Michigan.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms are permitted
|
|
||||||
* provided that this notice is preserved and that due credit is given
|
|
||||||
* to the University of Michigan at Ann Arbor. The name of the University
|
|
||||||
* may not be used to endorse or promote products derived from this
|
|
||||||
* software without specific prior written permission. This software
|
|
||||||
* is provided ``as is'' without express or implied warranty.
|
|
||||||
*/
|
|
||||||
/* This work was originally developed by the University of Michigan
|
|
||||||
* (as part of U-MICH LDAP 3.3).
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "portable.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include <ac/stdlib.h>
|
|
||||||
#include <ac/string.h>
|
|
||||||
|
|
||||||
#define AVL_INTERNAL
|
|
||||||
#define AVL_NONREENTRANT
|
|
||||||
#include "avl.h"
|
|
||||||
|
|
||||||
static void ravl_print LDAP_P(( Avlnode *root, int depth ));
|
|
||||||
static void myprint LDAP_P(( Avlnode *root ));
|
|
||||||
static int avl_strcmp LDAP_P(( const void *s, const void *t ));
|
|
||||||
|
|
||||||
int
|
|
||||||
main( int argc, char **argv )
|
|
||||||
{
|
|
||||||
Avlnode *tree = NULL;
|
|
||||||
char command[ 10 ];
|
|
||||||
char name[ 80 ];
|
|
||||||
char *p;
|
|
||||||
|
|
||||||
printf( "> " );
|
|
||||||
while ( fgets( command, sizeof( command ), stdin ) != NULL ) {
|
|
||||||
switch( *command ) {
|
|
||||||
case 'n': /* new tree */
|
|
||||||
( void ) avl_free( tree, free );
|
|
||||||
tree = NULL;
|
|
||||||
break;
|
|
||||||
case 'p': /* print */
|
|
||||||
( void ) myprint( tree );
|
|
||||||
break;
|
|
||||||
case 't': /* traverse with first, next */
|
|
||||||
#ifdef AVL_NONREENTRANT
|
|
||||||
printf( "***\n" );
|
|
||||||
for ( p = (char * ) avl_getfirst( tree );
|
|
||||||
p != NULL;
|
|
||||||
p = (char *) avl_getnext())
|
|
||||||
printf( "%s\n", p );
|
|
||||||
printf( "***\n" );
|
|
||||||
#else
|
|
||||||
printf( "*** reentrant interface not implemented ***" );
|
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
case 'f': /* find */
|
|
||||||
printf( "data? " );
|
|
||||||
if ( fgets( name, sizeof( name ), stdin ) == NULL )
|
|
||||||
exit( EXIT_SUCCESS );
|
|
||||||
name[ strlen( name ) - 1 ] = '\0';
|
|
||||||
if ( (p = (char *) avl_find( tree, name, avl_strcmp ))
|
|
||||||
== NULL )
|
|
||||||
printf( "Not found.\n\n" );
|
|
||||||
else
|
|
||||||
printf( "%s\n\n", p );
|
|
||||||
break;
|
|
||||||
case 'i': /* insert */
|
|
||||||
printf( "data? " );
|
|
||||||
if ( fgets( name, sizeof( name ), stdin ) == NULL )
|
|
||||||
exit( EXIT_SUCCESS );
|
|
||||||
name[ strlen( name ) - 1 ] = '\0';
|
|
||||||
if ( avl_insert( &tree, strdup( name ), avl_strcmp,
|
|
||||||
avl_dup_error ) != 0 )
|
|
||||||
printf( "\nNot inserted!\n" );
|
|
||||||
break;
|
|
||||||
case 'd': /* delete */
|
|
||||||
printf( "data? " );
|
|
||||||
if ( fgets( name, sizeof( name ), stdin ) == NULL )
|
|
||||||
exit( EXIT_SUCCESS );
|
|
||||||
name[ strlen( name ) - 1 ] = '\0';
|
|
||||||
if ( avl_delete( &tree, name, avl_strcmp ) == NULL )
|
|
||||||
printf( "\nNot found!\n" );
|
|
||||||
break;
|
|
||||||
case 'q': /* quit */
|
|
||||||
exit( EXIT_SUCCESS );
|
|
||||||
break;
|
|
||||||
case '\n':
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
printf("Commands: insert, delete, print, new, quit\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
printf( "> " );
|
|
||||||
}
|
|
||||||
|
|
||||||
return( 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ravl_print( Avlnode *root, int depth )
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if ( root == 0 )
|
|
||||||
return;
|
|
||||||
|
|
||||||
ravl_print( root->avl_right, depth+1 );
|
|
||||||
|
|
||||||
for ( i = 0; i < depth; i++ )
|
|
||||||
printf( " " );
|
|
||||||
printf( "%s %d\n", (char *) root->avl_data, root->avl_bf );
|
|
||||||
|
|
||||||
ravl_print( root->avl_left, depth+1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
static void myprint( Avlnode *root )
|
|
||||||
{
|
|
||||||
printf( "********\n" );
|
|
||||||
|
|
||||||
if ( root == 0 )
|
|
||||||
printf( "\tNULL\n" );
|
|
||||||
else
|
|
||||||
ravl_print( root, 0 );
|
|
||||||
|
|
||||||
printf( "********\n" );
|
|
||||||
}
|
|
||||||
|
|
||||||
static int avl_strcmp( const void *s, const void *t )
|
|
||||||
{
|
|
||||||
return strcmp( s, t );
|
|
||||||
}
|
|
||||||
|
|
@ -1,143 +0,0 @@
|
||||||
# Microsoft Developer Studio Project File - Name="testavl" - Package Owner=<4>
|
|
||||||
# Microsoft Developer Studio Generated Build File, Format Version 5.00
|
|
||||||
# ** DO NOT EDIT **
|
|
||||||
|
|
||||||
# TARGTYPE "Win32 (x86) Console Application" 0x0103
|
|
||||||
|
|
||||||
CFG=testavl - Win32 Single Debug
|
|
||||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
|
||||||
!MESSAGE use the Export Makefile command and run
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "testavl.mak".
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE You can specify a configuration when running NMAKE
|
|
||||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "testavl.mak" CFG="testavl - Win32 Single Debug"
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE Possible choices for configuration are:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE "testavl - Win32 Release" (based on "Win32 (x86) Console Application")
|
|
||||||
!MESSAGE "testavl - Win32 Debug" (based on "Win32 (x86) Console Application")
|
|
||||||
!MESSAGE "testavl - Win32 Single Debug" (based on\
|
|
||||||
"Win32 (x86) Console Application")
|
|
||||||
!MESSAGE "testavl - Win32 Single Release" (based on\
|
|
||||||
"Win32 (x86) Console Application")
|
|
||||||
!MESSAGE
|
|
||||||
|
|
||||||
# Begin Project
|
|
||||||
# PROP Scc_ProjName ""
|
|
||||||
# PROP Scc_LocalPath ""
|
|
||||||
CPP=cl.exe
|
|
||||||
RSC=rc.exe
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "testavl - Win32 Release"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "Release"
|
|
||||||
# PROP BASE Intermediate_Dir "Release"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "..\..\Release"
|
|
||||||
# PROP Intermediate_Dir "..\..\Release\testavl"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
||||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
|
||||||
# ADD LINK32 /nologo /subsystem:console /machine:I386 /libpath:"..\..\Release"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "testavl - Win32 Debug"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 1
|
|
||||||
# PROP BASE Output_Dir "testavl_"
|
|
||||||
# PROP BASE Intermediate_Dir "testavl_"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 1
|
|
||||||
# PROP Output_Dir "..\..\Debug"
|
|
||||||
# PROP Intermediate_Dir "..\..\Debug\testavl"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
|
|
||||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
|
||||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
|
||||||
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "testavl - Win32 Single Debug"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 1
|
|
||||||
# PROP BASE Output_Dir "testavl_"
|
|
||||||
# PROP BASE Intermediate_Dir "testavl_"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 1
|
|
||||||
# PROP Output_Dir "..\..\SDebug"
|
|
||||||
# PROP Intermediate_Dir "..\..\SDebug\testavl"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
|
|
||||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
|
||||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
|
||||||
# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\SDebug"
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "testavl - Win32 Single Release"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "testavl0"
|
|
||||||
# PROP BASE Intermediate_Dir "testavl0"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "..\..\SRelease"
|
|
||||||
# PROP Intermediate_Dir "..\..\SRelease\testavl"
|
|
||||||
# PROP Ignore_Export_Lib 0
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
|
||||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
|
||||||
# ADD LINK32 /nologo /subsystem:console /machine:I386 /libpath:"..\..\SRelease"
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# Begin Target
|
|
||||||
|
|
||||||
# Name "testavl - Win32 Release"
|
|
||||||
# Name "testavl - Win32 Debug"
|
|
||||||
# Name "testavl - Win32 Single Debug"
|
|
||||||
# Name "testavl - Win32 Single Release"
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\testavl.c
|
|
||||||
# End Source File
|
|
||||||
# End Target
|
|
||||||
# End Project
|
|
||||||
|
|
@ -1,5 +1,7 @@
|
||||||
# Makefile for -llutil
|
# Makefile for -llutil
|
||||||
# $OpenLDAP$
|
# $OpenLDAP$
|
||||||
|
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
|
||||||
|
##
|
||||||
## Copyright 1998-2003 The OpenLDAP Foundation.
|
## Copyright 1998-2003 The OpenLDAP Foundation.
|
||||||
## All rights reserved.
|
## All rights reserved.
|
||||||
##
|
##
|
||||||
|
|
@ -12,6 +14,10 @@
|
||||||
## <http://www.OpenLDAP.org/license.html>.
|
## <http://www.OpenLDAP.org/license.html>.
|
||||||
|
|
||||||
LIBRARY = liblutil.a
|
LIBRARY = liblutil.a
|
||||||
|
PROGRAM = testavl
|
||||||
|
|
||||||
|
LDAP_INCDIR= ../../include
|
||||||
|
LDAP_LIBDIR= ../../libraries
|
||||||
|
|
||||||
NT_SRCS = ntservice.c
|
NT_SRCS = ntservice.c
|
||||||
NT_OBJS = ntservice.o slapdmsg.res
|
NT_OBJS = ntservice.o slapdmsg.res
|
||||||
|
|
@ -19,18 +25,21 @@ NT_OBJS = ntservice.o slapdmsg.res
|
||||||
UNIX_SRCS = detach.c
|
UNIX_SRCS = detach.c
|
||||||
UNIX_OBJS = detach.o
|
UNIX_OBJS = detach.o
|
||||||
|
|
||||||
|
XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA)
|
||||||
|
|
||||||
SRCS = base64.c csn.c entropy.c sasl.c signal.c hash.c passfile.c \
|
SRCS = base64.c csn.c entropy.c sasl.c signal.c hash.c passfile.c \
|
||||||
md5.c passwd.c sha1.c getpass.c lockf.c utils.c uuid.c sockpair.c \
|
md5.c passwd.c sha1.c getpass.c lockf.c utils.c uuid.c sockpair.c \
|
||||||
ldif.c fetch.c \
|
avl.c ldif.c fetch.c \
|
||||||
|
testavl.c \
|
||||||
@LIBSRCS@ $(@PLAT@_SRCS)
|
@LIBSRCS@ $(@PLAT@_SRCS)
|
||||||
|
|
||||||
OBJS = base64.o csn.o entropy.o sasl.o signal.o hash.o passfile.o \
|
OBJS = base64.o csn.o entropy.o sasl.o signal.o hash.o passfile.o \
|
||||||
md5.o passwd.o sha1.o getpass.o lockf.o utils.o uuid.o sockpair.o \
|
md5.o passwd.o sha1.o getpass.o lockf.o utils.o uuid.o sockpair.o \
|
||||||
ldif.o fetch.o \
|
avl.o ldif.o fetch.o \
|
||||||
@LIBOBJS@ $(@PLAT@_OBJS)
|
@LIBOBJS@ $(@PLAT@_OBJS)
|
||||||
|
|
||||||
LDAP_INCDIR= ../../include
|
testavl: $(XLIBS) testavl.o
|
||||||
LDAP_LIBDIR= ../../libraries
|
(LTLINK) -o $@ testavl.o $(LIBS)
|
||||||
|
|
||||||
# These rules are for a Mingw32 build, specifically.
|
# These rules are for a Mingw32 build, specifically.
|
||||||
# It's ok for them to be here because the clean rule is harmless, and
|
# It's ok for them to be here because the clean rule is harmless, and
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ LDAP_LIBDIR= ../../libraries
|
||||||
|
|
||||||
LIBRARY = librewrite.a
|
LIBRARY = librewrite.a
|
||||||
PROGRAMS = rewrite
|
PROGRAMS = rewrite
|
||||||
XLIBS = $(LIBRARY) $(LDAP_LIBAVL_A) $(LDAP_LIBLUTIL_A) \
|
XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \
|
||||||
$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
|
||||||
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
|
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
|
||||||
XXXLIBS = $(LTHREAD_LIBS)
|
XXXLIBS = $(LTHREAD_LIBS)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue