projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Indexing system change. Introduced new index category type
[idzebra-moved-to-github.git]
/
index
/
dir.c
diff --git
a/index/dir.c
b/index/dir.c
index
420c4f3
..
eb468ae
100644
(file)
--- a/
index/dir.c
+++ b/
index/dir.c
@@
-1,6
+1,6
@@
-/* $Id: dir.c,v 1.24 2002-09-03 11:44:54 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: dir.c,v 1.33 2006-05-10 08:13:20 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-24,7
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#ifndef WIN32
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <direntz.h>
#include <unistd.h>
#endif
#include <direntz.h>
@@
-38,9
+38,11
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
int zebra_file_stat (const char *file_name, struct stat *buf,
int follow_links)
{
int zebra_file_stat (const char *file_name, struct stat *buf,
int follow_links)
{
- if (follow_links)
- return stat(file_name, buf);
- return lstat(file_name, buf);
+#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,
}
struct dir_entry *dir_open (const char *rep, const char *base,
@@
-50,7
+52,7
@@
struct dir_entry *dir_open (const char *rep, const char *base,
char path[1024];
char full_rep[1024];
size_t pathpos;
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;
size_t entry_max = 500;
size_t idx = 0;
struct dir_entry *entry;
@@
-64,12
+66,10
@@
struct dir_entry *dir_open (const char *rep, const char *base,
*full_rep = '\0';
strcat (full_rep, rep);
*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)))
{
if (!(dir = opendir(full_rep)))
{
- logf (LOG_WARN|LOG_ERRNO, "opendir %s", rep);
- if (errno != ENOENT && errno != EACCES)
- exit (1);
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "opendir %s", rep);
return NULL;
}
entry = (struct dir_entry *) xmalloc (sizeof(*entry) * entry_max);
return NULL;
}
entry = (struct dir_entry *) xmalloc (sizeof(*entry) * entry_max);
@@
-77,7
+77,7
@@
struct dir_entry *dir_open (const char *rep, const char *base,
pathpos = strlen(path);
if (!pathpos || path[pathpos-1] != '/')
path[pathpos++] = '/';
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 ||
{
struct stat finfo;
if (strcmp (dent->d_name, ".") == 0 ||
@@
-125,7
+125,7
@@
struct dir_entry *dir_open (const char *rep, const char *base,
}
entry[idx].name = NULL;
closedir (dir);
}
entry[idx].name = NULL;
closedir (dir);
- logf (LOG_DEBUG, "dir_close");
+ yaz_log (YLOG_DEBUG, "dir_close");
return entry;
}
return entry;
}
@@
-154,3
+154,11
@@
void dir_free (struct dir_entry **e_p)
xfree (e);
*e_p = NULL;
}
xfree (e);
*e_p = NULL;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+