X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=35c64f10dd15489316c9b3f18ae7e37a8039e721;hb=ba572d8e1de44023f355c09c4250328aba0e9a47;hp=aae6066360d099ab649e9e40acc41988881aa349;hpb=db99c7ca72f89121e1c8d7d6b8f72f3c5b4533a1;p=idzebra-moved-to-github.git

diff --git a/index/dir.c b/index/dir.c
index aae6066..35c64f1 100644
--- a/index/dir.c
+++ b/index/dir.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dir.c,v $
- * Revision 1.18  1997-09-25 14:55:33  adam
+ * 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
@@ -64,7 +73,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
-#ifndef WINDOWS
+#ifndef WIN32
 #include <unistd.h>
 #endif
 #include <direntz.h>
@@ -93,7 +102,7 @@ struct dir_entry *dir_open (const char *rep)
             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] != '/')
@@ -108,30 +117,27 @@ 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);
-#ifdef WINDOWS
         stat (path, &finfo);
-#else
-        lstat (path, &finfo);
-#endif
         switch (finfo.st_mode & S_IFMT)
         {
         case S_IFREG:
             entry[idx].kind = dirs_file;
             entry[idx].mtime = finfo.st_mtime;
-            entry[idx].name = xmalloc (strlen(dent->d_name)+1);
+            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].mtime = finfo.st_mtime;
-            entry[idx].name = xmalloc (strlen(dent->d_name)+2);
+            entry[idx].name = (char *) xmalloc (strlen(dent->d_name)+2);
             strcpy (entry[idx].name, dent->d_name);
 	    strcat (entry[idx].name, "/");
             idx++;