/*
- * 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.9 1995-10-30 13:42:12 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
* Added errno.h
*
* Revision 1.8 1995/10/10 13:59:23 adam
*
*/
#include <stdio.h>
+#include <string.h>
#include <assert.h>
#include <unistd.h>
#include <dirent.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)
{
DIR *dir;
+ char path[256];
+ size_t pathpos;
struct dirent *dent;
size_t entry_max = 500;
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);
- 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;
{
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;
}
- entry[idx].name = xmalloc (strlen(dent->d_name)+1);
- strcpy (entry[idx].name, dent->d_name);
- idx++;
+ strcpy (path + pathpos, dent->d_name);
+ lstat (path, &finfo);
+ 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);
+ 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);
+ strcpy (entry[idx].name, dent->d_name);
+ strcat (entry[idx].name, "/");
+ idx++;
+ break;
+ }
}
entry[idx].name = NULL;
closedir (dir);
+ logf (LOG_DEBUG, "dir_close");
return entry;
}