X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdir.c;h=9ecff0accdb892df53ddaf54277ec68fc94919cf;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=35c64f10dd15489316c9b3f18ae7e37a8039e721;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;p=idzebra-moved-to-github.git diff --git a/index/dir.c b/index/dir.c index 35c64f1..9ecff0a 100644 --- a/index/dir.c +++ b/index/dir.c @@ -1,105 +1,75 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: dir.c,v $ - * Revision 1.21 1999-05-26 07:49:13 adam - * C++ compilation. - * - * Revision 1.20 1999/02/02 14:50:50 adam - * Updated WIN32 code specific sections. Changed header. - * - * Revision 1.19 1998/11/03 10:16:11 adam - * Uses stat and not lstat so that file traversal follows symbolic links. - * - * Revision 1.18 1997/09/25 14:55:33 adam - * Windows port uses stat and not lstat. - * - * Revision 1.17 1997/09/09 13:38:06 adam - * Partial port to WIN95/NT. - * - * Revision 1.16 1996/10/29 14:06:45 adam - * Include zebrautl.h instead of alexutil.h. - * - * Revision 1.15 1996/06/04 10:18:58 adam - * Minor changes - removed include of ctype.h. - * - * Revision 1.14 1996/04/09 06:49:18 adam - * Traversal of directories doesn't follow symbolic links. - * - * Revision 1.13 1996/03/21 14:50:08 adam - * File update uses modify-time instead of change-time. - * - * Revision 1.12 1996/02/05 12:29:55 adam - * Logging reduced a bit. - * The remaining running time is estimated during register merge. - * - * Revision 1.11 1995/11/20 16:59:44 adam - * New update method: the 'old' keys are saved for each records. - * - * Revision 1.10 1995/11/20 11:56:22 adam - * Work on new traversal. - * - * Revision 1.9 1995/10/30 13:42:12 adam - * Added errno.h - * - * Revision 1.8 1995/10/10 13:59:23 adam - * Function rset_open changed its wflag parameter to general flags. - * - * Revision 1.7 1995/09/28 09:19:40 adam - * xfree/xmalloc used everywhere. - * Extract/retrieve method seems to work for text records. - * - * Revision 1.6 1995/09/08 14:52:26 adam - * Minor changes. Dictionary is lower case now. - * - * Revision 1.5 1995/09/06 16:11:16 adam - * Option: only one word key per file. - * - * Revision 1.4 1995/09/04 12:33:41 adam - * Various cleanup. YAZ util used instead. - * - * Revision 1.3 1995/09/01 14:06:35 adam - * Split of work into more files. - * - * Revision 1.2 1995/09/01 10:57:07 adam - * Minor changes. - * - * Revision 1.1 1995/09/01 10:34:51 adam - * Added dir.c - * - */ +/* $Id: dir.c,v 1.34 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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 +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + #include #include #include -#ifndef WIN32 +#if HAVE_UNISTD_H #include #endif #include -#include #include #include #include #include "index.h" -struct dir_entry *dir_open (const char *rep) + +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[256]; + 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; - logf (LOG_DEBUG, "dir_open %s", rep); - if (!(dir = opendir(rep))) + if (base && !yaz_is_abspath(rep)) + { + strcpy (full_rep, base); + strcat (full_rep, "/"); + } + else + *full_rep = '\0'; + strcat (full_rep, 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); @@ -107,7 +77,7 @@ struct dir_entry *dir_open (const char *rep) 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 || @@ -124,7 +94,16 @@ struct dir_entry *dir_open (const char *rep) entry = entry_n; } strcpy (path + pathpos, dent->d_name); - stat (path, &finfo); + + if (base && !yaz_is_abspath (path)) + { + strcpy (full_rep, base); + strcat (full_rep, "/"); + strcat (full_rep, path); + zebra_file_stat (full_rep, &finfo, follow_links); + } + else + zebra_file_stat (path, &finfo, follow_links); switch (finfo.st_mode & S_IFMT) { case S_IFREG: @@ -146,7 +125,7 @@ struct dir_entry *dir_open (const char *rep) } entry[idx].name = NULL; closedir (dir); - logf (LOG_DEBUG, "dir_close"); + yaz_log (YLOG_DEBUG, "dir_close"); return entry; } @@ -175,3 +154,11 @@ void dir_free (struct dir_entry **e_p) xfree (e); *e_p = NULL; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +