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
Fixed bug #1142: Non-indexed but listed attributes issues diagnostic.
[idzebra-moved-to-github.git]
/
index
/
dir.c
diff --git
a/index/dir.c
b/index/dir.c
index
868740e
..
bddc4d5
100644
(file)
--- 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.35 2007-01-15 15:10:16 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-15,16
+15,16
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
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>
*/
#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>
@@
-66,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_DEBUG, "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);
@@
-127,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;
}
@@
-156,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
+ */
+