X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fres.c;h=743d5e884added9ec48003b13d0a534a4ceadcd1;hb=f8a58c40f789bc7f0694ad085b6af815a5ee1fc3;hp=5655a61a6f5bf3f6ce5b6f79bd8f8e12cdde2014;hpb=04b60639ac0ea45d8e9712014b01703cc3ac69cd;p=idzebra-moved-to-github.git diff --git a/util/res.c b/util/res.c index 5655a61..743d5e8 100644 --- a/util/res.c +++ b/util/res.c @@ -4,7 +4,23 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: res.c,v $ - * Revision 1.4 1994-08-18 10:02:01 adam + * Revision 1.9 1994-09-16 14:41:12 quinn + * Added log warning to res_get_def + * + * Revision 1.8 1994/09/16 14:37:12 quinn + * added res_get_def + * + * Revision 1.7 1994/09/06 13:01:03 quinn + * Removed const from declaration of res_get + * + * Revision 1.6 1994/09/01 17:45:14 adam + * Work on resource manager. + * CVS ---------------------------------------------------------------------- + * + * 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 @@ -20,18 +36,37 @@ #include #include #include +#include +#include #include +static struct res_entry *add_entry (Res r) +{ + struct res_entry *resp; + + 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; + return resp; +} + 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; + assert (r); r->init = 1; val_buf = xmalloc (val_max); @@ -57,15 +92,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); @@ -87,15 +114,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); @@ -125,7 +144,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; + } + } } } } @@ -135,7 +165,13 @@ static void reread (Res r) Res res_open (const char *name) { - Res r = xmalloc (sizeof(*r)); + Res r; + if (access (name, R_OK)) + { + log (LOG_LOG|LOG_ERRNO, "cannot access `%s'", name); + xfree (r); + } + r = xmalloc (sizeof(*r)); r->init = 0; r->name = xstrdup (name); return r; @@ -143,6 +179,7 @@ Res res_open (const char *name) void res_close (Res r) { + assert (r); if (r->init) { struct res_entry *re, *re1; @@ -159,21 +196,36 @@ void res_close (Res r) xfree (r); } -const char *res_get (Res r, const char *name) +char *res_get (Res r, const char *name) { struct res_entry *re; + + assert (r); if (!r->init) reread (r); - for (re = r->first; re; re=re->next) if (re->value && !strcmp (re->name, name)) return re->value; return NULL; } +char *res_get_def (Res r, const char *name, char *def) +{ + char *t; + + if (!(t = res_get (r, name))) + { + log(LOG_DEBUG, "CAUTION: Using default resource %s:%s", name, def); + return def; + } + else + return t; +} + void res_put (Res r, const char *name, const char *value) { struct res_entry *re; + assert (r); if (!r->init) reread (r); @@ -184,15 +236,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); } @@ -203,6 +247,7 @@ void res_trav (Res r, const char *prefix, struct res_entry *re; int l = 0; + assert (r); if (prefix) l = strlen(prefix); if (!r->init) @@ -216,8 +261,54 @@ void res_trav (Res r, const char *prefix, int res_write (Res r) { + struct res_entry *re; + char path[256]; + FILE *fr; + + assert (r); 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; }