X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=44b22cb69c217322eca195b1f7dd543ac2346aff;hb=bd58c091d65d69624f6851974ae989376823ca9f;hp=868740eae845cc67ea13e6411e583e2c33d7b752;hpb=f091b701a8326e533f4877e755ec561e109b47b9;p=idzebra-moved-to-github.git diff --git a/index/dir.c b/index/dir.c index 868740e..44b22cb 100644 --- a/index/dir.c +++ b/index/dir.c @@ -1,6 +1,6 @@ -/* $Id: dir.c,v 1.28 2003-01-13 22:37:12 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps +/* $Id: dir.c,v 1.32 2006-04-04 00:09:00 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -24,7 +24,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#ifndef WIN32 +#if HAVE_UNISTD_H #include #endif #include @@ -66,12 +66,10 @@ struct dir_entry *dir_open (const char *rep, const char *base, *full_rep = '\0'; strcat (full_rep, rep); - logf (LOG_DEBUG, "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); @@ -127,7 +125,7 @@ struct dir_entry *dir_open (const char *rep, const char *base, } entry[idx].name = NULL; closedir (dir); - logf (LOG_DEBUG, "dir_close"); + yaz_log (YLOG_DEBUG, "dir_close"); return entry; }