th-libs: th_config.c annotate

annotate th_config.c @ 15:4adf7093060c

Sync.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 30 Oct 2010 17:48:40 +0300
parents	adcbcac66125
children	0cea9c0cfce7

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
3 5a327a2988fa Breaking the API a bit, cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	4 * (C) Copyright 2004-2008 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 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	22 void th_config_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
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	29 if (curr->type == ITEM_BLOCK)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	30 th_config_free((cfgitem_t *) curr->data);
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 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	41 static cfgitem_t th_config_add(cfgitem_t cfg, char name, int type,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	42 BOOL (validate)(cfgitem_t ), void *data)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	44 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	46 if (cfg == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	47 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	49 /* Allocate new item */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	50 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	51 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	52 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	54 /* Set values */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	55 node->type = type;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	56 node->data = data;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	57 node->validate = validate;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	58 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	59
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	60 /* 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	61 if (*cfg != NULL) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	62 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	63 (*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	64 (*cfg)->prev = node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	65 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	66 *cfg = node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	67 node->prev = node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	68 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	69 node->next = NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	71 return node;
0 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
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 /* 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	76 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	77 int th_config_add_int(cfgitem_t ** cfg, char * name, BOOL(itemValidate) (cfgitem_t ),
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	78 int *itemData, int itemDef)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	80 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	82 node = th_config_add(cfg, name, ITEM_INT, itemValidate, (void *) itemData);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	83 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	84 return -1;
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 *itemData = itemDef;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	88 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	92 int th_config_add_hexvalue(cfgitem_t ** cfg, char * name, BOOL(itemValidate) (cfgitem_t ),
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	93 int *itemData, int itemDef)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	94 {
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	95 cfgitem_t *node;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	96
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	97 node = th_config_add(cfg, name, ITEM_HEX_TRIPLET, itemValidate, (void *) itemData);
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	98 if (node == NULL)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	99 return -1;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	100
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	101 *itemData = itemDef;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	102
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	103 return 0;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	104 }
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	105
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	106
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 /* 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	108 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	109 int th_config_add_uint(cfgitem_t ** cfg, char * name, BOOL(itemValidate) (cfgitem_t ),
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	110 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	111 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	112 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	114 node = th_config_add(cfg, name, ITEM_UINT, itemValidate, (void *) itemData);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	115 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	116 return -1;
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 *itemData = itemDef;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	120 return 0;
0 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
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 /* 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	125 */
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	126 int th_config_add_string(cfgitem_t ** cfg, char * name, BOOL(itemValidate) (cfgitem_t ),
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	127 char ** itemData, char * itemDef)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	129 cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	131 node = th_config_add(cfg, name, ITEM_STRING, itemValidate, (void *) itemData);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	132 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	133 return -1;
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 *itemData = th_strdup(itemDef);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	137 return 0;
0 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
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 /* 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	142 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	143 int th_config_add_bool(cfgitem_t ** cfg, char * name, BOOL(itemValidate) (cfgitem_t ),
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	144 BOOL * itemData, BOOL itemDef)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	146 cfgitem_t *node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	147
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	148 node = th_config_add(cfg, name, ITEM_BOOL, itemValidate, (void *) itemData);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	149 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	150 return -1;
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 *itemData = itemDef;
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 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	155 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	156
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	158 /* Add implicit comment
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 int th_config_add_comment(cfgitem_t ** cfg, char * comment)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	161 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	162 cfgitem_t *node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	163
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	164 node = th_config_add(cfg, comment, ITEM_COMMENT, NULL, NULL);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	165 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	166 return -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	167
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	168 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	169 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	172 /* Add new block
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 int th_config_add_section(cfgitem_t ** cfg, char * name, cfgitem_t *data)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	175 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	176 cfgitem_t *node;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	177
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	178 node = th_config_add(cfg, name, ITEM_BLOCK, NULL, (void *) data);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	179 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	180 return -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	181
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	182 return 0;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 /* 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	187 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	188 enum {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	189 PM_EOF,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	190 PM_ERROR,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	191 PM_NORMAL,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	192 PM_COMMENT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	193 PM_NEXT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	194 PM_KEYNAME,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	195 PM_KEYSET,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	196 PM_STRING,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	197 PM_INT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	198 PM_BOOL,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	199 PM_BLOCK
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 };
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 #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	203 #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	204
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	205 typedef struct {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	206 FILE *file;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	207 char *filename;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	208 size_t line;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	209 } conffile_t;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	212 static void th_config_error(conffile_t f, const char fmt, ...)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	213 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	214 va_list ap;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	215 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	216 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	217 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	218 va_end(ap);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	219 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	222 static int th_config_read_sect(conffile_t f, cfgitem_t cfg, int nesting)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	223 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	224 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	225 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	226 size_t strPos;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	227 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	228 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	229
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	230 /* Initialize values */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	231 tmpCh = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	232 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	233 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	234 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	235 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	236
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	237 /* Parse the configuration */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	238 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	239 if (c == -1) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	240 /* Get next character */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	241 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	242 case EOF:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	243 if (parseMode != PM_NORMAL) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	244 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	245 "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	246 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	247 } else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	248 parseMode = PM_EOF;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	249 break;
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 case '\n':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	252 f->line++;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	253 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	254 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	255
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	256 switch (parseMode) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	257 case PM_COMMENT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	258 /* Comment parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	259 if (c == '\n') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	260 /* 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	261 parseMode = prevMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	262 prevMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	263 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	264 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	265 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	266
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	267 case PM_NORMAL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	268 /* Normal parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	269 if (c == '#') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	270 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	271 parseMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	272 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	273 } 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	274 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	275 } else if (c == '}') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	276 if (nesting > 0) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	277 /* 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	278 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	279 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	280 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	281 "HMMM!\n");
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	282 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	283 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	284 } 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	285 /* 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	286 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	287 parseMode = PM_KEYNAME;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	288 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	289 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	290 /* 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	291 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	292 "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	293 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	294 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	295 break;
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 case PM_KEYNAME:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	298 /* 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	299 if (c == '#') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	300 /* Start of comment */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	301 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	302 parseMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	303 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	304 } 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	305 /* 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	306 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	307 parseMode = PM_NEXT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	308 nextMode = PM_KEYSET;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	309 } 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	310 /* 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	311 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	312 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	313 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	314 /* Error! Key name string too long! */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	315 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	316 "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	317 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	318 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	319 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	320 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	321 /* 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	322 tmpStr[strPos] = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	323 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	324 "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	325 parseMode = PM_ERROR;
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 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	328
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	329 case PM_KEYSET:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	330 if (c == '=') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	331 /* 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	332 tmpStr[strPos] = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	333 isFound = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	334 item = cfg;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	335 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	336 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	337 isFound = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	338 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	339 item = item->next;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	340 }
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 /* 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	343 if (isFound) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	344 /* 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	345 switch (item->type) {
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	346 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	347 case ITEM_STRING:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	348 nextMode = PM_STRING;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	349 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	350
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	351 case ITEM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	352 case ITEM_UINT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	353 nextMode = PM_INT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	354 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	355
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	356 case ITEM_BOOL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	357 nextMode = PM_BOOL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	358 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	359
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	360 case ITEM_BLOCK:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	361 nextMode = PM_BLOCK;
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 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	364
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	365 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	366 parseMode = PM_NEXT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	367 isStart = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	368 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	369 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	370 /* Error! No configuration key by this name found */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	371 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	372 "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	373 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	374 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	375
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	376 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	377 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	378 /* Error! '=' expected! */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	379 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	380 "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	381 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	382 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	383 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	385 case PM_NEXT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	386 /* 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	387 if (c == '#') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	388 /* Start of comment */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	389 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	390 parseMode = PM_COMMENT;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	391 } 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	392 /* 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	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 /* Next item found */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	396 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	397 parseMode = nextMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	398 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	399 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	400
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	401 case PM_BLOCK:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	402 /* Block parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	403 if (c != '{') {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	404 /* Error! Block start '{' expected! */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	405 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	406 "Unexpected character '%c', block start '{' 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	407 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	408 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	409 int res = th_config_read_sect(f, (cfgitem_t *) item->data, nesting + 1);
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 if (res > 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	412 validError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	413 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	414 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	415 else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	416 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	417 parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	418 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	419 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	420 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	421
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	422 case PM_STRING:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	423 /* String parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	424 if (isStart) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	425 /* 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	426 tmpCh = c;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	427 isStart = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	428 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	429 } 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	430 /* 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	431 tmpStr[strPos] = 0;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	432
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	433 if (item->type == ITEM_HEX_TRIPLET) {
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	434 } else if (item->type == ITEM_STRING) {
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	435 th_pstrcpy((char **) item->data, tmpStr);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	436 }
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	437
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	438 if (item->validate != NULL && !item->validate(item))
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	439 validError = TRUE;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	440
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	441 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	442 parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	443 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	444 /* 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	445 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	446 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	447 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	448 /* Error! String too long! */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	449 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	450 "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	451 SET_MAX_BUF);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	452 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	453 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	454 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	455
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	456 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	457 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	458
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	459 case PM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	460 /* Integer parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	461 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	462 /* Error! Negative values not allowed for unsigned ints */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	463 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	464 "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	465 item->name);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	466 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	467 } 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	468 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	469 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	470 isError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	471 } 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	472 VADDCH(c)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	473 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	474 isError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	475 } 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	476 /* 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	477 tmpStr[strPos] = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	478 switch (item->type) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	479 case ITEM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	480 ((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	481 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	483 case ITEM_UINT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	484 ((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	485 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	486 }
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	487 if (item->validate != NULL && !item->validate(item))
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	488 validError = TRUE;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	489
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	490 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	491 parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	492 } else {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	493 /* Error! Unexpected character. */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	494 th_config_error(f,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	495 "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	496 c, item->name);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	497 parseMode = PM_ERROR;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	498 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	499
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	500 if (isError) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	501 /* Error! String too long! */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	502 th_config_error(f, "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	503 SET_MAX_BUF);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	504 parseMode = PM_ERROR;
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
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	507 isStart = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	508 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	509 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	510
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	511 case PM_BOOL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	512 /* Boolean parsing mode */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	513 if (isStart) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	514 tmpCh = c;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	515 isStart = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	516 } 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	517 BOOL tmpBool;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	518
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	519 /* 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	520 switch (tmpCh) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	521 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	522 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	523 case '1':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	524 tmpBool = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	525 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	526
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	527 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	528 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	529 case '0':
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	530 tmpBool = FALSE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	531 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	532
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	533 default:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	534 isError = TRUE;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	535 }
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 if (isError) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	538 th_config_error(f, "Invalid boolean value for '%s'.\n", item->name);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	539 parseMode = PM_ERROR;
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 ((BOOL ) item->data) = tmpBool;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	542
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	543 if (item->validate != NULL && !item->validate(item))
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	544 validError = TRUE;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	545
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	546 prevMode = parseMode;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	547 parseMode = PM_NORMAL;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	548 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	549 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	550 c = -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	551 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	552 }
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 /* 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	556 if (validError)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	557 return 1;
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 /* Return result */
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	560 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	561 return -2;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	562 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	563 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	564 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	565
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 int th_config_read(FILE inFile, char filename, cfgitem_t * cfg)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	568 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	569 conffile_t f;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	570
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	571 f.file = inFile;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	572 f.filename = filename;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	573 f.line = 1;
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 return th_config_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	576 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 /* Write a configuration into file
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 */
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	581 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	582 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	583 int i;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	584 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	585 fputc(' ', f->file);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	586 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	589 static int th_config_write_sect(conffile_t f, cfgitem_t item, int nesting)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	590 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	591 while (item != NULL) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	592 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	593 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	594 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	595 return -1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	596 } else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	597 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	598 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	599
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	600 switch (item->type) {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	601 case ITEM_STRING:
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	602 if (((char *) item->data) == NULL) {
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	603 if (fprintf(f->file, "#%s = \"\"\n", item->name) < 0)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	604 return -3;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	605 } else {
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	606 if (fprintf(f->file, "%s = \"%s\"\n",
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	607 item->name, ((char *) item->data)) < 0)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	608 return -3;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	609 }
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	610 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	612 case ITEM_INT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	613 if (fprintf(f->file, "%s = %i\n",
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	614 item->name, ((int ) item->data)) < 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	615 return -4;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	616 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	618 case ITEM_UINT:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	619 if (fprintf(f->file, "%s = %d\n",
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	620 item->name, ((unsigned int ) item->data)) < 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	621 return -5;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	622 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	624 case ITEM_BOOL:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	625 if (fprintf(f->file, "%s = %s\n",
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	626 item->name, ((BOOL ) item->data) ? "yes" : "no") < 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	627 return -6;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	628 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	629
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	630 case ITEM_BLOCK:
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	631 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	632 int res;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	633 if (fprintf(f->file, "\n%s = {\n", item->name) < 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	634 return -7;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	635 res = th_config_write_sect(f, (cfgitem_t *) item->data, nesting + 1);
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	636 if (res != 0) return res;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	637 if (fprintf(f->file, "} # End of '%s'\n\n", item->name) < 0)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	638 return -8;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	639 }
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	640 break;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	641
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	642 case ITEM_HEX_TRIPLET:
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	643 if (fprintf(f->file, "%s = \"%06x\"\n",
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	644 item->name, ((int ) item->data)) < 0)
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	645 return -6;
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	646 break;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	647 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	648 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	649 item = item->next;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	650 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	651
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	652 return 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	653 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	655
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	656 int th_config_write(FILE outFile, char filename, cfgitem_t *cfg)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	657 {
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	658 conffile_t f;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	659
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	660 if (cfg == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	661 return -1;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	663 f.file = outFile;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	664 f.filename = filename;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	665 f.line = 1;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	666
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	667 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	668 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	669
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	670 return th_config_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	671 }
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	672
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	673

Mercurial > hg > th-libs

annotate th_config.c @ 15:4adf7093060c