X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=6ce039c351c5d48f7d00be188e456a2165df9fa4;hb=93d44a21d1aa585bb7f68d23a7590fc38ccb62a6;hp=e221dc20b2335a20a4e9f09514df9fe285ec12e0;hpb=2a6f64379961f30bfe6376964ce279ab5242da1f;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index e221dc2..6ce039c 100644
--- a/util/res.c
+++ b/util/res.c
@@ -1,4 +1,4 @@
-/* $Id: res.c,v 1.34 2004-01-22 11:27:22 adam Exp $
+/* $Id: res.c,v 1.38 2004-11-19 10:27:18 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -20,7 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -65,6 +64,75 @@ static struct res_entry *add_entry (Res r)
     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;
@@ -77,17 +145,16 @@ static void reread (Res r)
     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);
@@ -138,10 +205,9 @@ static void reread (Res r)
                               (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;
                 }
@@ -150,8 +216,8 @@ static void reread (Res r)
                     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;
@@ -188,7 +254,7 @@ Res res_open (const char *name, Res def_res, Res over_res)
         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;
         }
     }
@@ -274,7 +340,7 @@ const char *res_get_def (Res r, const char *name, const char *def)
 
     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
@@ -303,12 +369,12 @@ void res_set (Res r, const char *name, const char *value)
         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,
@@ -350,7 +416,7 @@ int res_write (Res r)
     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);
     }
 
@@ -389,5 +455,3 @@ int res_write (Res r)
     return 0;
 }
 
-
-