X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=util%2Fres.c;h=f98b2d5e4e539c22d1089eb8354824a44d5a9dc0;hb=5ea84896a9b5edc8675f3646762e8ef906d6a307;hp=a5c6c133b115fd24a597cf3d2c6aeb043364866a;hpb=ceeaeb9e63dfb8d03a084bbbc71e382d63251089;p=idzebra-moved-to-github.git

diff --git a/util/res.c b/util/res.c
index a5c6c13..f98b2d5 100644
--- a/util/res.c
+++ b/util/res.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: res.c,v $
- * Revision 1.3  1994-08-18 09:43:51  adam
+ * Revision 1.5  1994-08-18 11:02:28  adam
+ * Implementation of res_write.
+ *
+ * Revision 1.4  1994/08/18  10:02:01  adam
+ * Module alexpath moved from res.c to alexpath.c. Minor changes in res-test.c
+ *
+ * Revision 1.3  1994/08/18  09:43:51  adam
  * Development of resource manager. Only missing is res_write.
  *
  * Revision 1.2  1994/08/18  08:23:26  adam
@@ -17,21 +23,23 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 #include <util.h>
 
-const char *alex_path (const char *name)
+static struct res_entry *add_entry (Res r)
 {
-    static char path[256];
-    char *alex_prefix;
+    struct res_entry *resp;
 
-    if (!(alex_prefix = getenv ("ALEXPREFIX")))
-        alex_prefix = "./";
-    
-    if (*alex_prefix && alex_prefix[strlen(alex_prefix)-1] == '/')
-        sprintf (path, "%s%s", alex_prefix, name);
+    if (!r->first)
+        resp = r->last = r->first = xmalloc (sizeof(*resp));
     else
-        sprintf (path, "%s/%s", alex_prefix, name);
-    return path;
+    {
+        resp = xmalloc (sizeof(*resp));
+        r->last->next = resp;
+        r->last = resp;
+    }
+    resp->next = NULL;
+    return resp;
 }
 
 static void reread (Res r)
@@ -39,7 +47,7 @@ static void reread (Res r)
     struct res_entry *resp;
     char *line;
     char *val_buf;
-    int val_size, val_max = 1024;
+    int val_size, val_max = 256;
     char path[256];
     char fr_buf[1024];
     FILE *fr;
@@ -69,15 +77,7 @@ static void reread (Res r)
                 no++;
             fr_buf[no] = '\0';
 
-            if (!r->first)
-                resp = r->last = r->first = xmalloc (sizeof(*resp));
-            else
-            {
-                resp = xmalloc (sizeof(*resp));
-                r->last->next = resp;
-                r->last = resp;
-            }
-            resp->next = NULL;
+            resp = add_entry (r);
             resp->name = xmalloc (no+1);
             resp->value = NULL;
             strcpy (resp->name, fr_buf);
@@ -99,15 +99,7 @@ static void reread (Res r)
             if (no < 0)
                 continue;
             fr_buf[no++] = '\0';
-            if (!r->first)
-                resp = r->last = r->first = xmalloc (sizeof(*resp));
-            else
-            {
-                resp = xmalloc (sizeof(*resp));
-                r->last->next = resp;
-                r->last = resp;
-            }
-            resp->next = NULL;
+            resp = add_entry (r);
             resp->name = xmalloc (no);
             strcpy (resp->name, fr_buf);
             
@@ -137,7 +129,18 @@ static void reread (Res r)
                     no = 0;
                 }
                 else
+                {
                     val_buf[val_size++] = fr_buf[no++];
+                    if (val_size+1 >= val_max)
+                    {
+                        char *nb;
+
+                        nb = xmalloc (val_max+=1024);
+                        memcpy (nb, val_buf, val_size);
+                        xfree (val_buf);
+                        val_buf = nb;
+                    }
+                }
             }
         }
     }                
@@ -196,15 +199,7 @@ void res_put (Res r, const char *name, const char *value)
             re->value = xstrdup (value);
             return;
         }
-    if (!r->first)
-        re = r->last = r->first = xmalloc (sizeof(*re));
-    else
-    {
-        re = xmalloc (sizeof(*re));
-        r->last->next = re;
-        r->last = re;
-    }
-    re->next = NULL;
+    re = add_entry (r);
     re->name = xstrdup (name);
     re->value = xstrdup (value);
 }
@@ -228,8 +223,53 @@ void res_trav (Res r, const char *prefix,
 
 int res_write (Res r)
 {
+    struct res_entry *re;
+    char path[256];
+    FILE *fr;
     if (!r->init)
         reread (r);
+
+    strcpy (path, alex_path(r->name));
+
+    fr = fopen (path, "w");
+    if (!fr)
+    {
+        log (LOG_FATAL|LOG_ERRNO, "cannot create %s", path);
+        exit (1);
+    }
+
+    for (re = r->first; re; re=re->next)
+    {
+        int no = 0;
+        int lefts = strlen(re->name)+2;
+
+        if (!re->value)
+            fprintf (fr, "%s\n", re->name);
+        else
+        {
+            fprintf (fr, "%s: ", re->name);
+            while (lefts + strlen(re->value+no) > 78)
+            {
+                int i = 20;
+                int ind = no+ 78-lefts;
+                while (--i >= 0)
+                {
+                    if (re->value[ind] == ' ')
+                        break;
+                    --ind;
+                }
+                if (i<0)
+                    ind = no + 78 - lefts;
+                for (i = no; i != ind; i++)
+                    putc (re->value[i], fr);
+                fprintf (fr, "\\\n");
+                no=ind;
+                lefts = 0;
+            }
+            fprintf (fr, "%s\n", re->value+no);
+        }
+    }
+    fclose (fr);
     return 0;
 }