X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=490ec72253fd0afa355285ef05d62ea0c4abb7ce;hb=9cf5dedda26c0ebaf38daa6fa3f15a763d6b2fcb;hp=bc88bfbc77e340671d7a508863012922e7d389d3;hpb=83762ea76e5af65ccb4407c6b38053bc6491a875;p=idzebra-moved-to-github.git

diff --git a/index/dir.c b/index/dir.c
index bc88bfb..490ec72 100644
--- a/index/dir.c
+++ b/index/dir.c
@@ -1,10 +1,29 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dir.c,v $
- * Revision 1.10  1995-11-20 11:56:22  adam
+ * 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.
+ *
+ * Revision 1.11  1995/11/20  16:59:44  adam
+ * New update method: the 'old' keys are saved for each records.
+ *
+ * Revision 1.10  1995/11/20  11:56:22  adam
  * Work on new traversal.
  *
  * Revision 1.9  1995/10/30  13:42:12  adam
@@ -45,9 +64,7 @@
 #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)
@@ -60,7 +77,7 @@ struct dir_entry *dir_open (const char *rep)
     size_t idx = 0;
     struct dir_entry *entry;
 
-    logf (LOG_LOG, "dir_open %s", rep);
+    logf (LOG_DEBUG, "dir_open %s", rep);
     if (!(dir = opendir(rep)))
     {
         logf (LOG_WARN|LOG_ERRNO, "opendir %s", rep);
@@ -83,26 +100,25 @@ struct dir_entry *dir_open (const char *rep)
         {
             struct dir_entry *entry_n;
 
-            entry_n = xmalloc (sizeof(*entry) * (entry_max + 1000));
+            entry_n = xmalloc (sizeof(*entry) * (entry_max += 1000));
             memcpy (entry_n, entry, idx * sizeof(*entry));
             xfree (entry);
             entry = entry_n;
-            entry_max += 100;
         }
         strcpy (path + pathpos, dent->d_name);
-        stat (path, &finfo);
+        lstat (path, &finfo);
         switch (finfo.st_mode & S_IFMT)
         {
         case S_IFREG:
             entry[idx].kind = dirs_file;
-            entry[idx].ctime = finfo.st_ctime;
+            entry[idx].mtime = finfo.st_mtime;
             entry[idx].name = 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].mtime = finfo.st_mtime;
             entry[idx].name = xmalloc (strlen(dent->d_name)+2);
             strcpy (entry[idx].name, dent->d_name);
 	    strcat (entry[idx].name, "/");
@@ -112,6 +128,7 @@ struct dir_entry *dir_open (const char *rep)
     }
     entry[idx].name = NULL;
     closedir (dir);
+    logf (LOG_DEBUG, "dir_close");
     return entry;
 }