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
Happy new year
[idzebra-moved-to-github.git]
/
util
/
tstres.c
diff --git
a/util/tstres.c
b/util/tstres.c
index
ad01b62
..
30566a6
100644
(file)
--- a/
util/tstres.c
+++ b/
util/tstres.c
@@
-1,8
+1,5
@@
-/* $Id: tstres.c,v 1.2 2007-05-16 12:31:17 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.
+ Copyright (C) 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
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,8
+17,25
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <string.h>
+#include <stdlib.h>
#include <idzebra/res.h>
#include <yaz/test.h>
#include <idzebra/res.h>
#include <yaz/test.h>
+#include <yaz/snprintf.h>
+
+/* 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)
{
static void tst_res_open(void)
{
@@
-48,7
+62,11
@@
static void tst_res_read_file(void)
if (res)
{
const char *v;
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");
YAZ_CHECK_EQ(r, ZEBRA_OK);
v = res_get_def(res, "register", "none");
@@
-77,6
+95,7
@@
int main (int argc, char **argv)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab