[GNUnet-SVN] r24853 - libmicrohttpd/src/daemon

[gnunet]

Author: grothoff
Date: 2012-11-08 22:28:35 +0100 (Thu, 08 Nov 2012)
New Revision: 24853

Added:
   libmicrohttpd/src/daemon/tsearch.c
   libmicrohttpd/src/daemon/tsearch.h
Modified:
   libmicrohttpd/src/daemon/Makefile.am
   libmicrohttpd/src/daemon/daemon.c
Log:
-include tsearch.h only where needed, use local version if OS does not support 
it

Modified: libmicrohttpd/src/daemon/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/Makefile.am        2012-11-08 21:26:41 UTC (rev 
24852)
+++ libmicrohttpd/src/daemon/Makefile.am        2012-11-08 21:28:35 UTC (rev 
24853)
@@ -29,6 +29,11 @@
   AM_CFLAGS = --coverage
 endif
 
+if !HAVE_TSEARCH
+libmicrohttpd_la_SOURCES += \
+  tsearch.c tsearch.h
+endif
+
 if HAVE_POSTPROCESSOR
 libmicrohttpd_la_SOURCES += \
   postprocessor.c

Modified: libmicrohttpd/src/daemon/daemon.c
===================================================================
--- libmicrohttpd/src/daemon/daemon.c   2012-11-08 21:26:41 UTC (rev 24852)
+++ libmicrohttpd/src/daemon/daemon.c   2012-11-08 21:28:35 UTC (rev 24853)
@@ -31,6 +31,12 @@
 #include "memorypool.h"
 #include <limits.h>
 
+#if HAVE_SEARCH_H
+#include <search.h>
+#else
+#include "tsearch.h"
+#endif
+
 #if HTTPS_SUPPORT
 #include "connection_https.h"
 #include <gnutls/gnutls.h>

Added: libmicrohttpd/src/daemon/tsearch.c
===================================================================
--- libmicrohttpd/src/daemon/tsearch.c                          (rev 0)
+++ libmicrohttpd/src/daemon/tsearch.c  2012-11-08 21:28:35 UTC (rev 24853)
@@ -0,0 +1,123 @@
+/*     $NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $        */
+
+/*
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+#define _SEARCH_PRIVATE
+#include <tsearch.h>
+#include <stdlib.h>
+
+/* find or insert datum into search tree */
+void *
+tsearch(vkey, vrootp, compar)
+       const void *vkey;               /* key to be located */
+       void **vrootp;                  /* address of tree root */
+       int (*compar)(const void *, const void *);
+{
+       node_t *q;
+       node_t **rootp = (node_t **)vrootp;
+
+       if (rootp == NULL)
+               return NULL;
+
+       while (*rootp != NULL) {        /* Knuth's T1: */
+               int r;
+
+               if ((r = (*compar)(vkey, (*rootp)->key)) == 0)  /* T2: */
+                       return *rootp;          /* we found it! */
+
+               rootp = (r < 0) ?
+                   &(*rootp)->llink :          /* T3: follow left branch */
+                   &(*rootp)->rlink;           /* T4: follow right branch */
+       }
+
+       q = malloc(sizeof(node_t));             /* T5: key not found */
+       if (q != 0) {                           /* make new node */
+               *rootp = q;                     /* link new node to old */
+               /* LINTED const castaway ok */
+               q->key = (void *)vkey;          /* initialize new node */
+               q->llink = q->rlink = NULL;
+       }
+       return q;
+}
+
+/* find a node, or return 0 */
+void *
+tfind(vkey, vrootp, compar)
+       const void *vkey;               /* key to be found */
+       void * const *vrootp;           /* address of the tree root */
+       int (*compar)(const void *, const void *);
+{
+       node_t **rootp = (node_t **)vrootp;
+
+       if (rootp == NULL)
+               return NULL;
+
+       while (*rootp != NULL) {                /* T1: */
+               int r;
+
+               if ((r = (*compar)(vkey, (*rootp)->key)) == 0)  /* T2: */
+                       return *rootp;          /* key found */
+               rootp = (r < 0) ?
+                   &(*rootp)->llink :          /* T3: follow left branch */
+                   &(*rootp)->rlink;           /* T4: follow right branch */
+       }
+       return NULL;
+}
+
+/*
+ * delete node with given key
+ *
+ * vkey:   key to be deleted
+ * vrootp: address of the root of the tree
+ * compar: function to carry out node comparisons
+ */
+void *
+tdelete(const void * __restrict vkey, void ** __restrict vrootp,
+    int (*compar)(const void *, const void *))
+{
+       node_t **rootp = (node_t **)vrootp;
+       node_t *p, *q, *r;
+       int cmp;
+
+       if (rootp == NULL || (p = *rootp) == NULL)
+               return NULL;
+
+       while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0) {
+               p = *rootp;
+               rootp = (cmp < 0) ?
+                   &(*rootp)->llink :          /* follow llink branch */
+                   &(*rootp)->rlink;           /* follow rlink branch */
+               if (*rootp == NULL)
+                       return NULL;            /* key not found */
+       }
+       r = (*rootp)->rlink;                    /* D1: */
+       if ((q = (*rootp)->llink) == NULL)      /* Left NULL? */
+               q = r;
+       else if (r != NULL) {                   /* Right link is NULL? */
+               if (r->llink == NULL) {         /* D2: Find successor */
+                       r->llink = q;
+                       q = r;
+               } else {                        /* D3: Find NULL link */
+                       for (q = r->llink; q->llink != NULL; q = r->llink)
+                               r = q;
+                       r->llink = q->rlink;
+                       q->llink = (*rootp)->llink;
+                       q->rlink = (*rootp)->rlink;
+               }
+       }
+       free(*rootp);                           /* D4: Free node */
+       *rootp = q;                             /* link parent to new node */
+       return p;
+}
+
+/* end of tsearch.c */

Added: libmicrohttpd/src/daemon/tsearch.h
===================================================================
--- libmicrohttpd/src/daemon/tsearch.h                          (rev 0)
+++ libmicrohttpd/src/daemon/tsearch.h  2012-11-08 21:28:35 UTC (rev 24853)
@@ -0,0 +1,39 @@
+/*-
+ * Written by J.T. Conklin <address@hidden>
+ * Public domain.
+ *
+ *     $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $
+ * $FreeBSD: release/9.0.0/include/search.h 105250 2002-10-16 14:29:23Z robert 
$
+ */
+
+#ifndef _SEARCH_H_
+#define _SEARCH_H_
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+typedef        enum {
+       preorder,
+       postorder,
+       endorder,
+       leaf
+} VISIT;
+
+#ifdef _SEARCH_PRIVATE
+typedef        struct node {
+       char         *key;
+       struct node  *llink, *rlink;
+} node_t;
+#endif
+
+__BEGIN_DECLS
+void   *tdelete(const void * __restrict, void ** __restrict,
+           int (*)(const void *, const void *));
+void   *tfind(const void *, void * const *,
+           int (*)(const void *, const void *));
+void   *tsearch(const void *, void **, int (*)(const void *, const void *));
+void    twalk(const void *, void (*)(const void *, VISIT, int));
+void    tdestroy(void *, void (*)(void *));
+__END_DECLS
+
+#endif /* !_SEARCH_H_ */