X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=util%2Ftstres.c;h=61f5dab0bdc001bdec0f3e6a2c29bcca9e343203;hp=0de5fee263274385658bfe976b6d4bbf3c6da116;hb=6c5467571389a21c91196ce1608945633c1cf92a;hpb=c2e103625a6fd9a65739125a95784c8fdc841c8b diff --git a/util/tstres.c b/util/tstres.c index 0de5fee..61f5dab 100644 --- a/util/tstres.c +++ b/util/tstres.c @@ -1,8 +1,5 @@ -/* $Id: tstres.c,v 1.3 2007-08-31 21:12:51 mike Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data 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 @@ -20,9 +17,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include +#include #include #include +#include + +/* use env srcdir as base directory - or current directory if unset */ +const char *get_srcdir(void) +{ + const char *srcdir = getenv("srcdir"); + if (!srcdir || ! *srcdir) + srcdir="."; + return srcdir; + +} + static void tst_res_open(void) { @@ -49,7 +62,11 @@ static void tst_res_read_file(void) if (res) { const char *v; - int r = res_read_file(res, "tstres.cfg"); + char path[1024]; + int r; + + yaz_snprintf(path, sizeof(path), "%s/tstres.cfg", get_srcdir()); + r = res_read_file(res, path); YAZ_CHECK_EQ(r, ZEBRA_OK); v = res_get_def(res, "register", "none"); @@ -78,6 +95,7 @@ int main (int argc, char **argv) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab