X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=41b7f1b0668f74fa193dd012169ce00728cd250a;hb=f00cbbbdc1df5478ce74c4a13efafc42257e4cc1;hp=db679d046afdc552123a73cee6ea6ccf2dbf1856;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/index/dir.c b/index/dir.c
index db679d0..41b7f1b 100644
--- a/index/dir.c
+++ b/index/dir.c
@@ -1,6 +1,6 @@
-/* $Id: dir.c,v 1.23 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: dir.c,v 1.30 2005-01-15 19:38:24 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -28,20 +28,31 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <unistd.h>
 #endif
 #include <direntz.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
 
 #include "index.h"
 
-struct dir_entry *dir_open (const char *rep, const char *base)
+
+int zebra_file_stat (const char *file_name, struct stat *buf,
+                     int follow_links)
+{
+#ifndef WIN32
+    if (!follow_links)
+        return lstat(file_name, buf);
+#endif
+    return stat(file_name, buf);
+}
+
+struct dir_entry *dir_open (const char *rep, const char *base,
+                            int follow_links)
 {
     DIR *dir;
     char path[1024];
     char full_rep[1024];
     size_t pathpos;
-    struct dirent *dent;
+    struct dirent dent_s, *dent = &dent_s;
     size_t entry_max = 500;
     size_t idx = 0;
     struct dir_entry *entry;
@@ -55,10 +66,10 @@ struct dir_entry *dir_open (const char *rep, const char *base)
         *full_rep = '\0';
     strcat (full_rep, rep);
 
-    logf (LOG_LOG, "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);
+        yaz_log (YLOG_WARN|YLOG_ERRNO, "opendir %s", rep);
         if (errno != ENOENT && errno != EACCES)
             exit (1);
         return NULL;
@@ -68,7 +79,7 @@ struct dir_entry *dir_open (const char *rep, const char *base)
     pathpos = strlen(path);
     if (!pathpos || path[pathpos-1] != '/')
         path[pathpos++] = '/';
-    while ((dent = readdir (dir)))
+    while ( (dent = readdir (dir)) )
     {
         struct stat finfo;
         if (strcmp (dent->d_name, ".") == 0 ||
@@ -91,10 +102,10 @@ struct dir_entry *dir_open (const char *rep, const char *base)
             strcpy (full_rep, base);
             strcat (full_rep, "/");
             strcat (full_rep, path);
-            stat (full_rep, &finfo);
+            zebra_file_stat (full_rep, &finfo, follow_links);
         }
         else
-            stat (path, &finfo);
+            zebra_file_stat (path, &finfo, follow_links);
         switch (finfo.st_mode & S_IFMT)
         {
         case S_IFREG:
@@ -116,7 +127,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;
 }