th-libs: th_config.c annotate

annotate th_config.c @ 16:0cea9c0cfce7

Sync.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 02 Nov 2010 23:22:44 +0200
parents	4adf7093060c
children	05a44cbd1150

rev	line source
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Very simple configuration handling functions
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	4 * (C) Copyright 2004-2010 Tecnic Software productions (TNSP)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #ifdef HAVE_CONFIG_H
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "config.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 #endif
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 #include <stdio.h>
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12 #include <stdarg.h>
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13 #include "th_config.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 #include "th_util.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 #include "th_string.h"
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	17 #define SET_MAX_BUF (8192)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 /* Free a given configuration (the values are not free'd)
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	22 void th_cfg_free(cfgitem_t *cfg)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	24 cfgitem_t *curr = cfg;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	26 while (curr != NULL) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	27 cfgitem_t *next = curr->next;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	28
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	29 if (curr->type == ITEM_SECTION)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	30 th_cfg_free((cfgitem_t *) curr->data);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	31
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	32 th_free(curr->name);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	33 th_free(curr);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	34 curr = next;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	35 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 /* Allocate and add new item to configuration
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	41 static cfgitem_t th_cfg_add(cfgitem_t cfg, const char name, const int type, void *data)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	43 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	45 if (cfg == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	46 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	48 /* Allocate new item */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	49 node = (cfgitem_t *) th_calloc(1, sizeof(cfgitem_t));
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	50 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	51 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	53 /* Set values */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	54 node->type = type;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	55 node->data = data;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	56 node->name = th_strdup(name);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	57
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	58 /* Insert into linked list */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	59 if (*cfg != NULL) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	60 node->prev = (*cfg)->prev;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	61 (*cfg)->prev->next = node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	62 (*cfg)->prev = node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	63 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	64 *cfg = node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	65 node->prev = node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	66 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	67 node->next = NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	69 return node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73 /* Add integer type setting into give configuration
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	75 int th_cfg_add_int(cfgitem_t ** cfg, char * name,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	76 int *itemData, int itemDef)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	78 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	80 node = th_cfg_add(cfg, name, ITEM_INT, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	81 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	82 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	84 *itemData = itemDef;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	86 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	90 int th_cfg_add_hexvalue(cfgitem_t ** cfg, char * name,
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	91 int *itemData, int itemDef)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	92 {
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	93 cfgitem_t *node;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	94
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	95 node = th_cfg_add(cfg, name, ITEM_HEX_TRIPLET, (void *) itemData);
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	96 if (node == NULL)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	97 return -1;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	98
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	99 *itemData = itemDef;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	100
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	101 return 0;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	102 }
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	103
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	104
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 /* Add unsigned integer type setting into give configuration
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	107 int th_cfg_add_uint(cfgitem_t ** cfg, char * name,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	108 unsigned int * itemData, unsigned int itemDef)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	110 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	112 node = th_cfg_add(cfg, name, ITEM_UINT, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	113 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	114 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	116 *itemData = itemDef;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	118 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 /* Add strint type setting into given configuration
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	124 int th_cfg_add_string(cfgitem_t ** cfg, char * name,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	125 char ** itemData, char * itemDef)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	127 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	129 node = th_cfg_add(cfg, name, ITEM_STRING, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	130 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	131 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	133 *itemData = th_strdup(itemDef);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	135 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 /* Add boolean type setting into given configuration
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	141 int th_cfg_add_bool(cfgitem_t ** cfg, char * name,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	142 BOOL * itemData, BOOL itemDef)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	144 cfgitem_t *node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	145
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	146 node = th_cfg_add(cfg, name, ITEM_BOOL, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	147 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	148 return -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	149
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	150 *itemData = itemDef;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	151
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	152 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	153 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	154
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	156 /* Add implicit comment
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	157 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	158 int th_cfg_add_comment(cfgitem_t ** cfg, char * comment)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	159 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	160 cfgitem_t *node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	161
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	162 node = th_cfg_add(cfg, comment, ITEM_COMMENT, NULL);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	163 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	164 return -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	165
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	166 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	167 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	170 /* Add new section
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	171 */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	172 int th_cfg_add_section(cfgitem_t ** cfg, char * name, cfgitem_t *data)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	173 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	174 cfgitem_t *node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	175
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	176 node = th_cfg_add(cfg, name, ITEM_SECTION, (void *) data);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	177 if (node == NULL)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	178 return -1;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	179
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	180 return 0;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	181 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	182
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	183
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	184 int th_cfg_add_string_list(cfgitem_t ** cfg, char * name, qlist_t **data)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	185 {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	186 cfgitem_t *node;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	187
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	188 if (data == NULL)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	189 return -5;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	190
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	191 node = th_cfg_add(cfg, name, ITEM_STRING_LIST, (void *) data);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	192 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	193 return -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	194
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	195 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 /* Read a given file into configuration structure and variables
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	201 enum {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	202 PM_EOF,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	203 PM_ERROR,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	204 PM_NORMAL,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	205 PM_COMMENT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	206 PM_NEXT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	207 PM_KEYNAME,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	208 PM_KEYSET,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	209 PM_STRING,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	210 PM_INT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	211 PM_BOOL,
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	212 PM_SECTION,
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	213 PM_ARRAY
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 };
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216 #define VADDCH(ch) if (strPos < SET_MAX_BUF) { tmpStr[strPos++] = ch; }
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	217 #define VISEND(ch) (ch == '\r' \|\| ch == '\n' \|\| ch == ';' \|\| th_isspace(c) \|\| ch == '#')
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	219 typedef struct {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	220 FILE *file;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	221 char *filename;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	222 size_t line;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	223 } conffile_t;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	226 static void th_cfg_error(conffile_t f, const char fmt, ...)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	227 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	228 va_list ap;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	229 va_start(ap, fmt);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	230 fprintf(stderr, "%s: '%s', line #%d: ", th_prog_name, f->filename, f->line);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	231 vfprintf(stderr, fmt, ap);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	232 va_end(ap);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	233 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	236 static int th_cfg_read_sect(conffile_t f, cfgitem_t cfg, int nesting)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	237 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	238 cfgitem_t *item = NULL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	239 char tmpStr[SET_MAX_BUF + 1];
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	240 size_t strPos;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	241 int c, parseMode, prevMode, nextMode, tmpCh;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	242 BOOL isFound, isStart, isError, validError;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	243
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	244 /* Initialize values */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	245 tmpCh = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	246 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	247 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	248 isFound = isStart = isError = validError = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	249 nextMode = prevMode = parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	250
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	251 /* Parse the configuration */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	252 while (parseMode != PM_EOF && parseMode != PM_ERROR) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	253 if (c == -1) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	254 /* Get next character */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	255 switch (c = fgetc(f->file)) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	256 case EOF:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	257 if (parseMode != PM_NORMAL) {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	258 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	259 "Unexpected end of file.\n");
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	260 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	261 } else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	262 parseMode = PM_EOF;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	263 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	264
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	265 case '\n':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	266 f->line++;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	267 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	268 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	269
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	270 switch (parseMode) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	271 case PM_COMMENT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	272 /* Comment parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	273 if (c == '\n') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	274 /* End of line, end of comment */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	275 parseMode = prevMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	276 prevMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	277 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	278 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	279 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	280
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	281 case PM_NORMAL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	282 /* Normal parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	283 if (c == '#') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	284 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	285 parseMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	286 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	287 } else if (VISEND(c)) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	288 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	289 } else if (c == '}') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	290 if (nesting > 0) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	291 /* Check for validation errors */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	292 return (validError) ? 1 : 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	293 } else {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	294 th_cfg_error(f, "Invalid nesting sequence encountered.\n");
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	295 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	296 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	297 } else if (th_isalpha(c)) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	298 /* Start of key name found */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	299 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	300 parseMode = PM_KEYNAME;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	301 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	302 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	303 /* Error! Invalid character found */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	304 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	305 "Unexpected character '%c'.\n", c);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	306 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	307 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	308 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	309
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	310 case PM_KEYNAME:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	311 /* Configuration KEY name parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	312 if (c == '#') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	313 /* Start of comment */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	314 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	315 parseMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	316 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	317 } else if (th_iscrlf(c) \|\| th_isspace(c) \|\| c == '=') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	318 /* End of key name */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	319 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	320 parseMode = PM_NEXT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	321 nextMode = PM_KEYSET;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	322 } else if (th_isalnum(c) \|\| c == '_') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	323 /* Add to key name string */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	324 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	325 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	326 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	327 /* Error! Key name string too long! */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	328 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	329 "Config key name too long!");
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	330 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	331 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	332 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	333 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	334 /* Error! Invalid character found */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	335 tmpStr[strPos] = 0;
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	336 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	337 "Unexpected character '%c' in key name '%s'.\n", c, tmpStr);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	338 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	339 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	340 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	341
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	342 case PM_KEYSET:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	343 if (c == '=') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	344 /* Find key from configuration */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	345 tmpStr[strPos] = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	346 isFound = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	347 item = cfg;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	348 while (item != NULL && !isFound) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	349 if (item->name != NULL && strcmp(item->name, tmpStr) == 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	350 isFound = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	351 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	352 item = item->next;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	353 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	354
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	355 /* Check if key was found */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	356 if (isFound) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	357 /* Okay, set next mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	358 switch (item->type) {
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	359 case ITEM_HEX_TRIPLET:
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	360 case ITEM_STRING:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	361 nextMode = PM_STRING;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	362 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	363
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	364 case ITEM_STRING_LIST:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	365 nextMode = PM_ARRAY;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	366 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	367
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	368 case ITEM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	369 case ITEM_UINT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	370 nextMode = PM_INT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	371 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	372
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	373 case ITEM_BOOL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	374 nextMode = PM_BOOL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	375 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	376
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	377 case ITEM_SECTION:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	378 nextMode = PM_SECTION;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	379 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	380 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	381
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	382 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	383 parseMode = PM_NEXT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	384 isStart = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	385 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	386 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	387 /* Error! No configuration key by this name found */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	388 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	389 "No such configuration setting ('%s')\n", tmpStr);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	390 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	391 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	392
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	393 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	394 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	395 /* Error! '=' expected! */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	396 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	397 "Unexpected character '%c', assignation '=' was expected.\n", c);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	398 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	399 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	400 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	402 case PM_NEXT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	403 /* Search next item parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	404 if (c == '#') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	405 /* Start of comment */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	406 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	407 parseMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	408 } else if (th_isspace(c) \|\| th_iscrlf(c)) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	409 /* Ignore whitespaces and linechanges */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	410 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	411 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	412 /* Next item found */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	413 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	414 parseMode = nextMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	415 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	416 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	417
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	418 case PM_ARRAY:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	419 if (isStart) {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	420 switch (item->type) {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	421 case ITEM_STRING_LIST:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	422 prevMode = parseMode;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	423 parseMode = PM_STRING;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	424 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	425 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	426 } else if (c == ',') {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	427 switch (item->type) {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	428 case ITEM_STRING_LIST:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	429 c = -1;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	430 isStart = TRUE;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	431 prevMode = parseMode;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	432 parseMode = PM_NEXT;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	433 nextMode = PM_STRING;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	434 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	435 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	436 } else {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	437 prevMode = parseMode;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	438 parseMode = PM_NORMAL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	439 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	440 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	441
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	442 case PM_SECTION:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	443 /* Section parsing mode */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	444 if (c != '{') {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	445 /* Error! Section start '{' expected! */
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	446 th_cfg_error(f,
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	447 "Unexpected character '%c', section start '{' was expected.\n", c);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	448 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	449 } else {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	450 int res = th_cfg_read_sect(f, (cfgitem_t *) item->data, nesting + 1);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	451 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	452 if (res > 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	453 validError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	454 else if (res < 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	455 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	456 else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	457 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	458 parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	459 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	460 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	461 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	462
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	463 case PM_STRING:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	464 /* String parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	465 if (isStart) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	466 /* Start of string, get delimiter */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	467 tmpCh = c;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	468 isStart = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	469 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	470 } else if (c == tmpCh) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	471 /* End of string, set the value */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	472 tmpStr[strPos] = 0;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	473
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	474 switch (item->type) {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	475 case ITEM_HEX_TRIPLET:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	476 (int ) item->data = th_get_hex_triplet(tmpStr);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	477 prevMode = parseMode;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	478 parseMode = PM_NORMAL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	479 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	480 case ITEM_STRING:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	481 th_pstrcpy((char **) item->data, tmpStr);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	482 prevMode = parseMode;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	483 parseMode = PM_NORMAL;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	484 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	485 case ITEM_STRING_LIST:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	486 th_llist_append(item->list, th_strdup(tmpStr));
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	487 prevMode = parseMode;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	488 parseMode = PM_NEXT;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	489 nextMode = PM_ARRAY;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	490 break;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	491 }
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	492
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	493 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	494 /* Add character to string */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	495 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	496 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	497 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	498 /* Error! String too long! */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	499 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	500 "String too long! Maximum is %d characters.",
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	501 SET_MAX_BUF);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	502 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	503 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	504 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	505
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	506 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	507 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	508
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	509 case PM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	510 /* Integer parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	511 if (isStart && item->type == ITEM_UINT && c == '-') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	512 /* Error! Negative values not allowed for unsigned ints */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	513 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	514 "Negative value specified for %s, unsigned value expected.",
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	515 item->name);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	516 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	517 } else if (isStart && (c == '-' \|\| c == '+')) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	518 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	519 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	520 isError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	521 } else if (th_isdigit(c)) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	522 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	523 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	524 isError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	525 } else if (VISEND(c)) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	526 /* End of integer parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	527 tmpStr[strPos] = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	528 switch (item->type) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	529 case ITEM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	530 ((int ) item->data) = atoi(tmpStr);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	531 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	533 case ITEM_UINT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	534 ((unsigned int ) item->data) = atol(tmpStr);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	535 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	536 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	537
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	538 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	539 parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	540 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	541 /* Error! Unexpected character. */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	542 th_cfg_error(f,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	543 "Unexpected character '%c' for integer setting '%s'.",
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	544 c, item->name);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	545 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	546 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	547
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	548 if (isError) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	549 /* Error! String too long! */
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	550 th_cfg_error(f, "String too long! Maximum is %d characters.",
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	551 SET_MAX_BUF);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	552 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	553 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	554
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	555 isStart = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	556 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	557 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	558
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	559 case PM_BOOL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	560 /* Boolean parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	561 if (isStart) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	562 tmpCh = c;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	563 isStart = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	564 } else if (VISEND(c)) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	565 BOOL tmpBool;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	566
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	567 /* End of boolean parsing */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	568 switch (tmpCh) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	569 case 'Y': case 'y':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	570 case 'T': case 't':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	571 case '1':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	572 tmpBool = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	573 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	574
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	575 case 'N': case 'n':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	576 case 'F': case 'f':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	577 case '0':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	578 tmpBool = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	579 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	580
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	581 default:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	582 isError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	583 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	584
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	585 if (isError) {
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	586 th_cfg_error(f, "Invalid boolean value for '%s'.\n", item->name);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	587 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	588 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	589 ((BOOL ) item->data) = tmpBool;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	590
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	591 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	592 parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	593 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	594 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	595 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	596 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	597 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	598 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	599
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	600 /* Check for validation errors */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	601 if (validError)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	602 return 1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	603
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	604 /* Return result */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	605 if (parseMode == PM_ERROR)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	606 return -2;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	607 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	608 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	609 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	610
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	611
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	612 int th_cfg_read(FILE inFile, char filename, cfgitem_t * cfg)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	613 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	614 conffile_t f;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	615
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	616 f.file = inFile;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	617 f.filename = filename;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	618 f.line = 1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	619
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	620 return th_cfg_read_sect(&f, cfg, 0);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624 /* Write a configuration into file
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	626 static void th_print_indent(conffile_t *f, int nesting)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	628 int i;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	629 for (i = 0; i < nesting * 2; i++)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	630 fputc(' ', f->file);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	631 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	634 static int th_cfg_write_sect(conffile_t f, cfgitem_t item, int nesting)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	635 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	636 while (item != NULL) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	637 if (item->type == ITEM_COMMENT) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	638 th_print_indent(f, nesting);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	639 if (fprintf(f->file, "# %s\n", (item->name != NULL) ? item->name : "" ) < 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	640 return -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	641 } else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	642 if (item->name != NULL) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	643 th_print_indent(f, nesting);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	644
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	645 switch (item->type) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	646 case ITEM_STRING:
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	647 if (*(item->val_str) == NULL) {
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	648 if (fprintf(f->file, "#%s = \"\"\n", item->name) < 0)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	649 return -3;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	650 } else {
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	651 if (fprintf(f->file, "%s = \"%s\"\n",
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	652 item->name, *(item->val_str)) < 0)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	653 return -3;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	654 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	655 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	656
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	657 case ITEM_STRING_LIST:
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	658 if (*(item->list) == NULL) {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	659 if (fprintf(f->file, "#%s = \"\", \"\"\n", item->name) < 0)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	660 return -3;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	661 } else {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	662 qlist_t node = (item->list);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	663 size_t n = th_llist_length(node);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	664 if (fprintf(f->file, "%s = ", item->name) < 0)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	665 return -3;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	666
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	667 while (node != NULL) {
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	668 if (node->data != NULL)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	669 fprintf(f->file, "\"%s\"", (char *) node->data);
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	670
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	671 if (--n > 0)
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	672 fprintf(f->file, ", ");
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	673
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	674 node = node->next;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	675 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	676
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	677 if (fprintf(f->file, "\n") < 0)
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	678 return -3;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	679 }
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	680 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	682 case ITEM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	683 if (fprintf(f->file, "%s = %i\n",
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	684 item->name, *(item->val_int)) < 0)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	685 return -4;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	686 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	688 case ITEM_UINT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	689 if (fprintf(f->file, "%s = %d\n",
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	690 item->name, *(item->val_uint)) < 0)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	691 return -5;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	692 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	694 case ITEM_BOOL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	695 if (fprintf(f->file, "%s = %s\n",
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	696 item->name, *(item->val_bool) ? "yes" : "no") < 0)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	697 return -6;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	698 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	699
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	700 case ITEM_SECTION:
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	701 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	702 int res;
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	703 if (fprintf(f->file, "%s = {\n", item->name) < 0)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	704 return -7;
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	705 res = th_cfg_write_sect(f, (cfgitem_t *) item->data, nesting + 1);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	706 if (res != 0) return res;
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	707 if (fprintf(f->file, "}\n\n") < 0)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	708 return -8;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	709 }
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	710 break;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	711
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	712 case ITEM_HEX_TRIPLET:
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	713 if (fprintf(f->file, "%s = \"%06x\"\n",
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	714 item->name, ((int ) item->data)) < 0)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	715 return -6;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	716 break;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	717 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	718 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	719 item = item->next;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	720 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	721
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	722 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	723 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	725
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	726 int th_cfg_write(FILE outFile, char filename, cfgitem_t *cfg)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	727 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	728 conffile_t f;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	729
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	730 if (cfg == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	731 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	733 f.file = outFile;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	734 f.filename = filename;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	735 f.line = 1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	736
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	737 fprintf(outFile, "# Configuration written by %s %s\n\n",
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	738 th_prog_fullname, th_prog_version);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	739
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	740 return th_cfg_write_sect(&f, cfg, 0);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 }
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	742
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	743

Mercurial > hg > th-libs

annotate th_config.c @ 16:0cea9c0cfce7