X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fdir.c;h=dc56847b63e6b0fbc2b52ab241a85f04800061cc;hp=c4201c69271f193968ca5ee2276959c61b36d282;hb=47eeb5384a8fae8bcac8afb8a84782ca094683f9;hpb=35590968609f84a4ac4f4965c7b359cf06640491 diff --git a/index/dir.c b/index/dir.c index c4201c6..dc56847 100644 --- a/index/dir.c +++ b/index/dir.c @@ -1,107 +1,85 @@ -/* - * Copyright (C) 1994-1998, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: dir.c,v $ - * 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.31 2005-06-14 20:28:53 adam Exp $ + Copyright (C) 1995-2005 + 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 Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #include -#ifndef WINDOWS +#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); + yaz_log (YLOG_WARN|YLOG_ERRNO, "opendir %s", rep); if (errno != ENOENT && errno != EACCES) exit (1); return NULL; } - entry = xmalloc (sizeof(*entry) * entry_max); + entry = (struct dir_entry *) xmalloc (sizeof(*entry) * entry_max); strcpy (path, 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 || @@ -111,26 +89,36 @@ struct dir_entry *dir_open (const char *rep) { struct dir_entry *entry_n; - entry_n = xmalloc (sizeof(*entry) * (entry_max += 1000)); + entry_n = (struct dir_entry *) + xmalloc (sizeof(*entry) * (entry_max += 1000)); memcpy (entry_n, entry, idx * sizeof(*entry)); xfree (entry); 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: entry[idx].kind = dirs_file; entry[idx].mtime = finfo.st_mtime; - entry[idx].name = xmalloc (strlen(dent->d_name)+1); + entry[idx].name = (char *) xmalloc (strlen(dent->d_name)+1); strcpy (entry[idx].name, dent->d_name); idx++; break; case S_IFDIR: entry[idx].kind = dirs_dir; entry[idx].mtime = finfo.st_mtime; - entry[idx].name = xmalloc (strlen(dent->d_name)+2); + entry[idx].name = (char *) xmalloc (strlen(dent->d_name)+2); strcpy (entry[idx].name, dent->d_name); strcat (entry[idx].name, "/"); idx++; @@ -139,7 +127,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; }