Work on new traversal.

[idzebra-moved-to-github.git] / index / dir.c

diff --git a/index/dir.c b/index/dir.c
index a13c74c..bc88bfb 100644 (file)
--- a/index/dir.c
+++ b/index/dir.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dir.c,v $
- * Revision 1.7  1995-09-28 09:19:40  adam
+ * Revision 1.10  1995-11-20 11:56:22  adam
+ * Work on new traversal.
+ *
+ * Revision 1.9  1995/10/30  13:42:12  adam
+ * Added errno.h
+ *
+ * Revision 1.8  1995/10/10  13:59:23  adam
+ * Function rset_open changed its wflag parameter to general flags.
+ *
+ * Revision 1.7  1995/09/28  09:19:40  adam
  * xfree/xmalloc used everywhere.
  * Extract/retrieve method seems to work for text records.
  *
@@ -28,11 +37,13 @@
  *
  */
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 
@@ -42,8 +53,10 @@
 struct dir_entry *dir_open (const char *rep)
 {
     DIR *dir;
+    char path[256];
+    size_t pathpos;
     struct dirent *dent;
-    size_t entry_max = 50;
+    size_t entry_max = 500;
     size_t idx = 0;
     struct dir_entry *entry;
 
@@ -51,13 +64,18 @@ struct dir_entry *dir_open (const char *rep)
     if (!(dir = opendir(rep)))
     {
         logf (LOG_WARN|LOG_ERRNO, "opendir %s", rep);
-        if (errno != ENOENT)
+        if (errno != ENOENT && errno != EACCES)
             exit (1);
         return NULL;
     }
     entry = xmalloc (sizeof(*entry) * entry_max);
+    strcpy (path, rep);
+    pathpos = strlen(path);
+    if (!pathpos || path[pathpos-1] != '/')
+        path[pathpos++] = '/';
     while ((dent = readdir (dir)))
     {
+        struct stat finfo;
         if (strcmp (dent->d_name, ".") == 0 ||
             strcmp (dent->d_name, "..") == 0)
             continue;
@@ -65,15 +83,32 @@ struct dir_entry *dir_open (const char *rep)
         {
             struct dir_entry *entry_n;
 
-            entry_n = xmalloc (sizeof(*entry) * (entry_max + 400));
+            entry_n = xmalloc (sizeof(*entry) * (entry_max + 1000));
             memcpy (entry_n, entry, idx * sizeof(*entry));
             xfree (entry);
             entry = entry_n;
             entry_max += 100;
         }
-        entry[idx].name = xmalloc (strlen(dent->d_name)+1);
-        strcpy (entry[idx].name, dent->d_name);
-        idx++;
+        strcpy (path + pathpos, dent->d_name);
+        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);
+            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);
+            strcpy (entry[idx].name, dent->d_name);
+           strcat (entry[idx].name, "/");
+            idx++;
+            break;
+        }
     }
     entry[idx].name = NULL;
     closedir (dir);