diff --git a/include/bsettings.h b/include/bsettings.h
index 77f1592..0470c33 100644
--- a/include/bsettings.h
+++ b/include/bsettings.h
@@ -408,4 +408,54 @@ void bsReadSettings(BSContext *context);
void bsWriteSettings(BSContext *context);
void bsWriteChangedSettings(BSContext *context);
+/* INI file stuff */
+
+typedef struct _dictionary_ {
+ /** Number of entries in dictionary */
+ int n;
+ /** Storage size */
+ int size;
+ /** List of string values */
+ char **val;
+ /** List of string keys */
+ char **key ;
+ /** List of hash values for keys */
+ unsigned *hash;
+} IniDictionary;
+
+IniDictionary * bsIniOpen (const char * fileName);
+void bsIniClose (IniDictionary * dictionary);
+void bsIniSave (IniDictionary * dictionary, const char * fileName);
+Bool bsIniGetString (IniDictionary * dictionary, const char * section,
+ const char * entry, char ** value);
+Bool bsIniGetInt (IniDictionary * dictionary, const char * section,
+ const char * entry, int * value);
+Bool bsIniGetFloat (IniDictionary * dictionary, const char * section,
+ const char * entry, float * value);
+Bool bsIniGetBool (IniDictionary * dictionary, const char * section,
+ const char * entry, Bool * value);
+Bool bsIniGetColor (IniDictionary * dictionary, const char * section,
+ const char * entry, BSSettingColorValue * value);
+Bool bsIniGetAction (IniDictionary * dictionary, const char * section,
+ const char * entry, BSSettingActionValue * value);
+Bool bsIniGetList (IniDictionary * dictionary, const char * section,
+ const char * entry, BSSettingValueList * value, BSSetting *parent);
+void bsIniSetString (IniDictionary * dictionary, const char * section,
+ const char * entry, char * value);
+void bsIniSetInt (IniDictionary * dictionary, const char * section,
+ const char * entry, int value);
+void bsIniSetFloat (IniDictionary * dictionary, const char * section,
+ const char * entry, float value);
+void bsIniSetBool (IniDictionary * dictionary, const char * section,
+ const char * entry, Bool value);
+void bsIniSetColor (IniDictionary * dictionary, const char * section,
+ const char * entry, BSSettingColorValue value);
+void bsIniSetAction (IniDictionary * dictionary, const char * section,
+ const char * entry, BSSettingActionValue value);
+void bsIniSetList (IniDictionary * dictionary, const char * section,
+ const char * entry, BSSettingValueList value, BSSettingType listType);
+
+void bsIniRemoveEntry (IniDictionary * dictionary, const char * section,
+ const char * entry);
+
#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 549bd29..79f4c05 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
-DLIBDIR=\"$(libdir)\"
-libbsettings_la_SOURCES=main.c lists.c compiz.c match.c config.c option.c
+libbsettings_la_SOURCES=main.c lists.c compiz.c match.c config.c option.c iniparser.c ini.c
lib_LTLIBRARIES=libbsettings.la
diff --git a/src/ini.c b/src/ini.c
new file mode 100644
index 0000000..0b87f39
--- /dev/null
+++ b/src/ini.c
@@ -0,0 +1,535 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+
+#include <bsettings.h>
+#include "iniparser.h"
+
+IniDictionary * bsIniOpen (const char * fileName)
+{
+ return iniparser_new ((char*) fileName);
+}
+
+void bsIniClose (IniDictionary * dictionary)
+{
+ iniparser_free (dictionary);
+}
+
+void bsIniSave (IniDictionary * dictionary, const char * fileName)
+{
+ FILE *file;
+
+ file = fopen (fileName, "w");
+ iniparser_dump_ini (dictionary, file);
+ fclose (file);
+}
+
+static char *getIniString (IniDictionary * dictionary,
+ const char * section,
+ const char * entry)
+{
+ char *sectionName;
+ char *retValue;
+
+ asprintf (§ionName, "%s:%s", section, entry);
+
+ retValue = iniparser_getstring (dictionary, sectionName, NULL);
+ free (sectionName);
+
+ return retValue;
+}
+
+static void setIniString (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ const char * value)
+{
+ char *sectionName;
+
+ asprintf (§ionName, "%s:%s", section, entry);
+ iniparser_setstr (dictionary, sectionName, (char*) value);
+ free (sectionName);
+}
+
+static char *writeActionString (BSSettingActionValue * action)
+{
+ char *keyBinding;
+ char *buttonBinding;
+ char *edge;
+ char *actionString = NULL;
+
+ keyBinding = bsKeyBindingToString (action);
+ if (!keyBinding)
+ keyBinding = strdup("");
+
+ buttonBinding = bsButtonBindingToString (action);
+ if (!buttonBinding)
+ buttonBinding = strdup("");
+
+ edge = bsEdgeToString (action);
+ if (!edge)
+ edge = strdup("");
+
+ asprintf (&actionString, "%s,%s,%s,%d,%s\n", keyBinding,
+ buttonBinding, edge, action->edgeButton,
+ action->onBell ? "true" : "false");
+
+ free (keyBinding);
+ free (buttonBinding);
+ free (edge);
+
+ return actionString;
+}
+
+static Bool parseActionString (const char* string,
+ BSSettingActionValue *value)
+{
+ char *valueString, *valueStart;
+ char *token;
+
+ memset (value, 0, sizeof(BSSettingActionValue));
+ valueString = strdup (string);
+ valueStart = valueString;
+
+ token = strsep (&valueString, ",");
+ if (!token)
+ {
+ free (valueStart);
+ return FALSE;
+ }
+
+ /* key binding */
+ bsStringToKeyBinding (token, value);
+
+ token = strsep (&valueString, ",");
+ if (!token)
+ {
+ free (valueStart);
+ return FALSE;
+ }
+
+ /* button binding */
+ bsStringToButtonBinding (token, value);
+
+ token = strsep (&valueString, ",");
+ if (!token)
+ {
+ free (valueStart);
+ return FALSE;
+ }
+
+ /* edge binding */
+ bsStringToEdge (token, value);
+
+ token = strsep (&valueString, ",");
+ if (!token)
+ {
+ free (valueStart);
+ return FALSE;
+ }
+
+ /* edge button */
+ value->edgeButton = strtoul (token, NULL, 10);
+
+ /* bell */
+ value->onBell = (strcmp (valueString, "true") == 0);
+
+ return TRUE;
+}
+
+Bool bsIniGetString (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ char ** value)
+{
+ char *retValue;
+
+ retValue = getIniString (dictionary, section, entry);
+
+ if (retValue)
+ {
+ *value = strdup (retValue);
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+Bool bsIniGetInt (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ int * value)
+{
+ char *retValue;
+
+ retValue = getIniString (dictionary, section, entry);
+
+ if (retValue)
+ {
+ *value = strtoul (retValue, NULL, 10);
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+Bool bsIniGetFloat (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ float * value)
+{
+ char *retValue;
+
+ retValue = getIniString (dictionary, section, entry);
+
+ if (retValue)
+ {
+ *value = (float) strtod (retValue, NULL);
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+Bool bsIniGetBool (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ Bool * value)
+{
+ char *retValue;
+
+ retValue = getIniString (dictionary, section, entry);
+
+ if (retValue)
+ {
+ if ((retValue[0] == 't') || (retValue[0] == 'T') ||
+ (retValue[0] == 'y') || (retValue[0] == 'Y') ||
+ (retValue[0] == '1'))
+ {
+ *value = TRUE;
+ }
+ else
+ *value = FALSE;
+
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
+Bool bsIniGetColor (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ BSSettingColorValue * value)
+{
+ char *retValue;
+
+ retValue = getIniString (dictionary, section, entry);
+
+ if (retValue && bsStringToColor (retValue, value))
+ return TRUE;
+ else
+ return FALSE;
+}
+
+Bool bsIniGetAction (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ BSSettingActionValue * value)
+{
+ char *retValue;
+
+ retValue = getIniString (dictionary, section, entry);
+
+ if (retValue)
+ return parseActionString (retValue, value);
+ else
+ return FALSE;
+}
+
+Bool bsIniGetList (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ BSSettingValueList * value,
+ BSSetting *parent)
+{
+ BSSettingValueList list = NULL;
+ char *valueString, *valueStart, *valString;
+ char *token;
+ int nItems = 0, i = 0;
+
+ valString = getIniString (dictionary, section, entry);
+ if (!valString)
+ return FALSE;
+
+ valueString = strdup (valString);
+ valueStart = valueString;
+
+ token = strsep (&valueString, ";");
+ while (token)
+ {
+ token = strsep (&valueString, ";");
+ nItems++;
+ }
+ valueString = valueStart;
+
+ token = strsep (&valueString, ";");
+
+ switch (parent->info.forList.listType)
+ {
+ case TypeString:
+ case TypeMatch:
+ {
+ char **array = malloc (nItems * sizeof(char*));
+ while (token)
+ {
+ array[i++] = strdup (token);
+ token = strsep (&valueString, ";");
+ }
+ list = bsGetValueListFromStringArray (array, nItems, parent);
+ for (i = 0; i < nItems; i++)
+ free (array[i]);
+ free (array);
+ }
+ break;
+ case TypeColor:
+ {
+ BSSettingColorValue *array = malloc (nItems * sizeof(BSSettingColorValue));
+ while (token)
+ {
+ memset(&array[i], 0, sizeof(BSSettingColorValue));
+ bsStringToColor(token, &array[i]);
+ token = strsep (&valueString, ";");
+ i++;
+ }
+ list = bsGetValueListFromColorArray (array, nItems, parent);
+ free (array);
+ }
+ break;
+ case TypeBool:
+ {
+ Bool *array = malloc (nItems * sizeof(Bool));
+ Bool isTrue;
+ while (token)
+ {
+ isTrue = (token[0] == 'y' || token[0] == 'Y' || token[0] == '1' ||
+ token[0] == 't' || token[0] == 'T');
+ array[i++] = isTrue;
+ token = strsep (&valueString, ";");
+ }
+ list = bsGetValueListFromBoolArray (array, nItems, parent);
+ free (array);
+ }
+ break;
+ case TypeInt:
+ {
+ int *array = malloc (nItems * sizeof(int));
+ while (token)
+ {
+ array[i++] = strtoul (token, NULL, 10);
+ token = strsep (&valueString, ";");
+ }
+ list = bsGetValueListFromIntArray (array, nItems, parent);
+ free (array);
+ }
+ break;
+ case TypeFloat:
+ {
+ float *array = malloc (nItems * sizeof(float));
+ while (token)
+ {
+ array[i++] = strtod (token, NULL);
+ token = strsep (&valueString, ";");
+ }
+ list = bsGetValueListFromFloatArray (array, nItems, parent);
+ free (array);
+ }
+ break;
+ case TypeAction:
+ {
+ BSSettingActionValue *array = malloc (nItems * sizeof(BSSettingActionValue));
+ while (token)
+ {
+ parseActionString (token, &array[i++]);
+ token = strsep (&valueString, ";");
+ }
+ list = bsGetValueListFromActionArray (array, nItems, parent);
+ free (array);
+ }
+ break;
+ default:
+ break;
+ }
+
+ *value = list;
+ free (valueStart);
+
+ return TRUE;
+}
+
+void bsIniSetString (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ char * value)
+{
+ setIniString (dictionary, section, entry, value);
+}
+
+void bsIniSetInt (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ int value)
+{
+ char *string = NULL;
+ asprintf (&string, "%i", value);
+
+ if (string)
+ {
+ setIniString (dictionary, section, entry, string);
+ free (string);
+ }
+}
+
+void bsIniSetFloat (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ float value)
+{
+ char *string = NULL;
+ asprintf (&string, "%f", value);
+
+ if (string)
+ {
+ setIniString (dictionary, section, entry, string);
+ free (string);
+ }
+}
+
+void bsIniSetBool (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ Bool value)
+{
+ setIniString (dictionary, section, entry,
+ value ? "true" : "false");
+}
+
+void bsIniSetColor (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ BSSettingColorValue value)
+{
+ char *string;
+ string = bsColorToString (&value);
+
+ if (string)
+ {
+ setIniString (dictionary, section, entry, string);
+ free (string);
+ }
+}
+
+void bsIniSetAction (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ BSSettingActionValue value)
+{
+ char *actionString;
+
+ actionString = writeActionString (&value);
+
+ if (actionString)
+ {
+ setIniString (dictionary, section, entry, actionString);
+ free (actionString);
+ }
+}
+
+void bsIniSetList (IniDictionary * dictionary,
+ const char * section,
+ const char * entry,
+ BSSettingValueList value,
+ BSSettingType listType)
+{
+#define STRINGBUFSIZE 2048
+ char stringBuffer[STRINGBUFSIZE]; //FIXME: we should allocate that dynamically
+
+ memset (stringBuffer, 0, sizeof(stringBuffer));
+
+ while (value)
+ {
+ switch (listType)
+ {
+ case TypeString:
+ strncat (stringBuffer, value->data->value.asString, STRINGBUFSIZE);
+ break;
+ case TypeMatch:
+ strncat (stringBuffer, value->data->value.asMatch, STRINGBUFSIZE);
+ break;
+ case TypeInt:
+ {
+ char *valueString = NULL;
+ asprintf (&valueString, "%d", value->data->value.asInt);
+ if (!valueString)
+ break;
+
+ strncat (stringBuffer, valueString, STRINGBUFSIZE);
+ free (valueString);
+ }
+ break;
+ case TypeBool:
+ strncat (stringBuffer, (value->data->value.asBool) ? "true" : "false",
+ STRINGBUFSIZE);
+ break;
+ case TypeFloat:
+ {
+ char *valueString = NULL;
+ asprintf (&valueString, "%f", value->data->value.asFloat);
+ if (!valueString)
+ break;
+
+ strncat (stringBuffer, valueString, STRINGBUFSIZE);
+ free (valueString);
+ }
+ break;
+ case TypeColor:
+ {
+ char *color = NULL;
+ color = bsColorToString(&value->data->value.asColor);
+ if (!color)
+ break;
+
+ strncat (stringBuffer, color, STRINGBUFSIZE);
+ free (color);
+ }
+ break;
+ case TypeAction:
+ {
+ char *action;
+ action = writeActionString (&value->data->value.asAction);
+ if (!action)
+ break;
+
+ strncat (stringBuffer, action, STRINGBUFSIZE);
+ free (action);
+ }
+ default:
+ break;
+ }
+
+ strncat (stringBuffer, ";", STRINGBUFSIZE);;
+ value = value->next;
+ }
+
+ setIniString (dictionary, section, entry, stringBuffer);
+}
+
+void bsIniRemoveEntry (IniDictionary * dictionary,
+ const char * section,
+ const char * entry)
+{
+ char *sectionName;
+
+ asprintf (§ionName, "%s:%s", section, entry);
+ iniparser_unset (dictionary, sectionName);
+ free (sectionName);
+}
diff --git a/src/iniparser.c b/src/iniparser.c
new file mode 100644
index 0000000..5815d24
--- /dev/null
+++ b/src/iniparser.c
@@ -0,0 +1,741 @@
+/*
+ Based upon libiniparser, by Nicolas Devillard
+ Hacked into 1 file (m-iniparser) by Freek/2005
+ Original terms following:
+
+ -- -
+
+ Copyright (c) 2000 by Nicolas Devillard (ndevilla AT free DOT fr).
+
+ Written by Nicolas Devillard. Not derived from licensed software.
+
+ Permission is granted to anyone to use this software for any
+ purpose on any computer system, and to redistribute it freely,
+ subject to the following restrictions:
+
+ 1. The author is not responsible for the consequences of use of
+ this software, no matter how awful, even if they arise
+ from defects in it.
+
+ 2. The origin of this software must not be misrepresented, either
+ by explicit claim or by omission.
+
+ 3. Altered versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+
+ 4. This notice may not be removed or altered.
+
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "iniparser.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* strlib.c following */
+
+#define ASCIILINESZ 1024
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Convert a string to lowercase.
+ @param s String to convert.
+ @return ptr to statically allocated string.
+
+ This function returns a pointer to a statically allocated string
+ containing a lowercased version of the input string. Do not free
+ or modify the returned string! Since the returned string is statically
+ allocated, it will be modified at each function call (not re-entrant).
+ */
+/*--------------------------------------------------------------------------*/
+
+static char * strlwc(char * s)
+{
+ static char l[ASCIILINESZ+1];
+ int i ;
+
+ if (s==NULL) return NULL ;
+ memset(l, 0, ASCIILINESZ+1);
+ i=0 ;
+ while (s[i] && i<ASCIILINESZ) {
+ l[i] = (char)tolower((int)s[i]);
+ i++ ;
+ }
+ l[ASCIILINESZ]=(char)0;
+ return l ;
+}
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Skip blanks until the first non-blank character.
+ @param s String to parse.
+ @return Pointer to char inside given string.
+
+ This function returns a pointer to the first non-blank character in the
+ given string.
+ */
+/*--------------------------------------------------------------------------*/
+
+static char * strskp(char * s)
+{
+ char * skip = s;
+ if (s==NULL) return NULL ;
+ while (isspace((int)*skip) && *skip) skip++;
+ return skip ;
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Remove blanks at the end of a string.
+ @param s String to parse.
+ @return ptr to statically allocated string.
+
+ This function returns a pointer to a statically allocated string,
+ which is identical to the input string, except that all blank
+ characters at the end of the string have been removed.
+ Do not free or modify the returned string! Since the returned string
+ is statically allocated, it will be modified at each function call
+ (not re-entrant).
+ */
+/*--------------------------------------------------------------------------*/
+
+static char * strcrop(char * s)
+{
+ static char l[ASCIILINESZ+1];
+ char * last ;
+
+ if (s==NULL) return NULL ;
+ memset(l, 0, ASCIILINESZ+1);
+ strcpy(l, s);
+ last = l + strlen(l);
+ while (last > l) {
+ if (!isspace((int)*(last-1)))
+ break ;
+ last -- ;
+ }
+ *last = (char)0;
+ return l ;
+}
+
+
+/* dictionary.c.c following */
+/** Maximum value size for integers and doubles. */
+#define MAXVALSZ 1024
+
+/** Minimal allocated number of entries in a dictionary */
+#define DICTMINSZ 128
+
+/** Invalid key token */
+#define DICT_INVALID_KEY ((char*)-1)
+
+/*
+ Doubles the allocated size associated to a pointer
+ 'size' is the current allocated size.
+ */
+static void * mem_double(void * ptr, int size)
+{
+ void *newptr;
+
+ newptr = calloc(2*size, 1);
+ memcpy(newptr, ptr, size);
+ free(ptr);
+ return newptr ;
+}
+
+
+/*---------------------------------------------------------------------------
+ Function codes
+ ---------------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Compute the hash key for a string.
+ @param key Character string to use for key.
+ @return 1 unsigned int on at least 32 bits.
+
+ This hash function has been taken from an Article in Dr Dobbs Journal.
+ This is normally a collision-free function, distributing keys evenly.
+ The key is stored anyway in the struct so that collision can be avoided
+ by comparing the key itself in last resort.
+ */
+/*--------------------------------------------------------------------------*/
+
+static unsigned dictionary_hash(char * key)
+{
+ int len ;
+ unsigned hash ;
+ int i ;
+
+ len = strlen(key);
+ for (hash=0, i=0 ; i<len ; i++) {
+ hash += (unsigned)key[i] ;
+ hash += (hash<<10);
+ hash ^= (hash>>6) ;
+ }
+ hash += (hash <<3);
+ hash ^= (hash >>11);
+ hash += (hash <<15);
+ return hash ;
+}
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Create a new dictionary object.
+ @param size Optional initial size of the dictionary.
+ @return 1 newly allocated dictionary objet.
+
+ This function allocates a new dictionary object of given size and returns
+ it. If you do not know in advance (roughly) the number of entries in the
+ dictionary, give size=0.
+ */
+/*--------------------------------------------------------------------------*/
+
+static dictionary * dictionary_new(int size)
+{
+ dictionary *d ;
+
+ /* If no size was specified, allocate space for DICTMINSZ */
+ if (size<DICTMINSZ) size=DICTMINSZ ;
+
+ d = (dictionary *)calloc(1, sizeof(dictionary));
+ d->size = size ;
+ d->val = (char **)calloc(size, sizeof(char*));
+ d->key = (char **)calloc(size, sizeof(char*));
+ d->hash = (unsigned int *)calloc(size, sizeof(unsigned));
+
+ return d;
+}
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Delete a dictionary object
+ @param d dictionary object to deallocate.
+ @return void
+
+ Deallocate a dictionary object and all memory associated to it.
+ */
+/*--------------------------------------------------------------------------*/
+
+static void dictionary_del(dictionary * d)
+{
+ int i ;
+
+ if (d==NULL) return ;
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key[i]!=NULL)
+ free(d->key[i]);
+ if (d->val[i]!=NULL)
+ free(d->val[i]);
+ }
+ free(d->val);
+ free(d->key);
+ free(d->hash);
+ free(d);
+
+ return;
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Get a value from a dictionary.
+ @param d dictionary object to search.
+ @param key Key to look for in the dictionary.
+ @param def Default value to return if key not found.
+ @return 1 pointer to internally allocated character string.
+
+ This function locates a key in a dictionary and returns a pointer to its
+ value, or the passed 'def' pointer if no such key can be found in
+ dictionary. The returned character pointer points to data internal to the
+ dictionary object, you should not try to free it or modify it.
+ */
+/*--------------------------------------------------------------------------*/
+static char * dictionary_get(dictionary * d, char * key, char * def)
+{
+ unsigned hash ;
+ int i ;
+
+ hash = dictionary_hash(key);
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key==NULL)
+ continue ;
+ /* Compare hash */
+ if (hash==d->hash[i]) {
+ /* Compare string, to avoid hash collisions */
+ if (!strcmp(key, d->key[i])) {
+ return d->val[i] ;
+ }
+ }
+ }
+ return def ;
+}
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Set a value in a dictionary.
+ @param d dictionary object to modify.
+ @param key Key to modify or add.
+ @param val Value to add.
+ @return void
+
+ If the given key is found in the dictionary, the associated value is
+ replaced by the provided one. If the key cannot be found in the
+ dictionary, it is added to it.
+
+ It is Ok to provide a NULL value for val, but NULL values for the dictionary
+ or the key are considered as errors: the function will return immediately
+ in such a case.
+
+ Notice that if you dictionary_set a variable to NULL, a call to
+ dictionary_get will return a NULL value: the variable will be found, and
+ its value (NULL) is returned. In other words, setting the variable
+ content to NULL is equivalent to deleting the variable from the
+ dictionary. It is not possible (in this implementation) to have a key in
+ the dictionary without value.
+ */
+/*--------------------------------------------------------------------------*/
+
+static void dictionary_set(dictionary * d, char * key, char * val)
+{
+ int i ;
+ unsigned hash ;
+
+ if (d==NULL || key==NULL) return ;
+
+ /* Compute hash for this key */
+ hash = dictionary_hash(key) ;
+ /* Find if value is already in blackboard */
+ if (d->n>0) {
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key[i]==NULL)
+ continue ;
+ if (hash==d->hash[i]) { /* Same hash value */
+ if (!strcmp(key, d->key[i])) { /* Same key */
+ /* Found a value: modify and return */
+ if (d->val[i]!=NULL)
+ free(d->val[i]);
+ d->val[i] = val ? strdup(val) : NULL ;
+ /* Value has been modified: return */
+ return ;
+ }
+ }
+ }
+ }
+ /* Add a new value */
+ /* See if dictionary needs to grow */
+ if (d->n==d->size) {
+
+ /* Reached maximum size: reallocate blackboard */
+ d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ;
+ d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ;
+ d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ;
+
+ /* Double size */
+ d->size *= 2 ;
+ }
+
+ /* Insert key in the first empty slot */
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key[i]==NULL) {
+ /* Add key here */
+ break ;
+ }
+ }
+ /* Copy key */
+ d->key[i] = strdup(key);
+ d->val[i] = val ? strdup(val) : NULL ;
+ d->hash[i] = hash;
+ d->n ++ ;
+ return ;
+}
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Delete a key in a dictionary
+ @param d dictionary object to modify.
+ @param key Key to remove.
+ @return void
+
+ This function deletes a key in a dictionary. Nothing is done if the
+ key cannot be found.
+ */
+/*--------------------------------------------------------------------------*/
+static void dictionary_unset(dictionary * d, char * key)
+{
+ unsigned hash ;
+ int i ;
+
+ hash = dictionary_hash(key);
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key[i]==NULL)
+ continue ;
+ /* Compare hash */
+ if (hash==d->hash[i]) {
+ /* Compare string, to avoid hash collisions */
+ if (!strcmp(key, d->key[i])) {
+ /* Found key */
+ break ;
+ }
+ }
+ }
+ if (i>=d->size)
+ /* Key not found */
+ return ;
+
+ free(d->key[i]);
+ d->key[i] = NULL ;
+ if (d->val[i]!=NULL) {
+ free(d->val[i]);
+ d->val[i] = NULL ;
+ }
+ d->hash[i] = 0 ;
+ d->n -- ;
+ return ;
+}
+
+/* iniparser.c.c following */
+#define ASCIILINESZ 1024
+#define INI_INVALID_KEY ((char*)-1)
+
+/* Private: add an entry to the dictionary */
+static void iniparser_add_entry(
+ dictionary * d,
+ char * sec,
+ char * key,
+ char * val)
+{
+ char longkey[2*ASCIILINESZ+1];
+
+ /* Make a key as section:keyword */
+ if (key!=NULL) {
+ sprintf(longkey, "%s:%s", sec, key);
+ } else {
+ strcpy(longkey, sec);
+ }
+
+ /* Add (key,val) to dictionary */
+ dictionary_set(d, longkey, val);
+ return ;
+}
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Get number of sections in a dictionary
+ @param d Dictionary to examine
+ @return int Number of sections found in dictionary
+
+ This function returns the number of sections found in a dictionary.
+ The test to recognize sections is done on the string stored in the
+ dictionary: a section name is given as "section" whereas a key is
+ stored as "section:key", thus the test looks for entries that do not
+ contain a colon.
+
+ This clearly fails in the case a section name contains a colon, but
+ this should simply be avoided.
+
+ This function returns -1 in case of error.
+ */
+/*--------------------------------------------------------------------------*/
+
+int iniparser_getnsec(dictionary * d)
+{
+ int i ;
+ int nsec ;
+
+ if (d==NULL) return -1 ;
+ nsec=0 ;
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key[i]==NULL)
+ continue ;
+ if (strchr(d->key[i], ':')==NULL) {
+ nsec ++ ;
+ }
+ }
+ return nsec ;
+}
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Get name for section n in a dictionary.
+ @param d Dictionary to examine
+ @param n Section number (from 0 to nsec-1).
+ @return Pointer to char string
+
+ This function locates the n-th section in a dictionary and returns
+ its name as a pointer to a string statically allocated inside the
+ dictionary. Do not free or modify the returned string!
+
+ This function returns NULL in case of error.
+ */
+/*--------------------------------------------------------------------------*/
+
+char * iniparser_getsecname(dictionary * d, int n)
+{
+ int i ;
+ int foundsec ;
+
+ if (d==NULL || n<0) return NULL ;
+ foundsec=0 ;
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key[i]==NULL)
+ continue ;
+ if (strchr(d->key[i], ':')==NULL) {
+ foundsec++ ;
+ if (foundsec>n)
+ break ;
+ }
+ }
+ if (foundsec<=n) {
+ return NULL ;
+ }
+ return d->key[i] ;
+}
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Save a dictionary to a loadable ini file
+ @param d Dictionary to dump
+ @param f Opened file pointer to dump to
+ @return void
+
+ This function dumps a given dictionary into a loadable ini file.
+ It is Ok to specify @c stderr or @c stdout as output files.
+ */
+/*--------------------------------------------------------------------------*/
+
+void iniparser_dump_ini(dictionary * d, FILE * f)
+{
+ int i, j ;
+ char keym[ASCIILINESZ+1];
+ int nsec ;
+ char * secname ;
+ int seclen ;
+
+ if (d==NULL || f==NULL) return ;
+
+ nsec = iniparser_getnsec(d);
+ if (nsec<1) {
+ /* No section in file: dump all keys as they are */
+ for (i=0 ; i<d->size ; i++) {
+ if (d->key[i]==NULL)
+ continue ;
+ fprintf(f, "%s = %s\n", d->key[i], d->val[i]);
+ }
+ return ;
+ }
+ for (i=0 ; i<nsec ; i++) {
+ secname = iniparser_getsecname(d, i) ;
+ seclen = (int)strlen(secname);
+ fprintf(f, "\n[%s]\n", secname);
+ sprintf(keym, "%s:", secname);
+ for (j=0 ; j<d->size ; j++) {
+ if (d->key[j]==NULL)
+ continue ;
+ if (!strncmp(d->key[j], keym, seclen+1)) {
+ fprintf(f,
+ "%-30s = %s\n",
+ d->key[j]+seclen+1,
+ d->val[j] ? d->val[j] : "");
+ }
+ }
+ }
+ fprintf(f, "\n");
+ return ;
+}
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Get the string associated to a key
+ @param d Dictionary to search
+ @param key Key string to look for
+ @param def Default value to return if key not found.
+ @return pointer to statically allocated character string
+
+ This function queries a dictionary for a key. A key as read from an
+ ini file is given as "section:key". If the key cannot be found,
+ the pointer passed as 'def' is returned.
+ The returned char pointer is pointing to a string allocated in
+ the dictionary, do not free or modify it.
+ */
+/*--------------------------------------------------------------------------*/
+char * iniparser_getstring(dictionary * d, char * key, char * def)
+{
+ char * lc_key ;
+ char * sval ;
+
+ if (d==NULL || key==NULL)
+ return def ;
+
+ lc_key = strdup(strlwc(key));
+ sval = dictionary_get(d, lc_key, def);
+ free(lc_key);
+ return sval ;
+}
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Finds out if a given entry exists in a dictionary
+ @param ini Dictionary to search
+ @param entry Name of the entry to look for
+ @return integer 1 if entry exists, 0 otherwise
+
+ Finds out if a given entry exists in the dictionary. Since sections
+ are stored as keys with NULL associated values, this is the only way
+ of querying for the presence of sections in a dictionary.
+ */
+/*--------------------------------------------------------------------------*/
+
+int iniparser_find_entry(
+ dictionary * ini,
+ char * entry
+)
+{
+ int found=0 ;
+ if (iniparser_getstring(ini, entry, INI_INVALID_KEY)!=INI_INVALID_KEY) {
+ found = 1 ;
+ }
+ return found ;
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Set an entry in a dictionary.
+ @param ini Dictionary to modify.
+ @param entry Entry to modify (entry name)
+ @param val New value to associate to the entry.
+ @return int 0 if Ok, -1 otherwise.
+
+ If the given entry can be found in the dictionary, it is modified to
+ contain the provided value. If it cannot be found, -1 is returned.
+ It is Ok to set val to NULL.
+ */
+/*--------------------------------------------------------------------------*/
+
+int iniparser_setstr(dictionary * ini, char * entry, char * val)
+{
+ dictionary_set(ini, strlwc(entry), val);
+ return 0 ;
+}
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Delete an entry in a dictionary
+ @param ini Dictionary to modify
+ @param entry Entry to delete (entry name)
+ @return void
+
+ If the given entry can be found, it is deleted from the dictionary.
+ */
+/*--------------------------------------------------------------------------*/
+void iniparser_unset(dictionary * ini, char * entry)
+{
+ dictionary_unset(ini, strlwc(entry));
+}
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Parse an ini file and return an allocated dictionary object
+ @param ininame Name of the ini file to read.
+ @return Pointer to newly allocated dictionary
+
+ This is the parser for ini files. This function is called, providing
+ the name of the file to be read. It returns a dictionary object that
+ should not be accessed directly, but through accessor functions
+ instead.
+
+ The returned dictionary must be freed using iniparser_free().
+ */
+/*--------------------------------------------------------------------------*/
+
+dictionary * iniparser_new(char *ininame)
+{
+ dictionary * d ;
+ char lin[ASCIILINESZ+1];
+ char sec[ASCIILINESZ+1];
+ char key[ASCIILINESZ+1];
+ char val[ASCIILINESZ+1];
+ char * where ;
+ FILE * ini ;
+ int lineno ;
+
+ if ((ini=fopen(ininame, "r"))==NULL) {
+ return NULL ;
+ }
+
+ sec[0]=0;
+
+ /*
+ * Initialize a new dictionary entry
+ */
+ d = dictionary_new(0);
+ lineno = 0 ;
+ while (fgets(lin, ASCIILINESZ, ini)!=NULL) {
+ lineno++ ;
+ where = strskp(lin); /* Skip leading spaces */
+ if (*where==';' || *where=='#' || *where==0)
+ continue ; /* Comment lines */
+ else {
+ if (sscanf(where, "[%[^]]", sec)==1) {
+ /* Valid section name */
+ strcpy(sec, strlwc(sec));
+ iniparser_add_entry(d, sec, NULL, NULL);
+ } else if (sscanf (where, "%[^=] = \"%[^\"]\"", key, val) == 2
+ || sscanf (where, "%[^=] = '%[^\']'", key, val) == 2
+ || sscanf (where, "%[^=] = %[^;#]", key, val) == 2) {
+ strcpy(key, strlwc(strcrop(key)));
+ /*
+ * sscanf cannot handle "" or '' as empty value,
+ * this is done here
+ */
+ if (!strcmp(val, "\"\"") || !strcmp(val, "''")) {
+ val[0] = (char)0;
+ } else {
+ strcpy(val, strcrop(val));
+ }
+ iniparser_add_entry(d, sec, key, val);
+ }
+ }
+ }
+ fclose(ini);
+ return d ;
+}
+
+
+
+/*-------------------------------------------------------------------------*/
+/**
+ @brief Free all memory associated to an ini dictionary
+ @param d Dictionary to free
+ @return void
+
+ Free all memory associated to an ini dictionary.
+ It is mandatory to call this function before the dictionary object
+ gets out of the current context.
+ */
+/*--------------------------------------------------------------------------*/
+
+void iniparser_free(dictionary * d)
+{
+ dictionary_del(d);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/iniparser.h b/src/iniparser.h
new file mode 100644
index 0000000..ef927e2
--- /dev/null
+++ b/src/iniparser.h
@@ -0,0 +1,57 @@
+/*
+ Based upon libiniparser, by Nicolas Devillard
+ Hacked into 1 file (m-iniparser) by Freek/2005
+ Original terms following:
+
+ -- -
+
+ Copyright (c) 2000 by Nicolas Devillard (ndevilla AT free DOT fr).
+
+ Written by Nicolas Devillard. Not derived from licensed software.
+
+ Permission is granted to anyone to use this software for any
+ purpose on any computer system, and to redistribute it freely,
+ subject to the following restrictions:
+
+ 1. The author is not responsible for the consequences of use of
+ this software, no matter how awful, even if they arise
+ from defects in it.
+
+ 2. The origin of this software must not be misrepresented, either
+ by explicit claim or by omission.
+
+ 3. Altered versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+
+ 4. This notice may not be removed or altered.
+
+ */
+
+
+#ifndef _INIPARSER_H_
+#define _INIPARSER_H_
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+
+#include <bsettings.h>
+
+typedef IniDictionary dictionary;
+
+/* generated by genproto */
+
+dictionary * iniparser_new(char *ininame);
+void iniparser_free(dictionary * d);
+
+int iniparser_getnsec(dictionary * d);
+char * iniparser_getsecname(dictionary * d, int n);
+void iniparser_dump_ini(dictionary * d, FILE * f);
+char * iniparser_getstring(dictionary * d, char * key, char * def);
+int iniparser_find_entry(dictionary * ini, char * entry);
+int iniparser_setstr(dictionary * ini, char * entry, char * val);
+void iniparser_unset(dictionary * ini, char * entry);
+
+#endif
+
diff --git a/backend/Makefile.am b/backend/Makefile.am
index 789c89d..00c2fea 100644
--- a/backend/Makefile.am
+++ b/backend/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = \
-DLIBDIR=\"$(libdir)\"
-libini_la_SOURCES=ini.c iniparser.c dictionary.c strlib.c
+libini_la_SOURCES=ini.c
lib_LTLIBRARIES=libini.la
diff --git a/backend/dictionary.c b/backend/dictionary.c
deleted file mode 100644
index e82996f..0000000
--- a/backend/dictionary.c
+++ /dev/null
@@ -1,508 +0,0 @@
-
-/*-------------------------------------------------------------------------*/
-/**
- @file dictionary.c
- @author N. Devillard
- @date Aug 2000
- @version $Revision: 1.24 $
- @brief Implements a dictionary for string variables.
-
- This module implements a simple dictionary object, i.e. a list
- of string/string associations. This object is useful to store e.g.
- informations retrieved from a configuration file (ini files).
-*/
-/*--------------------------------------------------------------------------*/
-
-/*
- $Id: dictionary.c,v 1.24 2006-09-27 11:02:22 ndevilla Exp $
- $Author: ndevilla $
- $Date: 2006-09-27 11:02:22 $
- $Revision: 1.24 $
-*/
-
-/*---------------------------------------------------------------------------
- Includes
- ---------------------------------------------------------------------------*/
-
-#include "dictionary.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-
-/** Maximum value size for integers and doubles. */
-#define MAXVALSZ 1024
-
-/** Minimal allocated number of entries in a dictionary */
-#define DICTMINSZ 128
-
-/** Invalid key token */
-#define DICT_INVALID_KEY ((char*)-1)
-
-
-/*---------------------------------------------------------------------------
- Private functions
- ---------------------------------------------------------------------------*/
-
-/* Doubles the allocated size associated to a pointer */
-/* 'size' is the current allocated size. */
-static void * mem_double(void * ptr, int size)
-{
- void * newptr ;
-
- newptr = calloc(2*size, 1);
- memcpy(newptr, ptr, size);
- free(ptr);
- return newptr ;
-}
-
-
-/*---------------------------------------------------------------------------
- Function codes
- ---------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Compute the hash key for a string.
- @param key Character string to use for key.
- @return 1 unsigned int on at least 32 bits.
-
- This hash function has been taken from an Article in Dr Dobbs Journal.
- This is normally a collision-free function, distributing keys evenly.
- The key is stored anyway in the struct so that collision can be avoided
- by comparing the key itself in last resort.
- */
-/*--------------------------------------------------------------------------*/
-
-unsigned dictionary_hash(char * key)
-{
- int len ;
- unsigned hash ;
- int i ;
-
- len = strlen(key);
- for (hash=0, i=0 ; i<len ; i++) {
- hash += (unsigned)key[i] ;
- hash += (hash<<10);
- hash ^= (hash>>6) ;
- }
- hash += (hash <<3);
- hash ^= (hash >>11);
- hash += (hash <<15);
- return hash ;
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Create a new dictionary object.
- @param size Optional initial size of the dictionary.
- @return 1 newly allocated dictionary objet.
-
- This function allocates a new dictionary object of given size and returns
- it. If you do not know in advance (roughly) the number of entries in the
- dictionary, give size=0.
- */
-/*--------------------------------------------------------------------------*/
-
-dictionary * dictionary_new(int size)
-{
- dictionary * d ;
-
- /* If no size was specified, allocate space for DICTMINSZ */
- if (size<DICTMINSZ) size=DICTMINSZ ;
-
- d = (dictionary *)calloc(1, sizeof(dictionary));
- d->size = size ;
- d->val = (char **)calloc(size, sizeof(char*));
- d->key = (char **)calloc(size, sizeof(char*));
- d->hash = (unsigned int *)calloc(size, sizeof(unsigned));
- return d ;
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Delete a dictionary object
- @param d dictionary object to deallocate.
- @return void
-
- Deallocate a dictionary object and all memory associated to it.
- */
-/*--------------------------------------------------------------------------*/
-
-void dictionary_del(dictionary * d)
-{
- int i ;
-
- if (d==NULL) return ;
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]!=NULL)
- free(d->key[i]);
- if (d->val[i]!=NULL)
- free(d->val[i]);
- }
- free(d->val);
- free(d->key);
- free(d->hash);
- free(d);
- return ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value to return if key not found.
- @return 1 pointer to internally allocated character string.
-
- This function locates a key in a dictionary and returns a pointer to its
- value, or the passed 'def' pointer if no such key can be found in
- dictionary. The returned character pointer points to data internal to the
- dictionary object, you should not try to free it or modify it.
- */
-/*--------------------------------------------------------------------------*/
-char * dictionary_get(dictionary * d, char * key, char * def)
-{
- unsigned hash ;
- int i ;
-
- hash = dictionary_hash(key);
- for (i=0 ; i<d->size ; i++) {
- if (d->key==NULL)
- continue ;
- /* Compare hash */
- if (hash==d->hash[i]) {
- /* Compare string, to avoid hash collisions */
- if (!strcmp(key, d->key[i])) {
- return d->val[i] ;
- }
- }
- }
- return def ;
-}
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary, as a char.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value for the key if not found.
- @return char
-
- This function locates a key in a dictionary using dictionary_get,
- and returns the first char of the found string.
- */
-/*--------------------------------------------------------------------------*/
-char dictionary_getchar(dictionary * d, char * key, char def)
-{
- char * v ;
-
- if ((v=dictionary_get(d,key,DICT_INVALID_KEY))==DICT_INVALID_KEY) {
- return def ;
- } else {
- return v[0] ;
- }
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary, as an int.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value for the key if not found.
- @return int
-
- This function locates a key in a dictionary using dictionary_get,
- and applies atoi on it to return an int. If the value cannot be found
- in the dictionary, the default is returned.
- */
-/*--------------------------------------------------------------------------*/
-int dictionary_getint(dictionary * d, char * key, int def)
-{
- char * v ;
-
- if ((v=dictionary_get(d,key,DICT_INVALID_KEY))==DICT_INVALID_KEY) {
- return def ;
- } else {
- return atoi(v);
- }
-}
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary, as a double.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value for the key if not found.
- @return double
-
- This function locates a key in a dictionary using dictionary_get,
- and applies atof on it to return a double. If the value cannot be found
- in the dictionary, the default is returned.
- */
-/*--------------------------------------------------------------------------*/
-double dictionary_getdouble(dictionary * d, char * key, double def)
-{
- char * v ;
-
- if ((v=dictionary_get(d,key,DICT_INVALID_KEY))==DICT_INVALID_KEY) {
- return def ;
- } else {
- return atof(v);
- }
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set a value in a dictionary.
- @param d dictionary object to modify.
- @param key Key to modify or add.
- @param val Value to add.
- @return void
-
- If the given key is found in the dictionary, the associated value is
- replaced by the provided one. If the key cannot be found in the
- dictionary, it is added to it.
-
- It is Ok to provide a NULL value for val, but NULL values for the dictionary
- or the key are considered as errors: the function will return immediately
- in such a case.
-
- Notice that if you dictionary_set a variable to NULL, a call to
- dictionary_get will return a NULL value: the variable will be found, and
- its value (NULL) is returned. In other words, setting the variable
- content to NULL is equivalent to deleting the variable from the
- dictionary. It is not possible (in this implementation) to have a key in
- the dictionary without value.
- */
-/*--------------------------------------------------------------------------*/
-
-void dictionary_set(dictionary * d, char * key, char * val)
-{
- int i ;
- unsigned hash ;
-
- if (d==NULL || key==NULL) return ;
-
- /* Compute hash for this key */
- hash = dictionary_hash(key) ;
- /* Find if value is already in blackboard */
- if (d->n>0) {
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]==NULL)
- continue ;
- if (hash==d->hash[i]) { /* Same hash value */
- if (!strcmp(key, d->key[i])) { /* Same key */
- /* Found a value: modify and return */
- if (d->val[i]!=NULL)
- free(d->val[i]);
- d->val[i] = val ? strdup(val) : NULL ;
- /* Value has been modified: return */
- return ;
- }
- }
- }
- }
- /* Add a new value */
- /* See if dictionary needs to grow */
- if (d->n==d->size) {
-
- /* Reached maximum size: reallocate blackboard */
- d->val = (char **)mem_double(d->val, d->size * sizeof(char*)) ;
- d->key = (char **)mem_double(d->key, d->size * sizeof(char*)) ;
- d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned)) ;
-
- /* Double size */
- d->size *= 2 ;
- }
-
- /* Insert key in the first empty slot */
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]==NULL) {
- /* Add key here */
- break ;
- }
- }
- /* Copy key */
- d->key[i] = strdup(key);
- d->val[i] = val ? strdup(val) : NULL ;
- d->hash[i] = hash;
- d->n ++ ;
- return ;
-}
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Delete a key in a dictionary
- @param d dictionary object to modify.
- @param key Key to remove.
- @return void
-
- This function deletes a key in a dictionary. Nothing is done if the
- key cannot be found.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_unset(dictionary * d, char * key)
-{
- unsigned hash ;
- int i ;
-
- hash = dictionary_hash(key);
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]==NULL)
- continue ;
- /* Compare hash */
- if (hash==d->hash[i]) {
- /* Compare string, to avoid hash collisions */
- if (!strcmp(key, d->key[i])) {
- /* Found key */
- break ;
- }
- }
- }
- if (i>=d->size)
- /* Key not found */
- return ;
-
- free(d->key[i]);
- d->key[i] = NULL ;
- if (d->val[i]!=NULL) {
- free(d->val[i]);
- d->val[i] = NULL ;
- }
- d->hash[i] = 0 ;
- d->n -- ;
- return ;
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set a key in a dictionary, providing an int.
- @param d Dictionary to update.
- @param key Key to modify or add
- @param val Integer value to store (will be stored as a string).
- @return void
-
- This helper function calls dictionary_set() with the provided integer
- converted to a string using %d.
- */
-/*--------------------------------------------------------------------------*/
-
-
-void dictionary_setint(dictionary * d, char * key, int val)
-{
- char sval[MAXVALSZ];
- sprintf(sval, "%d", val);
- dictionary_set(d, key, sval);
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set a key in a dictionary, providing a double.
- @param d Dictionary to update.
- @param key Key to modify or add
- @param val Double value to store (will be stored as a string).
- @return void
-
- This helper function calls dictionary_set() with the provided double
- converted to a string using %g.
- */
-/*--------------------------------------------------------------------------*/
-
-
-void dictionary_setdouble(dictionary * d, char * key, double val)
-{
- char sval[MAXVALSZ];
- sprintf(sval, "%g", val);
- dictionary_set(d, key, sval);
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Dump a dictionary to an opened file pointer.
- @param d Dictionary to dump
- @param f Opened file pointer.
- @return void
-
- Dumps a dictionary onto an opened file pointer. Key pairs are printed out
- as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as
- output file pointers.
- */
-/*--------------------------------------------------------------------------*/
-
-void dictionary_dump(dictionary * d, FILE * out)
-{
- int i ;
-
- if (d==NULL || out==NULL) return ;
- if (d->n<1) {
- fprintf(out, "empty dictionary\n");
- return ;
- }
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]) {
- fprintf(out, "%20s\t[%s]\n",
- d->key[i],
- d->val[i] ? d->val[i] : "UNDEF");
- }
- }
- return ;
-}
-
-
-
-/* Example code */
-#ifdef TESTDIC
-#define NVALS 20000
-int main(int argc, char *argv[])
-{
- dictionary * d ;
- char * val ;
- int i ;
- char cval[90] ;
-
- /* allocate blackboard */
- printf("allocating...\n");
- d = dictionary_new(0);
-
- /* Set values in blackboard */
- printf("setting %d values...\n", NVALS);
- for (i=0 ; i<NVALS ; i++) {
- sprintf(cval, "%04d", i);
- dictionary_set(d, cval, "salut");
- }
- printf("getting %d values...\n", NVALS);
- for (i=0 ; i<NVALS ; i++) {
- sprintf(cval, "%04d", i);
- val = dictionary_get(d, cval, DICT_INVALID_KEY);
- if (val==DICT_INVALID_KEY) {
- printf("cannot get value for key [%s]\n", cval);
- }
- }
- printf("unsetting %d values...\n", NVALS);
- for (i=0 ; i<NVALS ; i++) {
- sprintf(cval, "%04d", i);
- dictionary_unset(d, cval);
- }
- if (d->n != 0) {
- printf("error deleting values\n");
- }
-
- printf("deallocating...\n");
- dictionary_del(d);
- return 0 ;
-}
-#endif
-/* vim: set ts=4 et sw=4 tw=75 */
diff --git a/backend/dictionary.h b/backend/dictionary.h
deleted file mode 100644
index b332680..0000000
--- a/backend/dictionary.h
+++ /dev/null
@@ -1,244 +0,0 @@
-
-/*-------------------------------------------------------------------------*/
-/**
- @file dictionary.h
- @author N. Devillard
- @date Aug 2000
- @version $Revision: 1.11 $
- @brief Implements a dictionary for string variables.
-
- This module implements a simple dictionary object, i.e. a list
- of string/string associations. This object is useful to store e.g.
- informations retrieved from a configuration file (ini files).
-*/
-/*--------------------------------------------------------------------------*/
-
-/*
- $Id: dictionary.h,v 1.11 2002-06-17 09:30:46 ndevilla Exp $
- $Author: ndevilla $
- $Date: 2002-06-17 09:30:46 $
- $Revision: 1.11 $
-*/
-
-#ifndef _DICTIONARY_H_
-#define _DICTIONARY_H_
-
-/*---------------------------------------------------------------------------
- Includes
- ---------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/*---------------------------------------------------------------------------
- New types
- ---------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Dictionary object
-
- This object contains a list of string/string associations. Each
- association is identified by a unique string key. Looking up values
- in the dictionary is speeded up by the use of a (hopefully collision-free)
- hash function.
- */
-/*-------------------------------------------------------------------------*/
-typedef struct _dictionary_ {
- int n ; /** Number of entries in dictionary */
- int size ; /** Storage size */
- char ** val ; /** List of string values */
- char ** key ; /** List of string keys */
- unsigned * hash ; /** List of hash values for keys */
-} dictionary ;
-
-
-/*---------------------------------------------------------------------------
- Function prototypes
- ---------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Compute the hash key for a string.
- @param key Character string to use for key.
- @return 1 unsigned int on at least 32 bits.
-
- This hash function has been taken from an Article in Dr Dobbs Journal.
- This is normally a collision-free function, distributing keys evenly.
- The key is stored anyway in the struct so that collision can be avoided
- by comparing the key itself in last resort.
- */
-/*--------------------------------------------------------------------------*/
-unsigned dictionary_hash(char * key);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Create a new dictionary object.
- @param size Optional initial size of the dictionary.
- @return 1 newly allocated dictionary objet.
-
- This function allocates a new dictionary object of given size and returns
- it. If you do not know in advance (roughly) the number of entries in the
- dictionary, give size=0.
- */
-/*--------------------------------------------------------------------------*/
-dictionary * dictionary_new(int size);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Delete a dictionary object
- @param d dictionary object to deallocate.
- @return void
-
- Deallocate a dictionary object and all memory associated to it.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_del(dictionary * vd);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value to return if key not found.
- @return 1 pointer to internally allocated character string.
-
- This function locates a key in a dictionary and returns a pointer to its
- value, or the passed 'def' pointer if no such key can be found in
- dictionary. The returned character pointer points to data internal to the
- dictionary object, you should not try to free it or modify it.
- */
-/*--------------------------------------------------------------------------*/
-char * dictionary_get(dictionary * d, char * key, char * def);
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary, as a char.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value for the key if not found.
- @return char
-
- This function locates a key in a dictionary using dictionary_get,
- and returns the first char of the found string.
- */
-/*--------------------------------------------------------------------------*/
-char dictionary_getchar(dictionary * d, char * key, char def) ;
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary, as an int.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value for the key if not found.
- @return int
-
- This function locates a key in a dictionary using dictionary_get,
- and applies atoi on it to return an int. If the value cannot be found
- in the dictionary, the default is returned.
- */
-/*--------------------------------------------------------------------------*/
-int dictionary_getint(dictionary * d, char * key, int def);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get a value from a dictionary, as a double.
- @param d dictionary object to search.
- @param key Key to look for in the dictionary.
- @param def Default value for the key if not found.
- @return double
-
- This function locates a key in a dictionary using dictionary_get,
- and applies atof on it to return a double. If the value cannot be found
- in the dictionary, the default is returned.
- */
-/*--------------------------------------------------------------------------*/
-double dictionary_getdouble(dictionary * d, char * key, double def);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set a value in a dictionary.
- @param d dictionary object to modify.
- @param key Key to modify or add.
- @param val Value to add.
- @return void
-
- If the given key is found in the dictionary, the associated value is
- replaced by the provided one. If the key cannot be found in the
- dictionary, it is added to it.
-
- It is Ok to provide a NULL value for val, but NULL values for the dictionary
- or the key are considered as errors: the function will return immediately
- in such a case.
-
- Notice that if you dictionary_set a variable to NULL, a call to
- dictionary_get will return a NULL value: the variable will be found, and
- its value (NULL) is returned. In other words, setting the variable
- content to NULL is equivalent to deleting the variable from the
- dictionary. It is not possible (in this implementation) to have a key in
- the dictionary without value.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_set(dictionary * vd, char * key, char * val);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Delete a key in a dictionary
- @param d dictionary object to modify.
- @param key Key to remove.
- @return void
-
- This function deletes a key in a dictionary. Nothing is done if the
- key cannot be found.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_unset(dictionary * d, char * key);
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set a key in a dictionary, providing an int.
- @param d Dictionary to update.
- @param key Key to modify or add
- @param val Integer value to store (will be stored as a string).
- @return void
-
- This helper function calls dictionary_set() with the provided integer
- converted to a string using %d.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_setint(dictionary * d, char * key, int val);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set a key in a dictionary, providing a double.
- @param d Dictionary to update.
- @param key Key to modify or add
- @param val Double value to store (will be stored as a string).
- @return void
-
- This helper function calls dictionary_set() with the provided double
- converted to a string using %g.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_setdouble(dictionary * d, char * key, double val);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Dump a dictionary to an opened file pointer.
- @param d Dictionary to dump
- @param f Opened file pointer.
- @return void
-
- Dumps a dictionary onto an opened file pointer. Key pairs are printed out
- as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as
- output file pointers.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_dump(dictionary * d, FILE * out);
-
-#endif
diff --git a/backend/ini.c b/backend/ini.c
index c2d5751..109d878 100644
--- a/backend/ini.c
+++ b/backend/ini.c
@@ -18,8 +18,6 @@
*
**/
-
-
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
@@ -48,7 +46,7 @@ typedef struct _IniPrivData
{
BSContext *context;
char * lastProfile;
- dictionary * iniFile;
+ IniDictionary * iniFile;
int iniWatchDesc;
Bool ignoreEvent;
} IniPrivData;
@@ -108,7 +106,7 @@ static void setProfile(IniPrivData *data, char *profile)
struct stat fileStat;
if (data->iniFile)
- iniparser_freedict (data->iniFile);
+ bsIniClose (data->iniFile);
data->iniFile = NULL;
@@ -136,288 +134,11 @@ static void setProfile(IniPrivData *data, char *profile)
updateNotify (data, fileName);
/* load the data from the file */
- data->iniFile = iniparser_load (fileName);
+ data->iniFile = bsIniOpen (fileName);
free (fileName);
}
-static Bool readActionValue (BSSettingActionValue * action, char * valueString)
-{
- char *value, *valueStart;
- char *token;
-
- memset (action, 0, sizeof(BSSettingActionValue));
- value = strdup (valueString);
- valueStart = value;
-
- token = strsep (&value, ",");
- if (!token)
- goto invalidaction;
-
- /* key binding */
- bsStringToKeyBinding (token, action);
-
- token = strsep (&value, ",");
- if (!token)
- goto invalidaction;
-
- /* button binding */
- bsStringToButtonBinding (token, action);
-
- token = strsep (&value, ",");
- if (!token)
- goto invalidaction;
-
- /* edge binding */
- bsStringToEdge (token, action);
-
- token = strsep (&value, ",");
- if (!token)
- goto invalidaction;
-
- /* edge button */
- action->edgeButton = strtoul (token, NULL, 10);
-
- /* bell */
- action->onBell = (strcmp (value, "true") == 0);
-
- free (valueStart);
-
- return TRUE;
-
-invalidaction:
- free (valueStart);
- return FALSE;
-}
-
-static char * writeActionValue (BSSettingActionValue * action)
-{
- char *keyBinding;
- char *buttonBinding;
- char *edge;
- char *actionString = NULL;
-
- keyBinding = bsKeyBindingToString (action);
- if (!keyBinding)
- keyBinding = strdup("");
-
- buttonBinding = bsButtonBindingToString (action);
- if (!buttonBinding)
- buttonBinding = strdup("");
-
- edge = bsEdgeToString (action);
- if (!edge)
- edge = strdup("");
-
- asprintf (&actionString, "%s,%s,%s,%d,%s\n", keyBinding,
- buttonBinding, edge, action->edgeButton,
- action->onBell ? "true" : "false");
-
- return actionString;
-}
-
-static Bool readListValue (IniPrivData *data, BSSetting * setting, char * keyName)
-{
- BSSettingValueList list = NULL;
- char *value, *valueStart, *valString;
- char *token;
- int nItems = 0, i = 0;
-
- valString = iniparser_getstring (data->iniFile, keyName, NULL);
- if (!valString)
- return FALSE;
-
- value = strdup (valString);
- valueStart = value;
-
- token = strsep (&value, ";");
- while (token)
- {
- token = strsep (&value, ";");
- nItems++;
- }
- value = valueStart;
-
- token = strsep (&value, ";");
-
- switch (setting->info.forList.listType)
- {
- case TypeString:
- case TypeMatch:
- {
- char **array = malloc (nItems * sizeof(char*));
- while (token)
- {
- array[i++] = strdup (token);
- token = strsep (&value, ";");
- }
- list = bsGetValueListFromStringArray (array, nItems, setting);
- for (i = 0; i < nItems; i++)
- free (array[i]);
- free (array);
- }
- break;
- case TypeColor:
- {
- BSSettingColorValue *array = malloc (nItems * sizeof(BSSettingColorValue));
- while (token)
- {
- memset(&array[i], 0, sizeof(BSSettingColorValue));
- bsStringToColor(token, &array[i]);
- token = strsep (&value, ";");
- i++;
- }
- list = bsGetValueListFromColorArray (array, nItems, setting);
- free (array);
- }
- break;
- case TypeBool:
- {
- Bool *array = malloc (nItems * sizeof(Bool));
- Bool isTrue;
- while (token)
- {
- isTrue = (token[0] == 'y' || token[0] == 'Y' || token[0] == '1' ||
- token[0] == 't' || token[0] == 'T');
- array[i++] = isTrue;
- token = strsep (&value, ";");
- }
- list = bsGetValueListFromBoolArray (array, nItems, setting);
- free (array);
- }
- break;
- case TypeInt:
- {
- int *array = malloc (nItems * sizeof(int));
- while (token)
- {
- array[i++] = strtoul (token, NULL, 10);
- token = strsep (&value, ";");
- }
- list = bsGetValueListFromIntArray (array, nItems, setting);
- free (array);
- }
- break;
- case TypeFloat:
- {
- float *array = malloc (nItems * sizeof(float));
- while (token)
- {
- array[i++] = strtod (token, NULL);
- token = strsep (&value, ";");
- }
- list = bsGetValueListFromFloatArray (array, nItems, setting);
- free (array);
- }
- break;
- case TypeAction:
- {
- BSSettingActionValue *array = malloc (nItems * sizeof(BSSettingActionValue));
- while (token)
- {
- readActionValue (&array[i++], token);
- token = strsep (&value, ";");
- }
- list = bsGetValueListFromActionArray (array, nItems, setting);
- free (array);
- }
- break;
- default:
- break;
- }
-
- if (list)
- {
- bsSetList (setting, list);
- bsSettingValueListFree (list, TRUE);
- free (valueStart);
- return TRUE;
- }
-
- free (valueStart);
-
- return FALSE;
-}
-
-static void writeListValue (IniPrivData *data, BSSetting * setting, char * keyName)
-{
-#define STRINGBUFSIZE 2048
- char stringBuffer[STRINGBUFSIZE]; //FIXME: we should allocate that dynamically
- BSSettingValueList list;
-
- if (!bsGetList (setting, &list))
- return;
-
- memset (stringBuffer, 0, sizeof(stringBuffer));
-
- while (list)
- {
- switch (setting->info.forList.listType)
- {
- case TypeString:
- strncat (stringBuffer, list->data->value.asString, STRINGBUFSIZE);
- break;
- case TypeMatch:
- strncat (stringBuffer, list->data->value.asMatch, STRINGBUFSIZE);
- break;
- case TypeInt:
- {
- char *value = NULL;
- asprintf (&value, "%d", list->data->value.asInt);
- if (!value)
- break;
-
- strncat (stringBuffer, value, STRINGBUFSIZE);
- free (value);
- }
- break;
- case TypeBool:
- strncat (stringBuffer, (list->data->value.asBool) ? "true" : "false",
- STRINGBUFSIZE);
- break;
- case TypeFloat:
- {
- char *value = NULL;
- asprintf (&value, "%f", list->data->value.asFloat);
- if (!value)
- break;
-
- strncat (stringBuffer, value, STRINGBUFSIZE);
- free (value);
- }
- break;
- case TypeColor:
- {
- char *color = NULL;
- color = bsColorToString(&list->data->value.asColor);
- if (!color)
- break;
-
- strncat (stringBuffer, color, STRINGBUFSIZE);
- free (color);
- }
- break;
- case TypeAction:
- {
- char *action;
- action = writeActionValue (&list->data->value.asAction);
- if (!action)
- break;
-
- strncat (stringBuffer, action, STRINGBUFSIZE);
- free (action);
- }
- default:
- break;
- }
-
- strncat (stringBuffer, ";", STRINGBUFSIZE);;
- list = list->next;
- }
-
- iniparser_setstr (data->iniFile, keyName, stringBuffer);
-}
-
static void processEvents(void)
{
char buf[256 * (sizeof (struct inotify_event) + 16)];
@@ -483,7 +204,7 @@ static Bool finiBackend(BSContext * context)
return FALSE;
if (data->iniFile)
- iniparser_freedict (data->iniFile);
+ bsIniClose (data->iniFile);
if (data->iniWatchDesc)
inotify_rm_watch (iniNotifyFd, data->iniWatchDesc);
@@ -544,19 +265,17 @@ static void readSetting(BSContext * context, BSSetting * setting)
return;
if (setting->isScreen)
- asprintf (&keyName, "%s:s%d_%s", setting->parent->name,
- setting->screenNum, setting->name);
+ asprintf (&keyName, "s%d_%s", setting->screenNum, setting->name);
else
- asprintf (&keyName, "%s:as_%s", setting->parent->name, setting->name);
+ asprintf (&keyName, "as_%s", setting->name);
switch (setting->type)
{
case TypeString:
{
char *value;
- value = iniparser_getstring (data->iniFile, keyName, NULL);
-
- if (value)
+ if (bsIniGetString (data->iniFile, setting->parent->name,
+ keyName, &value))
{
bsSetString (setting, value);
status = TRUE;
@@ -566,9 +285,8 @@ static void readSetting(BSContext * context, BSSetting * setting)
case TypeMatch:
{
char *value;
- value = iniparser_getstring (data->iniFile, keyName, NULL);
-
- if (value)
+ if (bsIniGetString (data->iniFile, setting->parent->name,
+ keyName, &value))
{
bsSetMatch (setting, value);
status = TRUE;
@@ -578,9 +296,8 @@ static void readSetting(BSContext * context, BSSetting * setting)
case TypeInt:
{
int value;
- value = iniparser_getint (data->iniFile, keyName, 0x7fffffff);
-
- if (value != 0x7fffffff)
+ if (bsIniGetInt (data->iniFile, setting->parent->name,
+ keyName, &value))
{
bsSetInt (setting, value);
status = TRUE;
@@ -589,10 +306,10 @@ static void readSetting(BSContext * context, BSSetting * setting)
break;
case TypeBool:
{
- int value;
- value = iniparser_getboolean (data->iniFile, keyName, 0x7fffffff);
+ Bool value;
- if (value != 0x7fffffff)
+ if (bsIniGetBool (data->iniFile, setting->parent->name,
+ keyName, &value))
{
bsSetBool (setting, (value != 0));
status = TRUE;
@@ -602,9 +319,8 @@ static void readSetting(BSContext * context, BSSetting * setting)
case TypeFloat:
{
float value;
- value = (float) iniparser_getdouble (data->iniFile, keyName, 0x7ffffffff);
-
- if (value != 0x7ffffffff)
+ if (bsIniGetFloat (data->iniFile, setting->parent->name,
+ keyName, &value))
{
bsSetFloat (setting, value);
status = TRUE;
@@ -613,11 +329,9 @@ static void readSetting(BSContext * context, BSSetting * setting)
break;
case TypeColor:
{
- char *value;
BSSettingColorValue color;
- value = iniparser_getstring (data->iniFile, keyName, NULL);
-
- if (value && bsStringToColor (value, &color))
+ if (bsIniGetColor (data->iniFile, setting->parent->name,
+ keyName, &color))
{
bsSetColor (setting, color);
status = TRUE;
@@ -627,13 +341,8 @@ static void readSetting(BSContext * context, BSSetting * setting)
case TypeAction:
{
BSSettingActionValue action;
- char *value;
-
- value = iniparser_getstring (data->iniFile, keyName, NULL);
- if (!value)
- break;
-
- if (readActionValue (&action, value))
+ if (bsIniGetAction (data->iniFile, setting->parent->name,
+ keyName, &action))
{
bsSetAction (setting, action);
status = TRUE;
@@ -641,7 +350,16 @@ static void readSetting(BSContext * context, BSSetting * setting)
}
break;
case TypeList:
- status = readListValue (data, setting, keyName);
+ {
+ BSSettingValueList value;
+ if (bsIniGetList (data->iniFile, setting->parent->name,
+ keyName, &value, setting))
+ {
+ bsSetList (setting, value);
+ bsSettingValueListFree (value, TRUE);
+ status = TRUE;
+ }
+ }
break;
default:
break;
@@ -700,14 +418,13 @@ static void writeSetting(BSContext * context, BSSetting * setting)
return;
if (setting->isScreen)
- asprintf (&keyName, "%s:s%d_%s", setting->parent->name,
- setting->screenNum, setting->name);
+ asprintf (&keyName, "s%d_%s", setting->screenNum, setting->name);
else
- asprintf (&keyName, "%s:as_%s", setting->parent->name, setting->name);
+ asprintf (&keyName, "as_%s", setting->name);
if (setting->isDefault)
{
- iniparser_unset (data->iniFile, keyName);
+ bsIniRemoveEntry (data->iniFile, setting->parent->name, keyName);
free (keyName);
return;
}
@@ -718,85 +435,65 @@ static void writeSetting(BSContext * context, BSSetting * setting)
{
char *value;
if (bsGetString (setting, &value))
- iniparser_setstr (data->iniFile, keyName, value);
+ bsIniSetString (data->iniFile, setting->parent->name,
+ keyName, value);
}
break;
case TypeMatch:
{
char *value;
if (bsGetMatch (setting, &value))
- iniparser_setstr (data->iniFile, keyName, value);
+ bsIniSetString (data->iniFile, setting->parent->name,
+ keyName, value);
}
break;
case TypeInt:
{
int value;
if (bsGetInt (setting, &value))
- {
- char *string = NULL;
- asprintf (&string, "%i", value);
- if (!string)
- break;
-
- iniparser_setstr (data->iniFile, keyName, string);
- free (string);
- }
+ bsIniSetInt (data->iniFile, setting->parent->name,
+ keyName, value);
}
break;
case TypeFloat:
{
float value;
if (bsGetFloat (setting, &value))
- {
- char *string = NULL;
- asprintf (&string, "%f", value);
- if (!string)
- break;
-
- iniparser_setstr (data->iniFile, keyName, string);
- free (string);
- }
+ bsIniSetFloat (data->iniFile, setting->parent->name,
+ keyName, value);
}
break;
case TypeBool:
{
Bool value;
if (bsGetBool (setting, &value))
- iniparser_setstr (data->iniFile, keyName, value ? "true" : "false");
+ bsIniSetBool (data->iniFile, setting->parent->name,
+ keyName, value);
}
break;
case TypeColor:
{
BSSettingColorValue value;
if (bsGetColor (setting, &value))
- {
- char *colString = NULL;
- colString = bsColorToString (&value);
- if (!colString)
- break;
-
- iniparser_setstr (data->iniFile, keyName, colString);
- free (colString);
- }
+ bsIniSetColor (data->iniFile, setting->parent->name,
+ keyName, value);
}
break;
case TypeAction:
{
BSSettingActionValue value;
if (bsGetAction (setting, &value))
- {
- char *actionString = NULL;
- actionString = writeActionValue (&value);
- if (!actionString)
- break;
-
- iniparser_setstr (data->iniFile, keyName, actionString);
- free (actionString);
- }
+ bsIniSetAction (data->iniFile, setting->parent->name,
+ keyName, value);
}
break;
case TypeList:
- writeListValue (data, setting, keyName);
+ {
+ BSSettingValueList value;
+ if (bsGetList (setting, &value))
+ bsIniSetList (data->iniFile, setting->parent->name,
+ keyName, value, setting->info.forList.listType);
+ }
break;
default:
break;
@@ -809,7 +506,6 @@ static void writeSetting(BSContext * context, BSSetting * setting)
static void writeDone(BSContext * context)
{
/* export the data to ensure the changes are on disk */
- FILE *file;
char *fileName;
char *currentProfile;
IniPrivData *data;
@@ -821,16 +517,13 @@ static void writeDone(BSContext * context)
currentProfile = bsGetProfile (context);
fileName = getIniFileName (currentProfile);
- file = fopen (fileName, "w");
-
- iniparser_dump_ini (data->iniFile, file);
+ bsIniSave (data->iniFile, fileName);
/* empty file watch */
data->ignoreEvent = TRUE;
processEvents ();
data->ignoreEvent = FALSE;
- fclose (file);
free (fileName);
}
diff --git a/backend/iniparser.c b/backend/iniparser.c
deleted file mode 100644
index d0c4808..0000000
--- a/backend/iniparser.c
+++ /dev/null
@@ -1,531 +0,0 @@
-
-/*-------------------------------------------------------------------------*/
-/**
- @file iniparser.c
- @author N. Devillard
- @date Mar 2000
- @version $Revision: 2.16 $
- @brief Parser for ini files.
-*/
-/*--------------------------------------------------------------------------*/
-
-/*
- $Id: iniparser.c,v 2.16 2006-09-27 11:03:34 ndevilla Exp $
- $Author: ndevilla $
- $Date: 2006-09-27 11:03:34 $
- $Revision: 2.16 $
-*/
-
-/*---------------------------------------------------------------------------
- Includes
- ---------------------------------------------------------------------------*/
-
-#include "iniparser.h"
-#include "strlib.h"
-
-#define ASCIILINESZ 1024
-#define INI_INVALID_KEY ((char*)-1)
-
-/*---------------------------------------------------------------------------
- Private to this module
- ---------------------------------------------------------------------------*/
-
-/* Private: add an entry to the dictionary */
-static void iniparser_add_entry(
- dictionary * d,
- char * sec,
- char * key,
- char * val)
-{
- char longkey[2*ASCIILINESZ+1];
-
- /* Make a key as section:keyword */
- if (key!=NULL) {
- sprintf(longkey, "%s:%s", sec, key);
- } else {
- strcpy(longkey, sec);
- }
-
- /* Add (key,val) to dictionary */
- dictionary_set(d, longkey, val);
- return ;
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get number of sections in a dictionary
- @param d Dictionary to examine
- @return int Number of sections found in dictionary
-
- This function returns the number of sections found in a dictionary.
- The test to recognize sections is done on the string stored in the
- dictionary: a section name is given as "section" whereas a key is
- stored as "section:key", thus the test looks for entries that do not
- contain a colon.
-
- This clearly fails in the case a section name contains a colon, but
- this should simply be avoided.
-
- This function returns -1 in case of error.
- */
-/*--------------------------------------------------------------------------*/
-
-int iniparser_getnsec(dictionary * d)
-{
- int i ;
- int nsec ;
-
- if (d==NULL) return -1 ;
- nsec=0 ;
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]==NULL)
- continue ;
- if (strchr(d->key[i], ':')==NULL) {
- nsec ++ ;
- }
- }
- return nsec ;
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get name for section n in a dictionary.
- @param d Dictionary to examine
- @param n Section number (from 0 to nsec-1).
- @return Pointer to char string
-
- This function locates the n-th section in a dictionary and returns
- its name as a pointer to a string statically allocated inside the
- dictionary. Do not free or modify the returned string!
-
- This function returns NULL in case of error.
- */
-/*--------------------------------------------------------------------------*/
-
-char * iniparser_getsecname(dictionary * d, int n)
-{
- int i ;
- int foundsec ;
-
- if (d==NULL || n<0) return NULL ;
- foundsec=0 ;
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]==NULL)
- continue ;
- if (strchr(d->key[i], ':')==NULL) {
- foundsec++ ;
- if (foundsec>n)
- break ;
- }
- }
- if (foundsec<=n) {
- return NULL ;
- }
- return d->key[i] ;
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Dump a dictionary to an opened file pointer.
- @param d Dictionary to dump.
- @param f Opened file pointer to dump to.
- @return void
-
- This function prints out the contents of a dictionary, one element by
- line, onto the provided file pointer. It is OK to specify @c stderr
- or @c stdout as output files. This function is meant for debugging
- purposes mostly.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_dump(dictionary * d, FILE * f)
-{
- int i ;
-
- if (d==NULL || f==NULL) return ;
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]==NULL)
- continue ;
- if (d->val[i]!=NULL) {
- fprintf(f, "[%s]=[%s]\n", d->key[i], d->val[i]);
- } else {
- fprintf(f, "[%s]=UNDEF\n", d->key[i]);
- }
- }
- return ;
-}
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Save a dictionary to a loadable ini file
- @param d Dictionary to dump
- @param f Opened file pointer to dump to
- @return void
-
- This function dumps a given dictionary into a loadable ini file.
- It is Ok to specify @c stderr or @c stdout as output files.
- */
-/*--------------------------------------------------------------------------*/
-
-void iniparser_dump_ini(dictionary * d, FILE * f)
-{
- int i, j ;
- char keym[ASCIILINESZ+1];
- int nsec ;
- char * secname ;
- int seclen ;
-
- if (d==NULL || f==NULL) return ;
-
- nsec = iniparser_getnsec(d);
- if (nsec<1) {
- /* No section in file: dump all keys as they are */
- for (i=0 ; i<d->size ; i++) {
- if (d->key[i]==NULL)
- continue ;
- fprintf(f, "%s = %s\n", d->key[i], d->val[i]);
- }
- return ;
- }
- for (i=0 ; i<nsec ; i++) {
- secname = iniparser_getsecname(d, i) ;
- seclen = (int)strlen(secname);
- fprintf(f, "\n[%s]\n", secname);
- sprintf(keym, "%s:", secname);
- for (j=0 ; j<d->size ; j++) {
- if (d->key[j]==NULL)
- continue ;
- if (!strncmp(d->key[j], keym, seclen+1)) {
- fprintf(f,
- "%-30s = %s\n",
- d->key[j]+seclen+1,
- d->val[j] ? d->val[j] : "");
- }
- }
- }
- fprintf(f, "\n");
- return ;
-}
-
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, return NULL if not found
- @param d Dictionary to search
- @param key Key string to look for
- @return pointer to statically allocated character string, or NULL.
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- NULL is returned.
- The returned char pointer is pointing to a string allocated in
- the dictionary, do not free or modify it.
-
- This function is only provided for backwards compatibility with
- previous versions of iniparser. It is recommended to use
- iniparser_getstring() instead.
- */
-/*--------------------------------------------------------------------------*/
-char * iniparser_getstr(dictionary * d, const char * key)
-{
- return iniparser_getstring(d, key, NULL);
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key
- @param d Dictionary to search
- @param key Key string to look for
- @param def Default value to return if key not found.
- @return pointer to statically allocated character string
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the pointer passed as 'def' is returned.
- The returned char pointer is pointing to a string allocated in
- the dictionary, do not free or modify it.
- */
-/*--------------------------------------------------------------------------*/
-char * iniparser_getstring(dictionary * d, const char * key, char * def)
-{
- char * lc_key ;
- char * sval ;
-
- if (d==NULL || key==NULL)
- return def ;
-
- lc_key = strdup(strlwc(key));
- sval = dictionary_get(d, lc_key, def);
- free(lc_key);
- return sval ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, convert to an int
- @param d Dictionary to search
- @param key Key string to look for
- @param notfound Value to return in case of error
- @return integer
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the notfound value is returned.
-
- Supported values for integers include the usual C notation
- so decimal, octal (starting with 0) and hexadecimal (starting with 0x)
- are supported. Examples:
-
- "42" -> 42
- "042" -> 34 (octal -> decimal)
- "0x42" -> 66 (hexa -> decimal)
-
- Warning: the conversion may overflow in various ways. Conversion is
- totally outsourced to strtol(), see the associated man page for overflow
- handling.
-
- Credits: Thanks to A. Becker for suggesting strtol()
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_getint(dictionary * d, const char * key, int notfound)
-{
- char * str ;
-
- str = iniparser_getstring(d, key, INI_INVALID_KEY);
- if (str==INI_INVALID_KEY) return notfound ;
- return (int)strtol(str, NULL, 0);
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, convert to a double
- @param d Dictionary to search
- @param key Key string to look for
- @param notfound Value to return in case of error
- @return double
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the notfound value is returned.
- */
-/*--------------------------------------------------------------------------*/
-double iniparser_getdouble(dictionary * d, char * key, double notfound)
-{
- char * str ;
-
- str = iniparser_getstring(d, key, INI_INVALID_KEY);
- if (str==INI_INVALID_KEY) return notfound ;
- return atof(str);
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, convert to a boolean
- @param d Dictionary to search
- @param key Key string to look for
- @param notfound Value to return in case of error
- @return integer
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the notfound value is returned.
-
- A true boolean is found if one of the following is matched:
-
- - A string starting with 'y'
- - A string starting with 'Y'
- - A string starting with 't'
- - A string starting with 'T'
- - A string starting with '1'
-
- A false boolean is found if one of the following is matched:
-
- - A string starting with 'n'
- - A string starting with 'N'
- - A string starting with 'f'
- - A string starting with 'F'
- - A string starting with '0'
-
- The notfound value returned if no boolean is identified, does not
- necessarily have to be 0 or 1.
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_getboolean(dictionary * d, const char * key, int notfound)
-{
- char * c ;
- int ret ;
-
- c = iniparser_getstring(d, key, INI_INVALID_KEY);
- if (c==INI_INVALID_KEY) return notfound ;
- if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') {
- ret = 1 ;
- } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') {
- ret = 0 ;
- } else {
- ret = notfound ;
- }
- return ret;
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Finds out if a given entry exists in a dictionary
- @param ini Dictionary to search
- @param entry Name of the entry to look for
- @return integer 1 if entry exists, 0 otherwise
-
- Finds out if a given entry exists in the dictionary. Since sections
- are stored as keys with NULL associated values, this is the only way
- of querying for the presence of sections in a dictionary.
- */
-/*--------------------------------------------------------------------------*/
-
-int iniparser_find_entry(
- dictionary * ini,
- char * entry
-)
-{
- int found=0 ;
- if (iniparser_getstring(ini, entry, INI_INVALID_KEY)!=INI_INVALID_KEY) {
- found = 1 ;
- }
- return found ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set an entry in a dictionary.
- @param ini Dictionary to modify.
- @param entry Entry to modify (entry name)
- @param val New value to associate to the entry.
- @return int 0 if Ok, -1 otherwise.
-
- If the given entry can be found in the dictionary, it is modified to
- contain the provided value. If it cannot be found, -1 is returned.
- It is Ok to set val to NULL.
- */
-/*--------------------------------------------------------------------------*/
-
-int iniparser_setstr(dictionary * ini, char * entry, char * val)
-{
- dictionary_set(ini, strlwc(entry), val);
- return 0 ;
-}
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Delete an entry in a dictionary
- @param ini Dictionary to modify
- @param entry Entry to delete (entry name)
- @return void
-
- If the given entry can be found, it is deleted from the dictionary.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_unset(dictionary * ini, char * entry)
-{
- dictionary_unset(ini, strlwc(entry));
-}
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Parse an ini file and return an allocated dictionary object
- @param ininame Name of the ini file to read.
- @return Pointer to newly allocated dictionary
-
- This is the parser for ini files. This function is called, providing
- the name of the file to be read. It returns a dictionary object that
- should not be accessed directly, but through accessor functions
- instead.
-
- The returned dictionary must be freed using iniparser_freedict().
- */
-/*--------------------------------------------------------------------------*/
-
-dictionary * iniparser_load(const char * ininame)
-{
- dictionary * d ;
- char lin[ASCIILINESZ+1];
- char sec[ASCIILINESZ+1];
- char key[ASCIILINESZ+1];
- char val[ASCIILINESZ+1];
- char * where ;
- FILE * ini ;
- int lineno ;
-
- if ((ini=fopen(ininame, "r"))==NULL) {
- return NULL ;
- }
-
- sec[0]=0;
-
- /*
- * Initialize a new dictionary entry
- */
- d = dictionary_new(0);
- lineno = 0 ;
- while (fgets(lin, ASCIILINESZ, ini)!=NULL) {
- lineno++ ;
- where = strskp(lin); /* Skip leading spaces */
- if (*where==';' || *where=='#' || *where==0)
- continue ; /* Comment lines */
- else {
- if (sscanf(where, "[%[^]]", sec)==1) {
- /* Valid section name */
- strcpy(sec, strlwc(sec));
- iniparser_add_entry(d, sec, NULL, NULL);
- } else if (sscanf (where, "%[^=] = \"%[^\"]\"", key, val) == 2
- || sscanf (where, "%[^=] = '%[^\']'", key, val) == 2
- || sscanf (where, "%[^=] = %[^;#]", key, val) == 2) {
- strcpy(key, strlwc(strcrop(key)));
- /*
- * sscanf cannot handle "" or '' as empty value,
- * this is done here
- */
- if (!strcmp(val, "\"\"") || !strcmp(val, "''")) {
- val[0] = (char)0;
- } else {
- strcpy(val, strcrop(val));
- }
- iniparser_add_entry(d, sec, key, val);
- }
- }
- }
- fclose(ini);
- return d ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Free all memory associated to an ini dictionary
- @param d Dictionary to free
- @return void
-
- Free all memory associated to an ini dictionary.
- It is mandatory to call this function before the dictionary object
- gets out of the current context.
- */
-/*--------------------------------------------------------------------------*/
-
-void iniparser_freedict(dictionary * d)
-{
- dictionary_del(d);
-}
-
-/* vim: set ts=4 et sw=4 tw=75 */
diff --git a/backend/iniparser.h b/backend/iniparser.h
deleted file mode 100644
index 5bbd904..0000000
--- a/backend/iniparser.h
+++ /dev/null
@@ -1,296 +0,0 @@
-
-/*-------------------------------------------------------------------------*/
-/**
- @file iniparser.h
- @author N. Devillard
- @date Mar 2000
- @version $Revision: 1.23 $
- @brief Parser for ini files.
-*/
-/*--------------------------------------------------------------------------*/
-
-/*
- $Id: iniparser.h,v 1.23 2006-09-27 11:03:35 ndevilla Exp $
- $Author: ndevilla $
- $Date: 2006-09-27 11:03:35 $
- $Revision: 1.23 $
-*/
-
-#ifndef _INIPARSER_H_
-#define _INIPARSER_H_
-
-/*---------------------------------------------------------------------------
- Includes
- ---------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * The following #include is necessary on many Unixes but not Linux.
- * It is not needed for Windows platforms.
- * Uncomment it if needed.
- */
-/* #include <unistd.h> */
-
-#include "dictionary.h"
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get number of sections in a dictionary
- @param d Dictionary to examine
- @return int Number of sections found in dictionary
-
- This function returns the number of sections found in a dictionary.
- The test to recognize sections is done on the string stored in the
- dictionary: a section name is given as "section" whereas a key is
- stored as "section:key", thus the test looks for entries that do not
- contain a colon.
-
- This clearly fails in the case a section name contains a colon, but
- this should simply be avoided.
-
- This function returns -1 in case of error.
- */
-/*--------------------------------------------------------------------------*/
-
-int iniparser_getnsec(dictionary * d);
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get name for section n in a dictionary.
- @param d Dictionary to examine
- @param n Section number (from 0 to nsec-1).
- @return Pointer to char string
-
- This function locates the n-th section in a dictionary and returns
- its name as a pointer to a string statically allocated inside the
- dictionary. Do not free or modify the returned string!
-
- This function returns NULL in case of error.
- */
-/*--------------------------------------------------------------------------*/
-
-char * iniparser_getsecname(dictionary * d, int n);
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Save a dictionary to a loadable ini file
- @param d Dictionary to dump
- @param f Opened file pointer to dump to
- @return void
-
- This function dumps a given dictionary into a loadable ini file.
- It is Ok to specify @c stderr or @c stdout as output files.
- */
-/*--------------------------------------------------------------------------*/
-
-void iniparser_dump_ini(dictionary * d, FILE * f);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Dump a dictionary to an opened file pointer.
- @param d Dictionary to dump.
- @param f Opened file pointer to dump to.
- @return void
-
- This function prints out the contents of a dictionary, one element by
- line, onto the provided file pointer. It is OK to specify @c stderr
- or @c stdout as output files. This function is meant for debugging
- purposes mostly.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_dump(dictionary * d, FILE * f);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, return NULL if not found
- @param d Dictionary to search
- @param key Key string to look for
- @return pointer to statically allocated character string, or NULL.
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- NULL is returned.
- The returned char pointer is pointing to a string allocated in
- the dictionary, do not free or modify it.
-
- This function is only provided for backwards compatibility with
- previous versions of iniparser. It is recommended to use
- iniparser_getstring() instead.
- */
-/*--------------------------------------------------------------------------*/
-char * iniparser_getstr(dictionary * d, const char * key);
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key
- @param d Dictionary to search
- @param key Key string to look for
- @param def Default value to return if key not found.
- @return pointer to statically allocated character string
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the pointer passed as 'def' is returned.
- The returned char pointer is pointing to a string allocated in
- the dictionary, do not free or modify it.
- */
-/*--------------------------------------------------------------------------*/
-char * iniparser_getstring(dictionary * d, const char * key, char * def);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, convert to an int
- @param d Dictionary to search
- @param key Key string to look for
- @param notfound Value to return in case of error
- @return integer
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the notfound value is returned.
-
- Supported values for integers include the usual C notation
- so decimal, octal (starting with 0) and hexadecimal (starting with 0x)
- are supported. Examples:
-
- - "42" -> 42
- - "042" -> 34 (octal -> decimal)
- - "0x42" -> 66 (hexa -> decimal)
-
- Warning: the conversion may overflow in various ways. Conversion is
- totally outsourced to strtol(), see the associated man page for overflow
- handling.
-
- Credits: Thanks to A. Becker for suggesting strtol()
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_getint(dictionary * d, const char * key, int notfound);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, convert to a double
- @param d Dictionary to search
- @param key Key string to look for
- @param notfound Value to return in case of error
- @return double
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the notfound value is returned.
- */
-/*--------------------------------------------------------------------------*/
-double iniparser_getdouble(dictionary * d, char * key, double notfound);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Get the string associated to a key, convert to a boolean
- @param d Dictionary to search
- @param key Key string to look for
- @param notfound Value to return in case of error
- @return integer
-
- This function queries a dictionary for a key. A key as read from an
- ini file is given as "section:key". If the key cannot be found,
- the notfound value is returned.
-
- A true boolean is found if one of the following is matched:
-
- - A string starting with 'y'
- - A string starting with 'Y'
- - A string starting with 't'
- - A string starting with 'T'
- - A string starting with '1'
-
- A false boolean is found if one of the following is matched:
-
- - A string starting with 'n'
- - A string starting with 'N'
- - A string starting with 'f'
- - A string starting with 'F'
- - A string starting with '0'
-
- The notfound value returned if no boolean is identified, does not
- necessarily have to be 0 or 1.
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_getboolean(dictionary * d, const char * key, int notfound);
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Set an entry in a dictionary.
- @param ini Dictionary to modify.
- @param entry Entry to modify (entry name)
- @param val New value to associate to the entry.
- @return int 0 if Ok, -1 otherwise.
-
- If the given entry can be found in the dictionary, it is modified to
- contain the provided value. If it cannot be found, -1 is returned.
- It is Ok to set val to NULL.
- */
-/*--------------------------------------------------------------------------*/
-
-int iniparser_setstr(dictionary * ini, char * entry, char * val);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Delete an entry in a dictionary
- @param ini Dictionary to modify
- @param entry Entry to delete (entry name)
- @return void
-
- If the given entry can be found, it is deleted from the dictionary.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_unset(dictionary * ini, char * entry);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Finds out if a given entry exists in a dictionary
- @param ini Dictionary to search
- @param entry Name of the entry to look for
- @return integer 1 if entry exists, 0 otherwise
-
- Finds out if a given entry exists in the dictionary. Since sections
- are stored as keys with NULL associated values, this is the only way
- of querying for the presence of sections in a dictionary.
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_find_entry(dictionary * ini, char * entry) ;
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Parse an ini file and return an allocated dictionary object
- @param ininame Name of the ini file to read.
- @return Pointer to newly allocated dictionary
-
- This is the parser for ini files. This function is called, providing
- the name of the file to be read. It returns a dictionary object that
- should not be accessed directly, but through accessor functions
- instead.
-
- The returned dictionary must be freed using iniparser_freedict().
- */
-/*--------------------------------------------------------------------------*/
-dictionary * iniparser_load(const char * ininame);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Free all memory associated to an ini dictionary
- @param d Dictionary to free
- @return void
-
- Free all memory associated to an ini dictionary.
- It is mandatory to call this function before the dictionary object
- gets out of the current context.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_freedict(dictionary * d);
-
-#endif
diff --git a/backend/strlib.c b/backend/strlib.c
deleted file mode 100644
index f0d85ae..0000000
--- a/backend/strlib.c
+++ /dev/null
@@ -1,211 +0,0 @@
-
-/*-------------------------------------------------------------------------*/
-/**
- @file strlib.c
- @author N. Devillard
- @date Jan 2001
- @version $Revision: 1.9 $
- @brief Various string handling routines to complement the C lib.
-
- This modules adds a few complementary string routines usually missing
- in the standard C library.
-*/
-/*--------------------------------------------------------------------------*/
-
-/*
- $Id: strlib.c,v 1.9 2006-09-27 11:04:11 ndevilla Exp $
- $Author: ndevilla $
- $Date: 2006-09-27 11:04:11 $
- $Revision: 1.9 $
-*/
-
-/*---------------------------------------------------------------------------
- Includes
- ---------------------------------------------------------------------------*/
-
-#include <string.h>
-#include <ctype.h>
-
-#include "strlib.h"
-
-/*---------------------------------------------------------------------------
- Defines
- ---------------------------------------------------------------------------*/
-#define ASCIILINESZ 1024
-
-/*---------------------------------------------------------------------------
- Function codes
- ---------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Convert a string to lowercase.
- @param s String to convert.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string
- containing a lowercased version of the input string. Do not free
- or modify the returned string! Since the returned string is statically
- allocated, it will be modified at each function call (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-
-char * strlwc(const char * s)
-{
- static char l[ASCIILINESZ+1];
- int i ;
-
- if (s==NULL) return NULL ;
- memset(l, 0, ASCIILINESZ+1);
- i=0 ;
- while (s[i] && i<ASCIILINESZ) {
- l[i] = (char)tolower((int)s[i]);
- i++ ;
- }
- l[ASCIILINESZ]=(char)0;
- return l ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Convert a string to uppercase.
- @param s String to convert.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string
- containing an uppercased version of the input string. Do not free
- or modify the returned string! Since the returned string is statically
- allocated, it will be modified at each function call (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-
-char * strupc(char * s)
-{
- static char l[ASCIILINESZ+1];
- int i ;
-
- if (s==NULL) return NULL ;
- memset(l, 0, ASCIILINESZ+1);
- i=0 ;
- while (s[i] && i<ASCIILINESZ) {
- l[i] = (char)toupper((int)s[i]);
- i++ ;
- }
- l[ASCIILINESZ]=(char)0;
- return l ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Skip blanks until the first non-blank character.
- @param s String to parse.
- @return Pointer to char inside given string.
-
- This function returns a pointer to the first non-blank character in the
- given string.
- */
-/*--------------------------------------------------------------------------*/
-
-char * strskp(char * s)
-{
- char * skip = s;
- if (s==NULL) return NULL ;
- while (isspace((int)*skip) && *skip) skip++;
- return skip ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Remove blanks at the end of a string.
- @param s String to parse.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string,
- which is identical to the input string, except that all blank
- characters at the end of the string have been removed.
- Do not free or modify the returned string! Since the returned string
- is statically allocated, it will be modified at each function call
- (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-
-char * strcrop(char * s)
-{
- static char l[ASCIILINESZ+1];
- char * last ;
-
- if (s==NULL) return NULL ;
- memset(l, 0, ASCIILINESZ+1);
- strcpy(l, s);
- last = l + strlen(l);
- while (last > l) {
- if (!isspace((int)*(last-1)))
- break ;
- last -- ;
- }
- *last = (char)0;
- return l ;
-}
-
-
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Remove blanks at the beginning and the end of a string.
- @param s String to parse.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string,
- which is identical to the input string, except that all blank
- characters at the end and the beg. of the string have been removed.
- Do not free or modify the returned string! Since the returned string
- is statically allocated, it will be modified at each function call
- (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-char * strstrip(char * s)
-{
- static char l[ASCIILINESZ+1];
- char * last ;
-
- if (s==NULL) return NULL ;
-
- while (isspace((int)*s) && *s) s++;
-
- memset(l, 0, ASCIILINESZ+1);
- strcpy(l, s);
- last = l + strlen(l);
- while (last > l) {
- if (!isspace((int)*(last-1)))
- break ;
- last -- ;
- }
- *last = (char)0;
-
- return (char*)l ;
-}
-
-/* Test code */
-#ifdef TEST
-int main(int argc, char * argv[])
-{
- char * str ;
-
- str = "\t\tI'm a lumberkack and I'm OK " ;
- printf("lowercase: [%s]\n", strlwc(str));
- printf("uppercase: [%s]\n", strupc(str));
- printf("skipped : [%s]\n", strskp(str));
- printf("cropped : [%s]\n", strcrop(str));
- printf("stripped : [%s]\n", strstrip(str));
-
- return 0 ;
-}
-#endif
-/* vim: set ts=4 et sw=4 tw=75 */
diff --git a/backend/strlib.h b/backend/strlib.h
deleted file mode 100644
index cd70a62..0000000
--- a/backend/strlib.h
+++ /dev/null
@@ -1,108 +0,0 @@
-
-/*-------------------------------------------------------------------------*/
-/**
- @file strlib.h
- @author N. Devillard
- @date Jan 2001
- @version $Revision: 1.4 $
- @brief Various string handling routines to complement the C lib.
-
- This modules adds a few complementary string routines usually missing
- in the standard C library.
-*/
-/*--------------------------------------------------------------------------*/
-
-/*
- $Id: strlib.h,v 1.4 2006-09-27 11:04:11 ndevilla Exp $
- $Author: ndevilla $
- $Date: 2006-09-27 11:04:11 $
- $Revision: 1.4 $
-*/
-
-#ifndef _STRLIB_H_
-#define _STRLIB_H_
-
-/*---------------------------------------------------------------------------
- Includes
- ---------------------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/*---------------------------------------------------------------------------
- Function codes
- ---------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Convert a string to lowercase.
- @param s String to convert.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string
- containing a lowercased version of the input string. Do not free
- or modify the returned string! Since the returned string is statically
- allocated, it will be modified at each function call (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-char * strlwc(const char * s);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Convert a string to uppercase.
- @param s String to convert.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string
- containing an uppercased version of the input string. Do not free
- or modify the returned string! Since the returned string is statically
- allocated, it will be modified at each function call (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-char * strupc(char * s);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Skip blanks until the first non-blank character.
- @param s String to parse.
- @return Pointer to char inside given string.
-
- This function returns a pointer to the first non-blank character in the
- given string.
- */
-/*--------------------------------------------------------------------------*/
-char * strskp(char * s);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Remove blanks at the end of a string.
- @param s String to parse.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string,
- which is identical to the input string, except that all blank
- characters at the end of the string have been removed.
- Do not free or modify the returned string! Since the returned string
- is statically allocated, it will be modified at each function call
- (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-char * strcrop(char * s);
-
-/*-------------------------------------------------------------------------*/
-/**
- @brief Remove blanks at the beginning and the end of a string.
- @param s String to parse.
- @return ptr to statically allocated string.
-
- This function returns a pointer to a statically allocated string,
- which is identical to the input string, except that all blank
- characters at the end and the beg. of the string have been removed.
- Do not free or modify the returned string! Since the returned string
- is statically allocated, it will be modified at each function call
- (not re-entrant).
- */
-/*--------------------------------------------------------------------------*/
-char * strstrip(char * s) ;
-
-#endif