-/* $Id: dir.c,v 1.25 2002-09-03 12:22:21 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: dir.c,v 1.35 2007-01-15 15:10:16 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
This file is part of the Zebra server.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#ifndef WIN32
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <direntz.h>
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);
- 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);
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 ||
}
entry[idx].name = NULL;
closedir (dir);
- logf (LOG_DEBUG, "dir_close");
+ yaz_log (YLOG_DEBUG, "dir_close");
return entry;
}
xfree (e);
*e_p = NULL;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+