-/* $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
+/* $Id: res.c,v 1.39 2005-01-15 19:38:42 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
02111-1307, USA.
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
return resp;
}
+static char *xstrdup_env(const char *src)
+{
+ int i = 0;
+ int j = 0;
+ char *dst;
+ int env_strlen = 0;
+
+ while (src[i])
+ {
+ if (src[i] == '$' && src[i+1] == '{')
+ {
+ char envname[128];
+ char *env_val;
+ int k = 0;
+ i = i + 2;
+ while (k < 127 && src[i] && !strchr(":}\n\r\f", src[i]))
+ envname[k++] = src[i++];
+ envname[k] = '\0';
+
+ env_val = getenv(envname);
+ if (env_val)
+ env_strlen += 1 + strlen(env_val);
+ else
+ env_strlen++;
+ while (src[i] && !strchr("}\n\r\f", src[i]))
+ i++;
+ if (src[i] == '}')
+ i++;
+ }
+ else
+ i++;
+ }
+ dst = xmalloc(1 + env_strlen + i);
+ i = 0;
+ while (src[i])
+ {
+ if (src[i] == '$' && src[i+1] == '{')
+ {
+ char envname[128];
+ char *env_val;
+ int k = 0;
+ i = i + 2;
+ while(k < 127 && src[i] && !strchr(":}\n\r\f", src[i]))
+ envname[k++] = src[i++];
+ envname[k] = '\0';
+ env_val = getenv(envname);
+ if (env_val)
+ {
+ strcpy(dst+j, env_val);
+ j += strlen(env_val);
+ }
+ else if (src[i] == ':' && src[i+1] == '-')
+ {
+ i = i + 2;
+ while (src[i] && !strchr("}\n\r\f", src[i]))
+ dst[j++] = src[i++];
+ }
+ while (src[i] && !strchr("}\n\r\f", src[i]))
+ i++;
+ if (src[i] == '}')
+ i++;
+ }
+ else
+ dst[j++] = src[i++];
+ }
+ dst[j] = '\0';
+ return dst;
+}
+
static void reread (Res r)
{
struct res_entry *resp;
assert (r);
r->init = 1;
- val_buf = (char*) xmalloc (val_max);
-
if (!r->name)
return;
fr = fopen (r->name, "r");
if (!fr)
{
- logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", r->name);
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", r->name);
return ;
}
+ val_buf = (char*) xmalloc (val_max);
while (1)
{
line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
(val_buf[val_size-1] == ' ' ||
val_buf[val_size-1] == '\t'))
val_size--;
- val_buf[val_size++] = '\0';
- resp->value = (char*) xmalloc (val_size);
- strcpy (resp->value, val_buf);
- logf (LOG_DEBUG, "(name=%s,value=%s)",
+ val_buf[val_size] = '\0';
+ resp->value = xstrdup_env(val_buf);
+ yaz_log (YLOG_DEBUG, "(name=%s,value=%s)",
resp->name, resp->value);
break;
}
line = fgets (fr_buf, sizeof(fr_buf)-1, fr);
if (!line)
{
- resp->value = (char*) xmalloc (val_size);
- strcpy (resp->value, val_buf);
+ val_buf[val_size] = '\0';
+ resp->value = xstrdup_env(val_buf);
break;
}
no = 0;
if (access (name, R_OK))
#endif
{
- logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", name);
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot open `%s'", name);
return 0;
}
}
if (!(t = res_get (r, name)))
{
- logf (LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
+ yaz_log (YLOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def);
return def;
}
else
if (re->value && !yaz_matchstr (re->name, name))
{
xfree (re->value);
- re->value = xstrdup (value);
+ re->value = xstrdup_env (value);
return;
}
re = add_entry (r);
re->name = xstrdup (name);
- re->value = xstrdup (value);
+ re->value = xstrdup_env (value);
}
int res_trav (Res r, const char *prefix, void *p,
fr = fopen (r->name, "w");
if (!fr)
{
- logf (LOG_FATAL|LOG_ERRNO, "Cannot create `%s'", r->name);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "Cannot create `%s'", r->name);
exit (1);
}
return 0;
}
-
-