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
Always set parent member in data1_node
[idzebra-moved-to-github.git]
/
util
/
res.c
diff --git
a/util/res.c
b/util/res.c
index
57c1d09
..
e221dc2
100644
(file)
--- a/
util/res.c
+++ b/
util/res.c
@@
-1,5
+1,5
@@
-/* $Id: res.c,v 1.32 2002-09-09 09:35:48 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: res.c,v 1.34 2004-01-22 11:27:22 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-45,6
+45,7
@@
struct res_struct {
char *name;
int init;
Res def_res;
char *name;
int init;
Res def_res;
+ Res over_res;
};
static struct res_entry *add_entry (Res r)
};
static struct res_entry *add_entry (Res r)
@@
-78,6
+79,9
@@
static void reread (Res r)
val_buf = (char*) xmalloc (val_max);
val_buf = (char*) xmalloc (val_max);
+ if (!r->name)
+ return;
+
fr = fopen (r->name, "r");
if (!fr)
{
fr = fopen (r->name, "r");
if (!fr)
{
@@
-172,23
+176,31
@@
static void reread (Res r)
fclose (fr);
}
fclose (fr);
}
-Res res_open (const char *name, Res def_res)
+Res res_open (const char *name, Res def_res, Res over_res)
{
Res r;
{
Res r;
+
+ if (name)
+ {
#ifdef WIN32
#ifdef WIN32
- if (access (name, 4))
+ if (access (name, 4))
#else
#else
- if (access (name, R_OK))
+ if (access (name, R_OK))
#endif
#endif
- {
- logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", name);
- return 0;
+ {
+ logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", name);
+ return 0;
+ }
}
r = (Res) xmalloc (sizeof(*r));
r->init = 0;
r->first = r->last = NULL;
}
r = (Res) xmalloc (sizeof(*r));
r->init = 0;
r->first = r->last = NULL;
- r->name = xstrdup (name);
+ if (name)
+ r->name = xstrdup (name);
+ else
+ r->name=0;
r->def_res = def_res;
r->def_res = def_res;
+ r->over_res = over_res;
return r;
}
return r;
}
@@
-213,12
+225,40
@@
void res_close (Res r)
xfree (r);
}
xfree (r);
}
-char *res_get (Res r, const char *name)
+const char *res_get_prefix (Res r, const char *name, const char *prefix,
+ const char *def)
+{
+ const char *v = 0;;
+ if (prefix)
+ {
+ char rname[128];
+
+ if (strlen(name) + strlen(prefix) >= (sizeof(rname)-2))
+ return 0;
+ strcpy(rname, prefix);
+ strcat(rname, ".");
+ strcat(rname, name);
+ v = res_get(r, rname);
+ }
+ if (!v)
+ v = res_get(r, name);
+ if (!v)
+ v = def;
+ return v;
+}
+
+const char *res_get (Res r, const char *name)
{
struct res_entry *re;
{
struct res_entry *re;
+ const char *v;
if (!r)
return 0;
if (!r)
return 0;
+
+ v = res_get(r->over_res, name);
+ if (v)
+ return v;
+
if (!r->init)
reread (r);
for (re = r->first; re; re=re->next)
if (!r->init)
reread (r);
for (re = r->first; re; re=re->next)
@@
-228,9
+268,9
@@
char *res_get (Res r, const char *name)
return res_get (r->def_res, name);
}
return res_get (r->def_res, name);
}
-char *res_get_def (Res r, const char *name, char *def)
+const char *res_get_def (Res r, const char *name, const char *def)
{
{
- char *t;
+ const char *t;
if (!(t = res_get (r, name)))
{
if (!(t = res_get (r, name)))
{
@@
-252,7
+292,7
@@
int res_get_match (Res r, const char *name, const char *value, const char *s)
return 0;
}
return 0;
}
-void res_put (Res r, const char *name, const char *value)
+void res_set (Res r, const char *name, const char *value)
{
struct res_entry *re;
assert (r);
{
struct res_entry *re;
assert (r);
@@
-305,6
+345,8
@@
int res_write (Res r)
assert (r);
if (!r->init)
reread (r);
assert (r);
if (!r->init)
reread (r);
+ if (!r->name)
+ return 0; /* ok, this was not from a file */
fr = fopen (r->name, "w");
if (!fr)
{
fr = fopen (r->name, "w");
if (!fr)
{