Removed the now-redundant alist files.
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2875 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
@@ -1,274 +0,0 @@
|
||||
/* alist.c, Copyright (c) 2005 Michael C. Martin */
|
||||
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope thta it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Se the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include "libs/reslib.h"
|
||||
#include "libs/log.h"
|
||||
#include "alist.h"
|
||||
|
||||
alist_entry *
|
||||
AlistEntry_New (alist *m, const char *key, const char *value)
|
||||
{
|
||||
alist_entry *e;
|
||||
e = malloc (sizeof(alist_entry));
|
||||
e->key = StringBank_AddOrFindString(m->bank, key);
|
||||
e->value = StringBank_AddOrFindString(m->bank, value);
|
||||
e->next = NULL;
|
||||
return e;
|
||||
}
|
||||
|
||||
void
|
||||
AlistEntry_Free (alist_entry *e)
|
||||
{
|
||||
if (e == NULL)
|
||||
return;
|
||||
AlistEntry_Free (e->next);
|
||||
free (e);
|
||||
}
|
||||
|
||||
alist *
|
||||
Alist_New (void)
|
||||
{
|
||||
alist *result = malloc (sizeof(alist));
|
||||
result->first = NULL;
|
||||
result->bank = StringBank_Create ();
|
||||
return result;
|
||||
}
|
||||
|
||||
void
|
||||
Alist_Free (alist *m) {
|
||||
if (m == NULL) return;
|
||||
AlistEntry_Free (m->first);
|
||||
StringBank_Free (m->bank);
|
||||
free (m);
|
||||
}
|
||||
|
||||
alist_entry *
|
||||
Alist_GetEntry (alist *m, const char *key)
|
||||
{
|
||||
alist_entry *x = m->first;
|
||||
while (x != NULL) {
|
||||
if (!strcmp (x->key, key))
|
||||
return x;
|
||||
x = x->next;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char *
|
||||
Alist_GetString (alist *m, const char *key)
|
||||
{
|
||||
alist_entry *x = Alist_GetEntry (m, key);
|
||||
return x ? x->value : NULL;
|
||||
}
|
||||
|
||||
void
|
||||
Alist_PutString (alist *m, const char *key, const char *value)
|
||||
{
|
||||
alist_entry *e = Alist_GetEntry (m, key);
|
||||
if (e == NULL) {
|
||||
e = AlistEntry_New(m, key, value);
|
||||
e->next = m->first;
|
||||
m->first = e;
|
||||
} else {
|
||||
e->value = StringBank_AddOrFindString(m->bank, value);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
Alist_PutAll (alist *dst, alist *src)
|
||||
{
|
||||
alist_entry *e = src->first;
|
||||
while (e) {
|
||||
Alist_PutString (dst,
|
||||
StringBank_AddOrFindString(dst->bank, e->key),
|
||||
StringBank_AddOrFindString(dst->bank, e->value));
|
||||
e = e->next;
|
||||
}
|
||||
}
|
||||
|
||||
/* Remove operation. Returns the old value, or NULL if it didn't exist. */
|
||||
|
||||
/* NOTE: The actual strings representing the key and the value in the
|
||||
* stringbank will still stay in the bank, since there's no way to
|
||||
* ensure they aren't still in use somewhere. In fact, that's the
|
||||
* only reason returning the value is safe at all. */
|
||||
|
||||
const char *
|
||||
Alist_RemoveString (alist *m, const char *key)
|
||||
{
|
||||
alist_entry *todel = NULL;
|
||||
if (!m->first)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
if (!strcmp (m->first->key, key))
|
||||
{
|
||||
todel = m->first;
|
||||
m->first = m->first->next;
|
||||
}
|
||||
else
|
||||
{
|
||||
alist_entry *x = m->first;
|
||||
while (x->next != NULL) {
|
||||
if (!strcmp (x->next->key, key))
|
||||
{
|
||||
todel = x->next;
|
||||
x->next = x->next->next;
|
||||
break;
|
||||
}
|
||||
x = x->next;
|
||||
}
|
||||
}
|
||||
if (todel)
|
||||
{
|
||||
const char *result = todel->value;
|
||||
todel->next = NULL;
|
||||
AlistEntry_Free (todel);
|
||||
return result;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
alist *
|
||||
Alist_New_FromFile (uio_Stream *f)
|
||||
{
|
||||
long flen;
|
||||
alist *m;
|
||||
char *data;
|
||||
|
||||
flen = LengthResFile (f);
|
||||
|
||||
data = malloc (flen + 1);
|
||||
if (!data) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
flen = ReadResFile (data, 1, flen, f);
|
||||
data[flen] = '\0';
|
||||
|
||||
m = Alist_New_FromString (data);
|
||||
free (data);
|
||||
return m;
|
||||
}
|
||||
|
||||
alist *
|
||||
Alist_New_FromFilename (uio_DirHandle *path, const char *fname)
|
||||
{
|
||||
alist *result;
|
||||
uio_Stream *f = res_OpenResFile (path, fname, "rt");
|
||||
if (!f) {
|
||||
return NULL;
|
||||
}
|
||||
result = Alist_New_FromFile (f);
|
||||
res_CloseResFile(f);
|
||||
return result;
|
||||
}
|
||||
|
||||
alist *
|
||||
Alist_New_FromString (char *d)
|
||||
{
|
||||
alist *m = Alist_New ();
|
||||
int len, i;
|
||||
if (!m) return NULL;
|
||||
|
||||
len = strlen(d);
|
||||
i = 0;
|
||||
while (i < len) {
|
||||
int key_start, key_end, value_start, value_end;
|
||||
/* Starting a line: search for non-whitespace */
|
||||
while ((i < len) && isspace (d[i])) i++;
|
||||
if (i >= len) break; /* Done parsing! */
|
||||
/* If it was a comment, skip to end of comment/file */
|
||||
if (d[i] == '#') {
|
||||
while ((i < len) && (d[i] != '\n')) i++;
|
||||
if (i >= len) break;
|
||||
continue; /* Back to keyword search */
|
||||
}
|
||||
key_start = i;
|
||||
/* Find the = on this line */
|
||||
while ((i < len) && (d[i] != '=') &&
|
||||
(d[i] != '\n') && (d[i] != '#')) i++;
|
||||
if (i >= len) { /* Bare key at EOF */
|
||||
log_add (log_Warning, "Warning: Bare keyword at EOF");
|
||||
break;
|
||||
}
|
||||
/* Comments here mean incomplete line too */
|
||||
if (d[i] != '=') {
|
||||
log_add (log_Warning, "Warning: Key without value");
|
||||
while ((i < len) && (d[i] != '\n')) i++;
|
||||
if (i >= len) break;
|
||||
continue; /* Back to keyword search */
|
||||
}
|
||||
/* Key ends at first whitespace before = , or at key_start*/
|
||||
key_end = i;
|
||||
while ((key_end > key_start) && isspace (d[key_end-1]))
|
||||
key_end--;
|
||||
|
||||
/* Consume the = */
|
||||
i++;
|
||||
/* Value starts at first non-whitespace after = on line... */
|
||||
while ((i < len) && (d[i] != '#') && (d[i] != '\n') &&
|
||||
isspace (d[i]))
|
||||
i++;
|
||||
value_start = i;
|
||||
/* Until first non-whitespace before terminator */
|
||||
while ((i < len) && (d[i] != '#') && (d[i] != '\n'))
|
||||
i++;
|
||||
value_end = i;
|
||||
while ((value_end > value_start) && isspace (d[value_end-1]))
|
||||
value_end--;
|
||||
/* Skip past EOL or EOF */
|
||||
while ((i < len) && (d[i] != '\n'))
|
||||
i++;
|
||||
i++;
|
||||
|
||||
/* We now have start and end values for key and value.
|
||||
We terminate the strings for both by writing \0s, then
|
||||
make a new map entry. */
|
||||
d[key_end] = '\0';
|
||||
d[value_end] = '\0';
|
||||
Alist_PutString (m, StringBank_AddOrFindString(m->bank, d+key_start),
|
||||
StringBank_AddOrFindString(m->bank, d+value_start));
|
||||
}
|
||||
return m;
|
||||
}
|
||||
|
||||
void
|
||||
Alist_Dump (alist *m, uio_Stream *s, const char *prefix)
|
||||
{
|
||||
alist_entry *e = m->first;
|
||||
int prefix_len = 0;
|
||||
if (prefix)
|
||||
prefix_len = strlen (prefix);
|
||||
while (e) {
|
||||
if (!prefix || !strncmp (prefix, e->key, prefix_len)) {
|
||||
WriteResFile (e->key, 1, strlen (e->key), s);
|
||||
PutResFileChar(' ', s);
|
||||
PutResFileChar('=', s);
|
||||
PutResFileChar(' ', s);
|
||||
WriteResFile (e->value, 1, strlen (e->value), s);
|
||||
PutResFileNewline(s);
|
||||
}
|
||||
e = e->next;
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
/* alist.h, Copyright (c) 2005 Michael C. Martin */
|
||||
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope thta it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Se the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef _ALIST_H_
|
||||
#define _ALIST_H_
|
||||
|
||||
#include "libs/uio.h"
|
||||
#include "stringbank.h"
|
||||
|
||||
/* Associative List types. */
|
||||
|
||||
typedef struct _alist_entry {
|
||||
const char *key, *value;
|
||||
struct _alist_entry *next;
|
||||
} alist_entry;
|
||||
|
||||
typedef struct _alist_map {
|
||||
alist_entry *first;
|
||||
stringbank *bank;
|
||||
} alist;
|
||||
|
||||
/* ***** alist_entry operations ***** */
|
||||
|
||||
/* Constructor and destructor */
|
||||
alist_entry *AlistEntry_New (alist *m, const char *key, const char *value);
|
||||
void AlistEntry_Free (alist_entry *e);
|
||||
|
||||
/* ***** alist operations ***** */
|
||||
|
||||
/* Standard constructor and destructor */
|
||||
alist *Alist_New (void);
|
||||
void Alist_Free (alist *m);
|
||||
|
||||
/* Specialized constructors: Parse an alist out of a stream, file, or
|
||||
string. It expects a bunch of key=value statements, one per
|
||||
line. */
|
||||
alist *Alist_New_FromFile (uio_Stream *f);
|
||||
alist *Alist_New_FromFilename (uio_DirHandle *path, const char *fname);
|
||||
alist *Alist_New_FromString (char *d);
|
||||
|
||||
/* Getting and Setting operations */
|
||||
alist_entry *Alist_GetEntry (alist *m, const char *key);
|
||||
const char *Alist_GetString (alist *m, const char *key);
|
||||
void Alist_PutString (alist *m, const char *key, const char *value);
|
||||
void Alist_PutAll (alist *dest, alist *src);
|
||||
|
||||
/* Remove operation. Returns the old value, or NULL if it didn't exist. */
|
||||
const char *Alist_RemoveString (alist *m, const char *key);
|
||||
|
||||
/* Dump the alist to the specified stream in a form that could be
|
||||
read later by the Alist_New_From* routines. Dump only keys
|
||||
that begin with the prefix; NULL means all keys. */
|
||||
void Alist_Dump (alist *m, uio_Stream *s, const char *prefix);
|
||||
|
||||
#endif /* _ALIST_H_ */
|
||||
Reference in New Issue
Block a user