X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=44b22cb69c217322eca195b1f7dd543ac2346aff;hb=746f36f2b12f2a342dc0213cb03458359a493c8f;hp=412620eb6d545fc385b3313f49585841dc5d20e0;hpb=e752c2712240e5020ee737cbf1cb0f33b9a1ba28;p=idzebra-moved-to-github.git

diff --git a/index/dir.c b/index/dir.c
index 412620e..44b22cb 100644
--- a/index/dir.c
+++ b/index/dir.c
@@ -1,6 +1,6 @@
-/* $Id: dir.c,v 1.27 2002-10-30 12:58:21 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: dir.c,v 1.32 2006-04-04 00:09:00 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,7 +24,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#ifndef WIN32
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <direntz.h>
@@ -66,12 +66,10 @@ struct dir_entry *dir_open (const char *rep, const char *base,
         *full_rep = '\0';
     strcat (full_rep, rep);
 
-    logf (LOG_DEBUG, "dir_open %s", full_rep);
+    yaz_log (YLOG_DEBUG, "dir_open %s", full_rep);
     if (!(dir = opendir(full_rep)))
     {
-        logf (LOG_WARN|LOG_ERRNO, "opendir %s", rep);
-        if (errno != ENOENT && errno != EACCES)
-            exit (1);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "opendir %s", rep);
         return NULL;
     }
     entry = (struct dir_entry *) xmalloc (sizeof(*entry) * entry_max);
@@ -79,13 +77,7 @@ struct dir_entry *dir_open (const char *rep, const char *base,
     pathpos = strlen(path);
     if (!pathpos || path[pathpos-1] != '/')
         path[pathpos++] = '/';
-    while (
-#if _REENTRANT
-		    (readdir_r (dir, &dent_s, &dent) == 0 && dent)
-#else
-		    (dent = readdir (dir))
-#endif
-		    )
+    while ( (dent = readdir (dir)) )
     {
         struct stat finfo;
         if (strcmp (dent->d_name, ".") == 0 ||
@@ -133,7 +125,7 @@ struct dir_entry *dir_open (const char *rep, const char *base,
     }
     entry[idx].name = NULL;
     closedir (dir);
-    logf (LOG_DEBUG, "dir_close");
+    yaz_log (YLOG_DEBUG, "dir_close");
     return entry;
 }