* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dir.c,v $
- * Revision 1.9 1995-10-30 13:42:12 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
*
*/
#include <stdio.h>
+#include <string.h>
#include <assert.h>
#include <unistd.h>
#include <dirent.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;
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;
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);