X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=fecb46e452bfa9f10e7781987b083fe42d0fc1f7;hb=47ea1fc957c7b97bb30a26698f072109cae275e4;hp=4ed2885eb633d5c14afc4fe2182722f41c40e337;hpb=589b5761fb59634afc37909e62cb34ce56cbbb12;p=idzebra-moved-to-github.git

diff --git a/index/dir.c b/index/dir.c
index 4ed2885..fecb46e 100644
--- a/index/dir.c
+++ b/index/dir.c
@@ -1,10 +1,40 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dir.c,v $
- * Revision 1.12  1996-02-05 12:29:55  adam
+ * Revision 1.22  2002-04-04 20:50:36  adam
+ * Multi register works with record paths and data1 profile path
+ *
+ * Revision 1.21  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.20  1999/02/02 14:50:50  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.19  1998/11/03 10:16:11  adam
+ * Uses stat and not lstat so that file traversal follows symbolic links.
+ *
+ * Revision 1.18  1997/09/25 14:55:33  adam
+ * Windows port uses stat and not lstat.
+ *
+ * Revision 1.17  1997/09/09 13:38:06  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.16  1996/10/29 14:06:45  adam
+ * Include zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.15  1996/06/04 10:18:58  adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.14  1996/04/09  06:49:18  adam
+ * Traversal of directories doesn't follow symbolic links.
+ *
+ * Revision 1.13  1996/03/21 14:50:08  adam
+ * File update uses modify-time instead of change-time.
+ *
+ * Revision 1.12  1996/02/05  12:29:55  adam
  * Logging reduced a bit.
  * The remaining running time is estimated during register merge.
  *
@@ -46,36 +76,46 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#ifndef WIN32
 #include <unistd.h>
-#include <dirent.h>
+#endif
+#include <direntz.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <ctype.h>
 
-#include <alexutil.h>
 #include "index.h"
 
-struct dir_entry *dir_open (const char *rep)
+struct dir_entry *dir_open (const char *rep, const char *base)
 {
     DIR *dir;
-    char path[256];
+    char path[1024];
+    char full_rep[1024];
     size_t pathpos;
     struct dirent *dent;
     size_t entry_max = 500;
     size_t idx = 0;
     struct dir_entry *entry;
 
-    logf (LOG_DEBUG, "dir_open %s", rep);
-    if (!(dir = opendir(rep)))
+    if (base && !yaz_is_abspath(rep))
+    {
+        strcpy (full_rep, base);
+        strcat (full_rep, "/");
+    }
+    else
+        *full_rep = '\0';
+    strcat (full_rep, rep);
+
+    logf (LOG_LOG, "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);
         return NULL;
     }
-    entry = xmalloc (sizeof(*entry) * entry_max);
+    entry = (struct dir_entry *) xmalloc (sizeof(*entry) * entry_max);
     strcpy (path, rep);
     pathpos = strlen(path);
     if (!pathpos || path[pathpos-1] != '/')
@@ -90,26 +130,36 @@ struct dir_entry *dir_open (const char *rep)
         {
             struct dir_entry *entry_n;
 
-            entry_n = xmalloc (sizeof(*entry) * (entry_max += 1000));
+            entry_n = (struct dir_entry *)
+		xmalloc (sizeof(*entry) * (entry_max += 1000));
             memcpy (entry_n, entry, idx * sizeof(*entry));
             xfree (entry);
             entry = entry_n;
         }
         strcpy (path + pathpos, dent->d_name);
-        stat (path, &finfo);
+
+        if (base && !yaz_is_abspath (path))
+        {
+            strcpy (full_rep, base);
+            strcat (full_rep, "/");
+            strcat (full_rep, path);
+            stat (full_rep, &finfo);
+        }
+        else
+            stat (path, &finfo);
         switch (finfo.st_mode & S_IFMT)
         {
         case S_IFREG:
             entry[idx].kind = dirs_file;
-            entry[idx].ctime = finfo.st_ctime;
-            entry[idx].name = xmalloc (strlen(dent->d_name)+1);
+            entry[idx].mtime = finfo.st_mtime;
+            entry[idx].name = (char *) xmalloc (strlen(dent->d_name)+1);
             strcpy (entry[idx].name, dent->d_name);
             idx++;
             break;
         case S_IFDIR:
             entry[idx].kind = dirs_dir;
-            entry[idx].ctime = finfo.st_ctime;
-            entry[idx].name = xmalloc (strlen(dent->d_name)+2);
+            entry[idx].mtime = finfo.st_mtime;
+            entry[idx].name = (char *) xmalloc (strlen(dent->d_name)+2);
             strcpy (entry[idx].name, dent->d_name);
 	    strcat (entry[idx].name, "/");
             idx++;