From e23b57dd8b0ac4da53451625be99ca1fa75caa48 Mon Sep 17 00:00:00 2001 From: Robert Spalek Date: Mon, 24 Apr 2006 10:54:15 +0200 Subject: [PATCH] conf2: insert a node into a list as soon as possible instead of at the end This allows user-defined parsers to see nodes during processing and they can easier check for duplicates (see lang/lang.c). --- lib/conf2.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/conf2.c b/lib/conf2.c index c240f2d8..5ae93b58 100644 --- a/lib/conf2.c +++ b/lib/conf2.c @@ -811,7 +811,11 @@ opening_brace(struct cf_item *item, void *ptr, enum cf_operation op) cf_init_section(item->name, item->u.sec, stack[level].base_ptr, 1); stack[level].list = ptr; stack[level].item = item; - stack[level].op |= (op & OP_MASK) < OP_REMOVE ? OP_2ND : OP_1ST; + if ((op & OP_MASK) < OP_REMOVE) { + add_to_list(ptr, stack[level].base_ptr, op & OP_MASK); + stack[level].op |= OP_2ND; + } else + stack[level].op |= OP_1ST; } else return "Opening brace can only be used on sections and lists"; @@ -844,6 +848,7 @@ closing_brace(struct item_stack *st, enum cf_operation op, int number, byte **pa ASSERT(0); if (op & OP_OPEN) { // stay at the same recursion level st->op = (st->op | OP_2ND) & ~OP_1ST; + add_to_list(st->list, st->base_ptr, pure_op); return NULL; } int taken; // parse parameters on 1 line immediately @@ -852,8 +857,8 @@ closing_brace(struct item_stack *st, enum cf_operation op, int number, byte **pa pars += taken; // and fall-thru to the 2nd phase } + add_to_list(st->list, st->base_ptr, pure_op); } - add_to_list(st->list, st->base_ptr, pure_op); level--; if (number) return "No parameters expected after the }"; -- 2.39.2