Use dirent wrapper of YAZ (eequires YAZ 4.0.1)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4b1e445..74305a7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ libpazpar2_a_SOURCES = pazpar2_config.c pazpar2_config.h eventl.c eventl.h \
        settings.h settings.c sel_thread.c sel_thread.h getaddrinfo.c \
        charsets.c charsets.h \
        client.c client.h connection.c connection.h host.h parameters.h \
-       dirent.c direntz.h marcmap.c marcmap.h marchash.c marchash.h \
+       marcmap.c marcmap.h marchash.c marchash.h \
        jenkins_hash.c jenkins_hash.h normalize_record.c normalize_record.h \
        normalize_cache.c normalize_cache.h
 

diff --git a/src/dirent.c b/src/dirent.c
deleted file mode 100644 (file)
index 1349fae..0000000
--- a/src/dirent.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 Index Data
-
-Pazpar2 is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Pazpar2 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 General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-
-/* almost identical to dirent.c of Zebra. */
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <assert.h>
-#ifdef WIN32
-#include <io.h>
-#endif
-#include <string.h>
-#include <stdlib.h>
-
-#include "direntz.h"
-
-#ifdef WIN32
-
-struct DIR {
-    HANDLE handle;
-    WIN32_FIND_DATA find_data;
-    struct dirent entry;
-};
-
-DIR *opendir (const char *name)
-{
-    char fullName[MAX_PATH+1];
-    DIR *dd = malloc (sizeof(*dd));
-
-    if (!dd)
-        return NULL;
-    strcpy (fullName, name);
-    strcat (fullName, "\\*.*");
-    dd->handle = FindFirstFile(fullName, &dd->find_data);
-    return dd;
-}
-                                                          
-struct dirent *readdir (DIR *dd)
-{
-    if (dd->handle == INVALID_HANDLE_VALUE)
-        return NULL;
-    strcpy (dd->entry.d_name, dd->find_data.cFileName);
-    if (!FindNextFile(dd->handle, &dd->find_data))
-    {
-        FindClose (dd->handle);
-        dd->handle = INVALID_HANDLE_VALUE;
-    }
-    return &dd->entry;
-}
-
-void closedir(DIR *dd)
-{
-    if (dd->handle != INVALID_HANDLE_VALUE)
-        FindClose (dd->handle);
-    if (dd)
-        free (dd);
-}
-
-#endif
-
-/*
- * Local variables:
- * c-basic-offset: 4
- * c-file-style: "Stroustrup"
- * indent-tabs-mode: nil
- * End:
- * vim: shiftwidth=4 tabstop=8 expandtab
- */
-

diff --git a/src/direntz.h b/src/direntz.h
deleted file mode 100644 (file)
index 6b9574d..0000000
--- a/src/direntz.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $Id: direntz.h,v 1.14 2007-01-15 20:08:24 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
-
-Zebra is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-Zebra 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 General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-
-#ifdef WIN32
-/* make WIN32 version of dirent */
-#include <windows.h>
-
-#include <yaz/yconfig.h>
-
-YAZ_BEGIN_CDECL
-
-struct dirent {
-    char d_name[MAX_PATH];
-};
-
-typedef struct DIR DIR;
-
-DIR *opendir (const char *path);
-struct dirent *readdir (DIR *dd);
-void closedir (DIR *dd);
-
-YAZ_END_CDECL
-
-#else
-/* include UNIX version */
-#include <sys/types.h>
-#include <dirent.h>
-#endif
-
-/*
- * Local variables:
- * c-basic-offset: 4
- * c-file-style: "Stroustrup"
- * indent-tabs-mode: nil
- * End:
- * vim: shiftwidth=4 tabstop=8 expandtab
- */
-

diff --git a/src/settings.c b/src/settings.c
index 83441d5..57d3168 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include "direntz.h"
+#include <yaz/dirent.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 

diff --git a/win/makefile b/win/makefile
index a876cfa..068b65d 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -195,7 +195,6 @@ PAZPAR2_OBJS = \
    "$(OBJDIR)\getaddrinfo.obj" \
    "$(OBJDIR)\charsets.obj" \
    "$(OBJDIR)\client.obj" \
-   "$(OBJDIR)\dirent.obj" \
    "$(OBJDIR)\jenkins_hash.obj" \
    "$(OBJDIR)\marcmap.obj" \
    "$(OBJDIR)\marchash.obj" \