-/* $Id: dir.c,v 1.23 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: dir.c,v 1.30 2005-01-15 19:38:24 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <unistd.h>
#endif
#include <direntz.h>
-#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
#include "index.h"
-struct dir_entry *dir_open (const char *rep, const char *base)
+
+int zebra_file_stat (const char *file_name, struct stat *buf,
+ int follow_links)
+{
+#ifndef WIN32
+ if (!follow_links)
+ return lstat(file_name, buf);
+#endif
+ return stat(file_name, buf);
+}
+
+struct dir_entry *dir_open (const char *rep, const char *base,
+ int follow_links)
{
DIR *dir;
char path[1024];
char full_rep[1024];
size_t pathpos;
- struct dirent *dent;
+ struct dirent dent_s, *dent = &dent_s;
size_t entry_max = 500;
size_t idx = 0;
struct dir_entry *entry;
*full_rep = '\0';
strcat (full_rep, rep);
- logf (LOG_LOG, "dir_open %s", full_rep);
+ yaz_log (YLOG_DEBUG, "dir_open %s", full_rep);
if (!(dir = opendir(full_rep)))
{
- logf (LOG_WARN|LOG_ERRNO, "opendir %s", rep);
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "opendir %s", rep);
if (errno != ENOENT && errno != EACCES)
exit (1);
return NULL;
pathpos = strlen(path);
if (!pathpos || path[pathpos-1] != '/')
path[pathpos++] = '/';
- while ((dent = readdir (dir)))
+ while ( (dent = readdir (dir)) )
{
struct stat finfo;
if (strcmp (dent->d_name, ".") == 0 ||
strcpy (full_rep, base);
strcat (full_rep, "/");
strcat (full_rep, path);
- stat (full_rep, &finfo);
+ zebra_file_stat (full_rep, &finfo, follow_links);
}
else
- stat (path, &finfo);
+ zebra_file_stat (path, &finfo, follow_links);
switch (finfo.st_mode & S_IFMT)
{
case S_IFREG:
}
entry[idx].name = NULL;
closedir (dir);
- logf (LOG_DEBUG, "dir_close");
+ yaz_log (YLOG_DEBUG, "dir_close");
return entry;
}