th-libs: th_config.c annotate

annotate th_config.c @ 514:db3fc3d4969e

Return proper THERR_* error codes from th_config functions, at least for some parts.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 26 Dec 2019 09:45:41 +0200
parents	934369fafd5d
children	4913e4230e5c

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
511 934369fafd5d Bump copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	4 * (C) Copyright 2004-2019 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 */
49 598609fb49b0 Change how "config.h" is included, etc. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	8 #include "th_util.h"
598609fb49b0 Change how "config.h" is included, etc. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	9 #include "th_config.h"
598609fb49b0 Change how "config.h" is included, etc. Matti Hamalainen <ccr@tnsp.org> parents: 42 diff changeset	10 #include "th_string.h"
0 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
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	14
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	15 #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	16
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 /* 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	19 */
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	20 void th_cfg_free(th_cfgitem_t *cfg)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	22 th_cfgitem_t *node = cfg;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	24 while (node != NULL)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	25 {
155 23a79bd6c9d6 Use th_llist for th_config module as well instead of duped linked list Matti Hamalainen <ccr@tnsp.org> parents: 152 diff changeset	26 th_cfgitem_t next = (th_cfgitem_t ) node->node.next;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	27
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	28 if (node->type == ITEM_SECTION)
a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	29 th_cfg_free((th_cfgitem_t *) node->v.data);
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	30
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	31 th_free(node->name);
a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	32 th_free(node);
a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	33 node = next;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	34 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 }
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 /* 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	39 */
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	40 static th_cfgitem_t th_cfg_add(th_cfgitem_t cfg, const char name,
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	41 const int type, void *data)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	43 th_cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	45 if (cfg == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	46 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	48 // Allocate new item
125 0ac59c798773 Use th_malloc0() where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 110 diff changeset	49 node = (th_cfgitem_t *) th_malloc0(sizeof(th_cfgitem_t));
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	50 if (node == NULL)
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	51 return NULL;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	53 // Set values
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	54 node->type = type;
22 1ac2449c4df7 ISO C99 compatibility fixes. Matti Hamalainen <ccr@tnsp.org> parents: 20 diff changeset	55 node->v.data = data;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	56 node->name = th_strdup(name);
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	57
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	58 // Insert into linked list
155 23a79bd6c9d6 Use th_llist for th_config module as well instead of duped linked list Matti Hamalainen <ccr@tnsp.org> parents: 152 diff changeset	59 th_llist_append_node((th_llist_t *) cfg, (th_llist_t ) node);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	61 return node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 /* 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	66 */
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	67 int th_cfg_add_int(th_cfgitem_t *cfg, const char name, int *itemData, int defValue)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	69 th_cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	71 node = th_cfg_add(cfg, name, ITEM_INT, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	72 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	73 return THERR_MALLOC;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	75 *itemData = defValue;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	77 return THERR_OK;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	81 int th_cfg_add_hexvalue(th_cfgitem_t *cfg, const char name,
498 1dbd9259c3b8 Change hexvalue type to unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 497 diff changeset	82 unsigned int *itemData, unsigned int defValue)
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	83 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	84 th_cfgitem_t *node;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	85
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	86 node = th_cfg_add(cfg, name, ITEM_HEX_TRIPLET, (void *) itemData);
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	87 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	88 return THERR_MALLOC;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	89
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	90 *itemData = defValue;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	91
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	92 return THERR_OK;
15 4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	93 }
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	94
4adf7093060c Sync. Matti Hamalainen <ccr@tnsp.org> parents: 13 diff changeset	95
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 /* 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	97 */
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	98 int th_cfg_add_uint(th_cfgitem_t *cfg, const char name,
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	99 unsigned int *itemData, unsigned int defValue)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	101 th_cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	103 node = th_cfg_add(cfg, name, ITEM_UINT, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	104 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	105 return THERR_MALLOC;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	107 *itemData = defValue;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	109 return THERR_OK;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 /* 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	114 */
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	115 int th_cfg_add_string(th_cfgitem_t *cfg, const char name,
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	116 char *itemData, char defValue)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	118 th_cfgitem_t *node;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	120 node = th_cfg_add(cfg, name, ITEM_STRING, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	121 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	122 return THERR_MALLOC;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	124 *itemData = th_strdup(defValue);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	126 return THERR_OK;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 /* 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	131 */
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	132 int th_cfg_add_bool(th_cfgitem_t *cfg, const char name,
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	133 BOOL *itemData, BOOL defValue)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	135 th_cfgitem_t *node;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	136
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	137 node = th_cfg_add(cfg, name, ITEM_BOOL, (void *) itemData);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	138 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	139 return THERR_MALLOC;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	140
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	141 *itemData = defValue;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	142
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	143 return THERR_OK;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	144 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	145
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	147 /* Add implicit comment
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	148 */
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	149 int th_cfg_add_comment(th_cfgitem_t *cfg, const char comment)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	150 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	151 th_cfgitem_t *node;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	152
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	153 node = th_cfg_add(cfg, comment, ITEM_COMMENT, NULL);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	154 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	155 return THERR_MALLOC;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	156
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	157 return THERR_OK;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	158 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	161 /* Add new section
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	162 */
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	163 int th_cfg_add_section(th_cfgitem_t *cfg, const char name, th_cfgitem_t *sect)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	164 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	165 th_cfgitem_t *node;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	166
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	167 node = th_cfg_add(cfg, name, ITEM_SECTION, (void *) sect);
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	168 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	169 return THERR_MALLOC;
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	170
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	171 return THERR_OK;
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	172 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	173
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	174
152 b4e1b15a64e1 Rename qlist_t doubly linked list structure to th_llist_t. Matti Hamalainen <ccr@tnsp.org> parents: 151 diff changeset	175 int th_cfg_add_string_list(th_cfgitem_t *cfg, const char name, th_llist_t **data)
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	176 {
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	177 th_cfgitem_t *node;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	178
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	179 if (data == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	180 return THERR_NULLPTR;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	181
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	182 node = th_cfg_add(cfg, name, ITEM_STRING_LIST, (void *) data);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	183 if (node == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	184 return THERR_MALLOC;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	185
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	186 return THERR_OK;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 /* 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	191 */
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	192 enum
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	193 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	194 PM_EOF,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	195 PM_ERROR,
159 fc914ff7a9b8 Rename a constant. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	196 PM_IDLE,
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	197 PM_COMMENT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	198 PM_NEXT,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	199 PM_KEYNAME,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	200 PM_KEYSET,
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	201 PM_STRING,
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	202 PM_NUMERIC,
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	203 PM_BOOL,
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	204 PM_SECTION,
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	205 PM_LIST,
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	206
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	207 PM_LAST
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	208 };
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	209
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	210
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	211 typedef struct
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	212 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	213 int ch, strDelim,
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	214 prevMode, nextMode, parseMode;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	215 } th_cfgparserctx_t;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	216
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	217
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	218 static void th_cfg_set_parsemode(th_cfgparserctx_t *ctx, const int mode)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	219 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	220 ctx->prevMode = ctx->parseMode;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	221 ctx->parseMode = mode;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	222 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	223
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	224
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	225 static void th_cfg_set_next_parsemode(th_cfgparserctx_t *ctx, const int mode)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	226 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	227 th_cfg_set_parsemode(ctx, PM_NEXT);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	228 ctx->nextMode = mode;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	229 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	230
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	231
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 #define VADDCH(ch) if (strPos < SET_MAX_BUF) { tmpStr[strPos++] = ch; }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	233
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	234
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	235 static BOOL th_cfg_is_end(const int ch)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	236 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	237 return
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	238 ch == '\r' \|\|
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	239 ch == '\n' \|\|
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	240 ch == ';' \|\|
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	241 ch == '#' \|\|
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	242 th_isspace(ch);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	243 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	244
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	245
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	246 static int th_cfg_get_parsemode(const int type)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	247 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	248 switch (type)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	249 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	250 case ITEM_HEX_TRIPLET:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	251 case ITEM_STRING:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	252 return PM_STRING;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	253
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	254 case ITEM_INT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	255 case ITEM_UINT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	256 case ITEM_FLOAT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	257 return PM_NUMERIC;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	258
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	259 case ITEM_BOOL:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	260 return PM_BOOL;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	261
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	262 case ITEM_SECTION:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	263 return PM_SECTION;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	264
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	265 case ITEM_STRING_LIST:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	266 return PM_LIST;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	267
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	268 default:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	269 return PM_ERROR;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	270 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	271 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	272
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	273
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	274 static void th_cfg_set_item(th_cfgparserctx_t ctx, th_cfgitem_t item, const char *str)
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	275 {
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	276 BOOL res = TRUE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	277
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	278 switch (item->type)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	279 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	280 case ITEM_HEX_TRIPLET:
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	281 res = th_get_hex_triplet(str, item->v.val_uint);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	282 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	283
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	284 case ITEM_STRING:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	285 th_pstr_cpy(item->v.val_str, str);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	286 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	287
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	288 case ITEM_STRING_LIST:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	289 {
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	290 char *tmp;
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	291 if ((tmp = th_strdup(str)) != NULL)
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	292 {
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	293 th_llist_append(item->v.list, tmp);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	294 th_cfg_set_next_parsemode(ctx, PM_LIST);
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	295 // Early exit as we set the parsemode here
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	296 return;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	297 }
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	298 else
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	299 res = FALSE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	300 }
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	301 break;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	302
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	303 case ITEM_INT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	304 *(item->v.val_int) = atoi(str);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	305 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	306
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	307 case ITEM_UINT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	308 *(item->v.val_uint) = atol(str);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	309 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	310
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	311 case ITEM_FLOAT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	312 *(item->v.val_float) = atof(str);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	313 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	314
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	315 case ITEM_BOOL:
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	316 res = th_get_boolean(str, item->v.val_bool);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	317 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	318
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	319 default:
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	320 res = FALSE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	321 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	322 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	323
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	324 th_cfg_set_parsemode(ctx, res ? PM_IDLE : PM_ERROR);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	325 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	326
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	327
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	328 static int th_cfg_read_sect(th_ioctx fh, th_cfgitem_t sect, int nesting)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	329 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	330 th_cfgparserctx_t ctx;
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	331 th_cfgitem_t *item = NULL;
110 d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	332 char *tmpStr = NULL;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	333 size_t strPos;
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	334 BOOL isEscaped, isStart, isError, fpSet;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	335
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	336 // Initialize values
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	337 memset(&ctx, 0, sizeof(ctx));
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	338 ctx.ch = -1;
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	339 ctx.nextMode = ctx.prevMode = ctx.parseMode = PM_IDLE;
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	340 isEscaped = fpSet = isStart = isError = FALSE;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	341 strPos = 0;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	342
110 d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	343 if ((tmpStr = th_malloc(SET_MAX_BUF + 1)) == NULL)
d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	344 goto out;
d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	345
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	346 // Parse the configuration
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	347 while (ctx.parseMode != PM_EOF && ctx.parseMode != PM_ERROR)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	348 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	349 if (ctx.ch == -1)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	350 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	351 // Get next character
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	352 switch (ctx.ch = thfgetc(fh))
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	353 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	354 case EOF:
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	355 if (ctx.parseMode != PM_IDLE)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	356 {
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	357 th_io_error(fh, THERR_OUT_OF_DATA, "Unexpected end of file.\n");
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	358 ctx.parseMode = PM_ERROR;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	359 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	360 else
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	361 ctx.parseMode = PM_EOF;
13 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 case '\n':
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	365 fh->line++;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	366 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	367 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	368
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	369 switch (ctx.parseMode)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	370 {
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	371 case PM_COMMENT:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	372 // Comment parsing mode
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	373 if (ctx.ch == '\n')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	374 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	375 // End of line, end of comment
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	376 th_cfg_set_parsemode(&ctx, ctx.prevMode);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	377 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	378 ctx.ch = -1;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	379 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	380
159 fc914ff7a9b8 Rename a constant. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	381 case PM_IDLE:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	382 // Normal parsing mode
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	383 if (ctx.ch == '#')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	384 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	385 th_cfg_set_parsemode(&ctx, PM_COMMENT);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	386 ctx.ch = -1;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	387 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	388 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	389 if (th_cfg_is_end(ctx.ch))
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	390 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	391 ctx.ch = -1;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	392 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	393 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	394 if (ctx.ch == '}')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	395 {
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	396 if (nesting > 0)
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	397 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	398 // Check for validation errors
110 d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	399 goto out;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	400 }
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	401 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	402 {
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	403 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	404 "Invalid nesting sequence encountered.\n");
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	405 ctx.parseMode = PM_ERROR;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	406 }
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	407 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	408 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	409 if (th_isalpha(ctx.ch))
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	410 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	411 // Start of key name found
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	412 th_cfg_set_parsemode(&ctx, PM_KEYNAME);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	413 strPos = 0;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	414 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	415 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	416 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	417 // Error! Invalid character found
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	418 th_io_error(fh, THERR_INVALID_DATA,
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	419 "Unexpected character '%c'.\n", ctx.ch);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	420 ctx.parseMode = PM_ERROR;
13 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 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	423
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	424 case PM_KEYNAME:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	425 // Configuration KEY name parsing mode
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	426 if (ctx.ch == '#')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	427 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	428 // Start of comment
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	429 th_cfg_set_parsemode(&ctx, PM_COMMENT);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	430 ctx.ch = -1;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	431 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	432 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	433 if (th_iscrlf(ctx.ch) \|\| th_isspace(ctx.ch) \|\| ctx.ch == '=')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	434 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	435 // End of key name
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	436 th_cfg_set_next_parsemode(&ctx, PM_KEYSET);
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	437 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	438 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	439 if (th_isalnum(ctx.ch) \|\| ctx.ch == '_' \|\| ctx.ch == '-')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	440 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	441 // Add to key name string
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	442 VADDCH(ctx.ch)
13 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 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	445 // Error! Key name string too long!
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	446 th_io_error(fh, THERR_INVALID_DATA, "Config key name too long!");
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	447 ctx.parseMode = PM_ERROR;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	448 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	449 ctx.ch = -1;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	450 tmpStr[strPos] = 0;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	451 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	452 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	453 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	454 // Error! Invalid character found
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	455 tmpStr[strPos] = 0;
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	456 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	457 "Unexpected character '%c' in key name '%s'.\n",
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	458 ctx.ch, tmpStr);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	459 ctx.parseMode = PM_ERROR;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	460 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	461 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	462
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	463 case PM_KEYSET:
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	464 if (ctx.ch == '=')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	465 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	466 // Find key from configuration
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	467 BOOL found;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	468 tmpStr[strPos] = 0;
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	469
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	470 for (item = sect, found = FALSE;
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	471 item != NULL && !found;
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	472 item = (th_cfgitem_t *) item->node.next)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	473 {
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	474 found = item->name != NULL && strcmp(item->name, tmpStr) == 0;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	475 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	476
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	477 // Check if key was found
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	478 if (found)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	479 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	480 // Okay, set next mode
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	481 th_cfg_set_next_parsemode(&ctx, th_cfg_get_parsemode(item->type));
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	482 isStart = TRUE;
85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	483 fpSet = FALSE;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	484 strPos = 0;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	485 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	486 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	487 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	488 // Error! No configuration key by this name found
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	489 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	490 "No such configuration setting ('%s')\n",
a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	491 tmpStr);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	492 ctx.parseMode = PM_ERROR;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	493 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	494
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	495 ctx.ch = -1;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	496 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	497 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	498 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	499 // Error! '=' expected!
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	500 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	501 "Unexpected character '%c', assignation '=' was expected.\n",
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	502 ctx.ch);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	503 ctx.parseMode = PM_ERROR;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	504 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	505 break;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	507 case PM_NEXT:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	508 // Search next item parsing mode
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	509 if (ctx.ch == '#')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	510 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	511 // Start of comment
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	512 th_cfg_set_parsemode(&ctx, PM_COMMENT);
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	513 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	514 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	515 if (th_isspace(ctx.ch) \|\| th_iscrlf(ctx.ch))
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	516 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	517 // Ignore whitespaces and linechanges
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	518 ctx.ch = -1;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	519 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	520 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	521 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	522 // Next item found
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	523 th_cfg_set_parsemode(&ctx, ctx.nextMode);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	524 }
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
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	527 case PM_LIST:
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	528 if (isStart)
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	529 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	530 th_cfg_set_parsemode(&ctx, PM_STRING);
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	531 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	532 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	533 if (ctx.ch == ',')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	534 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	535 th_cfg_set_next_parsemode(&ctx, PM_STRING);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	536 ctx.ch = -1;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	537 isStart = TRUE;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	538 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	539 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	540 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	541 th_cfg_set_parsemode(&ctx, PM_IDLE);
16 0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	542 }
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	543 break;
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	544
0cea9c0cfce7 Sync. Matti Hamalainen <ccr@tnsp.org> parents: 15 diff changeset	545 case PM_SECTION:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	546 // Section parsing mode
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	547 if (ctx.ch != '{')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	548 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	549 // Error! Section start '{' expected!
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	550 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	551 "Unexpected character '%c', section start '{' was expected.\n",
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	552 ctx.ch);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	553 ctx.parseMode = PM_ERROR;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	554 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	555 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	556 {
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	557 int res = th_cfg_read_sect(fh, item->v.section, nesting + 1);
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	558 if (res == THERR_OK)
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	559 th_cfg_set_parsemode(&ctx, PM_IDLE);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	560 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	561 ctx.parseMode = PM_ERROR;
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	562
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	563 ctx.ch = -1;
13 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 break;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	566
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	567 case PM_STRING:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	568 // String parsing mode
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	569 if (isStart)
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	570 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	571 // Start of string, get delimiter
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	572 ctx.strDelim = ctx.ch;
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	573 isStart = FALSE;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	574 strPos = 0;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	575 isEscaped = FALSE;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	576 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	577 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	578 if (!isEscaped && ctx.ch == ctx.strDelim)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	579 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	580 // End of string, set the value
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	581 tmpStr[strPos] = 0;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	582 th_cfg_set_item(&ctx, item, tmpStr);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	583 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	584 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	585 if (!isEscaped && ctx.ch == '\\')
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	586 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	587 // Escape sequence
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	588 isEscaped = TRUE;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	589 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	590 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	591 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	592 // Add character to string
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	593 VADDCH(ctx.ch)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	594 else
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	595 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	596 // Error! String too long!
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	597 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	598 "String too long! Maximum is %d characters.",
a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	599 SET_MAX_BUF);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	600 ctx.parseMode = PM_ERROR;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	601 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	602 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	603
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	604 ctx.ch = -1;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	605 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	606
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	607 case PM_NUMERIC:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	608 // Integer parsing mode
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	609 if (isStart && item->type == ITEM_UINT && ctx.ch == '-')
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	610 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	611 // Error! Negative values not allowed for unsigned ints
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	612 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	613 "Negative value specified for %s, unsigned value expected.",
a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	614 item->name);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	615 ctx.parseMode = PM_ERROR;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	616 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	617 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	618 if (isStart && (ctx.ch == '-' \|\| ctx.ch == '+'))
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	619 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	620 VADDCH(ctx.ch)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	621 else
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	622 isError = TRUE;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	623 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	624 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	625 if (isStart && item->type == ITEM_FLOAT && ctx.ch == '.')
172 eb2c073d93b3 Adding floating point configuration item support. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	626 {
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	627 fpSet = TRUE;
172 eb2c073d93b3 Adding floating point configuration item support. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	628 VADDCH('0')
eb2c073d93b3 Adding floating point configuration item support. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	629 else
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	630 isError = TRUE;
172 eb2c073d93b3 Adding floating point configuration item support. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	631
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	632 VADDCH(ctx.ch)
172 eb2c073d93b3 Adding floating point configuration item support. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	633 else
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	634 isError = TRUE;
172 eb2c073d93b3 Adding floating point configuration item support. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	635 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	636 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	637 if (item->type == ITEM_FLOAT && ctx.ch == '.' && !fpSet)
172 eb2c073d93b3 Adding floating point configuration item support. Matti Hamalainen <ccr@tnsp.org> parents: 170 diff changeset	638 {
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	639 fpSet = TRUE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	640 VADDCH(ctx.ch)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	641 else
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	642 isError = TRUE;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	643 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	644 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	645 if (th_isdigit(ctx.ch))
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	646 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	647 VADDCH(ctx.ch)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	648 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	649 isError = TRUE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	650 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	651 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	652 if (th_cfg_is_end(ctx.ch))
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	653 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	654 // End of integer parsing mode
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	655 tmpStr[strPos] = 0;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	656 th_cfg_set_item(&ctx, item, tmpStr);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	657 th_cfg_set_parsemode(&ctx, PM_IDLE);
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	658 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	659 else
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	660 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	661 // Error! Unexpected character.
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	662 th_io_error(fh, THERR_INVALID_DATA,
170 8e69e07e5aac Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	663 "Unexpected character '%c' for numeric setting '%s'.",
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	664 ctx.ch, item->name);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	665 ctx.parseMode = PM_ERROR;
13 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
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	668 if (isError)
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	669 {
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	670 // Error! String too long!
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	671 th_io_error(fh, THERR_INVALID_DATA,
70 a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	672 "String too long! Maximum is %d characters.",
a0e1b29be35d Refactor configuration file handling module rather thoroughly. The API is Matti Hamalainen <ccr@tnsp.org> parents: 66 diff changeset	673 SET_MAX_BUF);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	674 ctx.parseMode = PM_ERROR;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	675 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	676
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	677 isStart = FALSE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	678 ctx.ch = -1;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	679 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	680
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	681 case PM_BOOL:
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	682 // Boolean parsing mode
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	683 if (isStart)
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	684 {
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	685 isStart = FALSE;
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	686 strPos = 0;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	687 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	688
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	689 if (th_isalnum(ctx.ch))
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	690 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	691 VADDCH(ctx.ch)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	692 else
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	693 isError = TRUE;
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	694 }
a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	695 else
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	696 if (th_cfg_is_end(ctx.ch))
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	697 {
a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	698 tmpStr[strPos] = 0;
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	699 th_cfg_set_item(&ctx, item, tmpStr);
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	700 }
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	701
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	702 if (isError \|\| ctx.parseMode == PM_ERROR)
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	703 {
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	704 th_io_error(fh, THERR_INVALID_DATA,
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	705 "Invalid boolean value for '%s'.\n",
a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	706 item->name);
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	707 ctx.parseMode = PM_ERROR;
168 a2cd862315c5 Use th_get_boolean() in configuration parser. Matti Hamalainen <ccr@tnsp.org> parents: 160 diff changeset	708 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	709 ctx.ch = -1;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	710 break;
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	711 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	712 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	713
110 d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	714 out:
d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	715 th_free(tmpStr);
d739df7efba7 Use dynamic allocation for one buffer. Matti Hamalainen <ccr@tnsp.org> parents: 83 diff changeset	716
129 aa2d608fb3f3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 125 diff changeset	717 // Return result
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	718 if (ctx.parseMode == PM_ERROR)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	719 return fh->status;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	720 else
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	721 return THERR_OK;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	722 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	723
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	724
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	725 int th_cfg_read(th_ioctx fh, th_cfgitem_t cfg)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	726 {
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	727 if (fh == NULL \|\| cfg == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	728 return THERR_NULLPTR;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	729
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	730 return th_cfg_read_sect(fh, cfg, 0);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	731 }
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	733
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	734 /* Write a configuration into file
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735 */
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	736 static BOOL th_print_indent_a(th_ioctx fh, const int nesting, const char fmt, va_list ap)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	737 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	738 for (int i = 0; i < nesting * 4; i++)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	739 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	740 if (thfputc(' ', fh) == EOF)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	741 return FALSE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	742 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	743
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	744 return thvfprintf(fh, fmt, ap) >= 0;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	745 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	746
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	747
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	748 static BOOL th_print_indent(th_ioctx fh, const int nesting, const char fmt, ...)
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	750 BOOL ret;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	751 va_list ap;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	752 va_start(ap, fmt);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	753 ret = th_print_indent_a(fh, nesting, fmt, ap);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	754 va_end(ap);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	755 return ret;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	756 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	757
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	758
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	759 static BOOL th_cfg_is_item_valid(const th_cfgitem_t *item)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	760 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	761 switch (item->type)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	762 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	763 case ITEM_STRING:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	764 return (*(item->v.val_str) != NULL);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	765
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	766 case ITEM_STRING_LIST:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	767 return (*(item->v.list) != NULL);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	768
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	769 case ITEM_SECTION:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	770 return TRUE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	771
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	772 case ITEM_INT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	773 case ITEM_UINT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	774 case ITEM_FLOAT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	775 case ITEM_BOOL:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	776 case ITEM_HEX_TRIPLET:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	777 return TRUE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	778
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	779 default:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	780 return FALSE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	781 }
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	782 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783
bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	785 static BOOL th_cfg_write_string_escaped(th_ioctx fh, const char str, const char delim)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	786 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	787 for (const char ptr = str; ptr; ptr++)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	788 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	789 if (*ptr == delim)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	790 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	791 if (thfputc('\\', fh) == EOF \|\|
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	792 thfputc(*ptr, fh) == EOF)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	793 return FALSE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	794 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	795 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	796 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	797 if (thfputc(*ptr, fh) == EOF)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	798 return FALSE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	799 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	800 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	801
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	802 return TRUE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	803 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	804
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	805
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	806 static int th_cfg_write_item(th_ioctx fh, const th_cfgitem_t item)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	807 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	808 switch (item->type)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	809 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	810 case ITEM_STRING:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	811 if (thfputc('"', fh) != EOF &&
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	812 th_cfg_write_string_escaped(fh, *(item->v.val_str), '"') &&
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	813 thfputc('"', fh) != EOF)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	814 return 1;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	815 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	816 return -1;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	817
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	818 case ITEM_INT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	819 return thfprintf(fh, "%d", *(item->v.val_int));
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	820
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	821 case ITEM_UINT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	822 return thfprintf(fh, "%u", *(item->v.val_uint));
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	823
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	824 case ITEM_FLOAT:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	825 return thfprintf(fh, "%1.5f", *(item->v.val_float));
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	826
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	827 case ITEM_BOOL:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	828 return thfprintf(fh, "%s", *(item->v.val_bool) ? "yes" : "no");
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	829
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	830 case ITEM_HEX_TRIPLET:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	831 return thfprintf(fh, "\"%06x\"", *(item->v.val_int));
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	832
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	833 default:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	834 return -1;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	835 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	836 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	837
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	838
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	839 static int th_cfg_write_sect(th_ioctx fh, const th_cfgitem_t item, const int nesting)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	840 {
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	841 while (item != NULL)
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	842 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	843 if (item->name == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	844 return THERR_NULLPTR;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	845
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	846 if (item->type == ITEM_COMMENT)
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	847 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	848 BOOL lineStart = TRUE, lineFeed = FALSE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	849
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	850 for (const char ptr = item->name; ptr; ptr++)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	851 switch (*ptr)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	852 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	853 case '\r':
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	854 case '\n':
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	855 lineStart = lineFeed = TRUE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	856 break;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	857
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	858 default:
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	859 if (lineFeed)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	860 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	861 thfprintf(fh, "\n");
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	862 lineFeed = FALSE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	863 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	864 if (lineStart)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	865 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	866 if (!th_print_indent(fh, nesting, "# "))
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	867 return THERR_FWRITE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	868
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	869 lineStart = FALSE;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	870 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	871
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	872 if (thfputc(*ptr, fh) == EOF)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	873 return THERR_FWRITE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	874 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	875
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	876 if (!lineFeed)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	877 thfprintf(fh, "\n");
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	878 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	879 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	880 if (item->type == ITEM_SECTION)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	881 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	882 int res;
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	883
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	884 if (!th_print_indent(fh, nesting, "%s = {\n", item->name))
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	885 return THERR_FWRITE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	886
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	887 if ((res = th_cfg_write_sect(fh, item->v.section, nesting + 1)) != 0)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	888 return res;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	889
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	890 if (!th_print_indent(fh, nesting, "}\n\n"))
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	891 return THERR_FWRITE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	892 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	893 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	894 if (item->type == ITEM_STRING_LIST)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	895 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	896 if (!th_cfg_is_item_valid(item))
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	897 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	898 if (!th_print_indent(fh, nesting, "#%s = \"\", \"\"", item->name))
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	899 return THERR_FWRITE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	900 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	901 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	902 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	903 th_llist_t node = (item->v.list);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	904 size_t n = th_llist_length(node);
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	905
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	906 if (!th_print_indent(fh, nesting, "%s = \n", item->name))
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	907 return THERR_FWRITE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	908
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	909 for (; node != NULL; node = node->next)
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	910 if (node->data != NULL)
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	911 {
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	912 if (!th_print_indent(fh, nesting, "\"%s\"%s\n",
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	913 (char *) node->data,
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	914 --n > 0 ? "," : ""))
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	915 return THERR_FWRITE;
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	916 }
7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	917
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	918 if (!th_print_indent(fh, nesting, "\n"))
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	919 return THERR_FWRITE;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	920 }
adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	921 }
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	922 else
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	923 {
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	924 if (!th_print_indent(fh, nesting, "%s%s = ",
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	925 th_cfg_is_item_valid(item) ? "" : "#",
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	926 item->name) \|\|
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	927 th_cfg_write_item(fh, item) < 0 \|\|
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	928 thfprintf(fh, "\n") < 0)
db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	929 return THERR_FWRITE;
509 b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	930 }
b506bff0a7ab Some cleanup work and refactoring on the configuration file parser and writer. Matti Hamalainen <ccr@tnsp.org> parents: 504 diff changeset	931
155 23a79bd6c9d6 Use th_llist for th_config module as well instead of duped linked list Matti Hamalainen <ccr@tnsp.org> parents: 152 diff changeset	932 item = (th_cfgitem_t *) item->node.next;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	933 }
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	934
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	935 return THERR_OK;
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	936 }
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	938
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	939 int th_cfg_write(th_ioctx fh, const th_cfgitem_t cfg)
13 adcbcac66125 Import improved config code from chat client fork of th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 7 diff changeset	940 {
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	941 if (fh == NULL \|\| cfg == NULL)
514 db3fc3d4969e Return proper THERR_* error codes from th_config functions, at least for some parts. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	942 return THERR_NULLPTR;
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	943
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	944 thfprintf(fh, "# Configuration written by %s %s\n\n",
62 36286f2561e1 Oops, 10L. Matti Hamalainen <ccr@tnsp.org> parents: 49 diff changeset	945 th_prog_desc, th_prog_version);
42 7851f704d499 Reindent and cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 34 diff changeset	946
499 836e16f27b34 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 498 diff changeset	947 return th_cfg_write_sect(fh, cfg, 0);
0 bd61a80a6c54 Initial import into Mercurial repository. Discarding old cvs/svn history Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948 }
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	949
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	950
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	951 /* Find a configuration item based on section and/or name (and/or) type.
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	952 * The first matching item will be returned.
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	953 */
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	954 static th_cfgitem_t th_cfg_find_do(th_cfgitem_t item, const char *name, const int type)
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	955 {
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	956 while (item != NULL)
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	957 {
457 85fa3d333556 Actually, revert the boolean changes .. meh. Matti Hamalainen <ccr@tnsp.org> parents: 453 diff changeset	958 BOOL match = TRUE;
441 2991e6b52d95 Get rid of trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	959
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	960 // Has type check been set, and does it match?
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	961 if (type != -1 && item->type != type)
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	962 match = FALSE;
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	963
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	964 // Check item name
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	965 if (name != NULL && item->name != NULL &&
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	966 strcmp(name, item->name) != 0)
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	967 match = FALSE;
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	968
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	969 // Recurse to section
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	970 if (!match && item->type == ITEM_SECTION)
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	971 {
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	972 th_cfgitem_t *tmp = th_cfg_find_do(item->v.section, name, type);
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	973 if (tmp != NULL)
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	974 return tmp;
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	975 }
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	976
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	977 // Do we have a match?
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	978 if (match)
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	979 return item;
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	980
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	981 item = (th_cfgitem_t *) item->node.next;
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	982 }
441 2991e6b52d95 Get rid of trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 205 diff changeset	983
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	984 return NULL;
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	985 }
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	986
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	987
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	988 th_cfgitem_t th_cfg_find(th_cfgitem_t cfg, const char section, const char name, const int type)
50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	989 {
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	990 th_cfgitem_t *node;
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	991
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	992 if (section != NULL)
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	993 node = th_cfg_find_do(cfg, section, ITEM_SECTION);
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	994 else
3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	995 node = cfg;
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	996
504 3a0864eb358f Fix the functionality of th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 499 diff changeset	997 return th_cfg_find_do(node, name, type);
83 50006067bcd1 Add new function, th_cfg_find(). Matti Hamalainen <ccr@tnsp.org> parents: 70 diff changeset	998 }

Mercurial > hg > th-libs

annotate th_config.c @ 514:db3fc3d4969e