X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=c1f5c12b979cc49d745b141c85693314ea2a41ac;hb=26a5a4b96b90361859cf856d6c41852b03ca2f84;hp=affe0224313a8606303cefe249966094c82c6909;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index affe022..c1f5c12 100644
--- a/util/res.c
+++ b/util/res.c
@@ -1,4 +1,4 @@
-/* $Id: res.c,v 1.31 2002-08-02 19:26:57 adam Exp $
+/* $Id: res.c,v 1.33 2002-10-22 09:37:56 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -78,10 +78,13 @@ static void reread (Res r)
 
     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);
+        logf (LOG_WARN|LOG_ERRNO, "Cannot open `%s'", r->name);
 	return ;
     }
     while (1)
@@ -175,19 +178,26 @@ static void reread (Res r)
 Res res_open (const char *name, Res def_res)
 {
     Res r;
+
+    if (name)
+    {
 #ifdef WIN32
-    if (access (name, 4))
+        if (access (name, 4))
 #else
-    if (access (name, R_OK))
+        if (access (name, R_OK))
 #endif
-    {
-        logf (LOG_WARN|LOG_ERRNO, "Cannot access resource file `%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->name = xstrdup (name);
+    if (name)
+        r->name = xstrdup (name);
+    else
+	r->name=0;
     r->def_res = def_res;
     return r;
 }
@@ -305,10 +315,12 @@ int res_write (Res 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)
     {
-        logf (LOG_FATAL|LOG_ERRNO, "Cannot create %s", r->name);
+        logf (LOG_FATAL|LOG_ERRNO, "Cannot create `%s'", r->name);
         exit (1);
     }