Implement tsearch functions for systems that does not know about it.
authorRémi Duraffort <ivoire@videolan.org>
Mon, 6 Dec 2010 14:43:13 +0000 (15:43 +0100)
committerRémi Duraffort <ivoire@videolan.org>
Mon, 6 Dec 2010 16:45:29 +0000 (17:45 +0100)
compat/tdelete.c [new file with mode: 0644]
compat/tdestroy.c [new file with mode: 0644]
compat/tfind.c [new file with mode: 0644]
compat/tsearch.c [new file with mode: 0644]
compat/twalk.c [new file with mode: 0644]
configure.ac
include/vlc_fixups.h

diff --git a/compat/tdelete.c b/compat/tdelete.c
new file mode 100644 (file)
index 0000000..aacc63c
--- /dev/null
@@ -0,0 +1,68 @@
+/*     $NetBSD: tdelete.c,v 1.4 2006/03/19 01:12:08 christos 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.
+ */
+
+#define _SEARCH_PRIVATE
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/cdefs.h>
+#include <assert.h>
+#include <stdlib.h>
+
+/* delete node with given key */
+void *
+tdelete(vkey, vrootp, compar)
+       const void *vkey;       /* key to be deleted */
+       void      **vrootp;     /* address of the root of tree */
+       int       (*compar) __P((const void *, const void *));
+{
+       node_t **rootp = (node_t **)vrootp;
+       node_t *p, *q, *r;
+       int  cmp;
+
+       assert(vkey != NULL);
+       assert(compar != NULL);
+
+       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;
+               }
+       }
+       if (p != *rootp)
+               free(*rootp);                   /* D4: Free node */
+       *rootp = q;                             /* link parent to new node */
+       return p;
+}
diff --git a/compat/tdestroy.c b/compat/tdestroy.c
new file mode 100644 (file)
index 0000000..04a1acb
--- /dev/null
@@ -0,0 +1,46 @@
+/*     $NetBSD: tdestroy.c,v 1.2 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.
+ */
+
+#define _SEARCH_PRIVATE
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/cdefs.h>
+#include <assert.h>
+#include <stdlib.h>
+
+/* Walk the nodes of a tree */
+static void
+trecurse(node_t* root, void (*free_action)(void *))
+{
+  if (root->llink != NULL)
+    trecurse(root->llink, free_action);
+  if (root->rlink != NULL)
+    trecurse(root->rlink, free_action);
+
+  (*free_action) ((void *) root->key);
+  free(root);
+}
+
+void
+tdestroy(vrootp, freefct)
+       void *vrootp;
+       void (*freefct)(void *);
+{
+  node_t *root = (node_t *) vrootp;
+
+  if (root != NULL)
+    trecurse(root, freefct);
+}
diff --git a/compat/tfind.c b/compat/tfind.c
new file mode 100644 (file)
index 0000000..596051a
--- /dev/null
@@ -0,0 +1,49 @@
+/*     $NetBSD: tfind.c,v 1.5 2005/03/23 08:16:53 kleink 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.
+ */
+
+#define _SEARCH_PRIVATE
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/cdefs.h>
+#include <assert.h>
+#include <stdlib.h>
+
+/* find a node, or return 0 */
+void *
+tfind(vkey, vrootp, compar)
+       const void *vkey;               /* key to be found */
+       const void **vrootp;            /* address of the tree root */
+       int (*compar) __P((const void *, const void *));
+{
+       node_t * const *rootp = (node_t * const*)vrootp;
+
+       assert(vkey != NULL);
+       assert(compar != NULL);
+
+       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;
+}
diff --git a/compat/tsearch.c b/compat/tsearch.c
new file mode 100644 (file)
index 0000000..1bb24db
--- /dev/null
@@ -0,0 +1,58 @@
+/*     $NetBSD: tsearch.c,v 1.5 2005/11/29 03:12:00 christos 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.
+ */
+
+#define _SEARCH_PRIVATE
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/cdefs.h>
+#include <assert.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) __P((const void *, const void *));
+{
+       node_t *q;
+       node_t **rootp = (node_t **)vrootp;
+
+       assert(vkey != NULL);
+       assert(compar != NULL);
+
+       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 */
+               q->key = (void*)vkey;   /* initialize new node */
+               q->llink = q->rlink = NULL;
+       }
+       return q;
+}
diff --git a/compat/twalk.c b/compat/twalk.c
new file mode 100644 (file)
index 0000000..b18c207
--- /dev/null
@@ -0,0 +1,58 @@
+/*     $NetBSD: twalk.c,v 1.2 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.
+ */
+
+#define _SEARCH_PRIVATE
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/cdefs.h>
+#include <assert.h>
+#include <stdlib.h>
+
+static void trecurse __P((const node_t *,
+    void  (*action)(const void *, VISIT, int), int level));
+
+/* Walk the nodes of a tree */
+static void
+trecurse(root, action, level)
+       const node_t *root;     /* Root of the tree to be walked */
+       void (*action) __P((const void *, VISIT, int));
+       int level;
+{
+       assert(root != NULL);
+       assert(action != NULL);
+
+       if (root->llink == NULL && root->rlink == NULL)
+               (*action)(root, leaf, level);
+       else {
+               (*action)(root, preorder, level);
+               if (root->llink != NULL)
+                       trecurse(root->llink, action, level + 1);
+               (*action)(root, postorder, level);
+               if (root->rlink != NULL)
+                       trecurse(root->rlink, action, level + 1);
+               (*action)(root, endorder, level);
+       }
+}
+
+/* Walk the nodes of a tree */
+void
+twalk(vroot, action)
+       const void *vroot;      /* Root of the tree to be walked */
+       void (*action) __P((const void *, VISIT, int));
+{
+       if (vroot != NULL && action != NULL)
+               trecurse(vroot, action, 0);
+}
index 25b2ada..cf50be3 100644 (file)
@@ -546,8 +546,8 @@ dnl Check for system libs needed
 need_libc=false
 
 dnl Check for usual libc functions
-AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp tdestroy uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
+AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdelete tdestroy tfind tsearch twalk vasprintf])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
 ])
@@ -795,6 +795,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
   AC_MSG_RESULT(no)])
 
 dnl Check for headers
+AC_CHECK_HEADERS([search.h])
 AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
 AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h)
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
index 46da6ae..601cf3b 100644 (file)
@@ -240,8 +240,43 @@ struct pollfd
 int vlc_poll (struct pollfd *, unsigned, int);
 #endif
 
+#ifndef HAVE_SEARCH_H
+
+typedef struct entry {
+    char *key;
+    void *data;
+} ENTRY;
+
+typedef enum {
+    FIND, ENTER
+} ACTION;
+
+typedef enum {
+    preorder,
+    postorder,
+    endorder,
+    leaf
+} VISIT;
+
+#ifdef _SEARCH_PRIVATE
+typedef struct node {
+    char         *key;
+    struct node  *llink, *rlink;
+} node_t;
+#endif
+
+void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
+void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) );
+void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) );
+void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
+void tdestroy( void *root, void (*free_node)(void *nodep) );
+#endif
+
 #ifndef HAVE_TDESTROY
-# define tdestroy vlc_tdestroy
+// If search.h is not present we are already building tdestroy
+# ifdef HAVE_SEARCH_H
+#  define tdestroy vlc_tdestroy
+# endif
 #endif
 
 /* Random numbers */