head	1.19;
access;
symbols
	FSL_1_7_0:1.19
	CFG_0_9_11:1.19
	FSL_1_6_1:1.18
	CFG_0_9_10:1.18
	FSL_1_6_0:1.18
	FSL_1_6b2:1.18
	CFG_0_9_9:1.18
	FSL_1_6b1:1.18
	CFG_0_9_8:1.18
	CFG_0_9_7:1.17
	CFG_0_9_6:1.17
	CFG_0_9_5:1.16
	CFG_0_9_4:1.14
	FSL_1_5_0:1.13
	FSL_1_5a3:1.13
	CFG_0_9_3:1.13
	FSL_1_5a2:1.13
	FSL_1_5a1:1.13
	FSL_1_4_0:1.13
	FSL_1_4b1:1.13
	CFG_0_9_2:1.13
	CFG_0_9_1:1.13
	FSL_1_4a1:1.13
	FSL_1_3_0:1.13
	FSL_1_3b1:1.13
	FSL_1_2_1:1.13
	FSL_1_2_0:1.13
	FSL_1_1_0:1.13
	FSL_1_1b1:1.13
	FSL_1_0_8:1.13
	FSL_1_0_7:1.13
	FSL_1_0_6:1.8
	FSL_1_0_5:1.8
	FSL_1_0_4:1.8
	FSL_1_0_3:1.8
	FSL_1_0_2:1.8
	FSL_1_0_1:1.8
	FSL_1_0_0:1.8
	FSL_0_9_0:1.8
	CFG_0_9_0:1.8
	FSL_0_1_12:1.8
	FSL_0_1_11:1.8
	FSL_0_1_10:1.8
	FSL_0_1_9:1.8
	FSL_0_1_8:1.8
	FSL_0_1_7:1.8
	FSL_0_1_6:1.8
	FSL_0_1_5:1.8
	FSL_0_1_1:1.7;
locks; strict;
comment	@ * @;


1.19
date	2006.08.10.19.35.57;	author rse;	state Exp;
branches;
next	1.18;
commitid	Isy241gp4yykKkIr;

1.18
date	2004.12.31.19.16.25;	author rse;	state Exp;
branches;
next	1.17;

1.17
date	2004.11.29.07.09.33;	author rse;	state Exp;
branches;
next	1.16;

1.16
date	2004.11.20.12.54.07;	author rse;	state Exp;
branches;
next	1.15;

1.15
date	2004.11.20.11.48.39;	author rse;	state Exp;
branches;
next	1.14;

1.14
date	2004.07.17.07.37.55;	author rse;	state Exp;
branches;
next	1.13;

1.13
date	2003.01.06.11.17.43;	author rse;	state Exp;
branches;
next	1.12;

1.12
date	2002.11.18.10.25.41;	author rse;	state Exp;
branches;
next	1.11;

1.11
date	2002.11.18.10.23.36;	author rse;	state Exp;
branches;
next	1.10;

1.10
date	2002.11.18.09.51.29;	author rse;	state Exp;
branches;
next	1.9;

1.9
date	2002.11.10.12.12.23;	author rse;	state Exp;
branches;
next	1.8;

1.8
date	2002.07.24.10.04.15;	author rse;	state Exp;
branches;
next	1.7;

1.7
date	2002.07.18.15.34.55;	author rse;	state Exp;
branches;
next	1.6;

1.6
date	2002.07.11.09.19.13;	author rse;	state Exp;
branches;
next	1.5;

1.5
date	2002.07.10.14.46.28;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2002.07.05.18.32.37;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2002.07.05.15.32.42;	author rse;	state Exp;
branches;
next	1.2;

1.2
date	2002.07.04.14.51.21;	author rse;	state Exp;
branches;
next	1.1;

1.1
date	2002.07.03.13.25.34;	author rse;	state Exp;
branches;
next	;


desc
@@


1.19
log
@cleanup source tree for status as of 2006
@
text
@/*
**  OSSP cfg - Configuration Parsing
**  Copyright (c) 2002-2006 Ralf S. Engelschall <rse@@engelschall.com>
**  Copyright (c) 2002-2006 The OSSP Project (http://www.ossp.org/)
**
**  This file is part of OSSP cfg, a configuration parsing
**  library which can be found at http://www.ossp.org/pkg/lib/cfg/.
**
**  Permission to use, copy, modify, and distribute this software for
**  any purpose with or without fee is hereby granted, provided that
**  the above copyright notice and this permission notice appear in all
**  copies.
**
**  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
**  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
**  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
**  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
**  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
**  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
**  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
**  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
**  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
**  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
**  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
**  SUCH DAMAGE.
**
**  cfg_test.c: test suite
*/

/* standard system headers */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

/* OSSP cfg headers */
#include "cfg.h"
#include "cfg_util.h"
#include "cfg_global.h"

/* main test program procedure */
int main(int argc, char *argv[])
{
    cfg_rc_t rc;
    char *im_ptr;
    size_t im_size;
    size_t im_used;
    char *ex_ptr;
    char *error;
    cfg_t *cfg;
    cfg_node_t **vec;
    int i;

    /* command line processing */
    if (argc < 2 || argc > 3) {
        fprintf(stderr, "USAGE: %s <file> [<select>]\n", argv[0]);
        exit(1);
    }

    /* read configuration file into memory */
    if ((rc = cfg_util_readfile(argv[1], &im_ptr, &im_size, &im_used)) != CFG_OK) {
        fprintf(stderr, "ERROR: reading file \"%s\"\n", argv[1]);
        exit(1);
    }

    /* create configuration object */
    if ((rc = cfg_create(&cfg)) != CFG_OK) {
        cfg_error(cfg, rc, &error);
        fprintf(stderr, "ERROR: cfg_create: %s\n", error);
        free(im_ptr);
        exit(1);
    }

    /* parse configuration */
    if ((rc = cfg_import(cfg, NULL, CFG_FMT_CFG, im_ptr, im_used)) != CFG_OK) {
        cfg_error(cfg, rc, &error);
        fprintf(stderr, "ERROR: cfg_import: %s\n", error);
        free(im_ptr);
        cfg_destroy(cfg);
        exit(1);
    }

    /* free configuration file in memory */
    free(im_ptr);

    /* export configuration again into memory */
    if ((rc = cfg_export(cfg, NULL, CFG_FMT_CFG, &ex_ptr, 0)) != CFG_OK) {
        cfg_error(cfg, rc, &error);
        fprintf(stderr, "ERROR: cfg_export: %s\n", error);
        cfg_destroy(cfg);
        exit(1);
    }

    /* print results */
    fprintf(stdout, "%s", ex_ptr);
    fflush(stdout);

    /* free configuration file in memory */
    free(ex_ptr);

    /* optional node selection */
    if (argc == 3) {
        fprintf(stdout, "==== selection process ====\n");
        if ((rc = cfg_node_select(cfg, NULL, &vec, "%s", argv[2])) != CFG_OK) {
            cfg_error(cfg, rc, &error);
            fprintf(stderr, "ERROR: cfg_node_select: %s\n", error);
            cfg_destroy(cfg);
            exit(1);
        }
        fprintf(stdout, "==== selection results ====\n");
        for (i = 0; vec[i] != NULL; i++) {
            fprintf(stdout, "---- selection result #%d ----\n", i);
            if ((rc = cfg_export(cfg, vec[i], CFG_FMT_CFG, &ex_ptr, 0)) != CFG_OK) {
                cfg_error(cfg, rc, &error);
                fprintf(stderr, "ERROR: cfg_export: %s\n", error);
                cfg_destroy(cfg);
                exit(1);
            }
            fprintf(stdout, "%s", ex_ptr);
            fprintf(stdout, "---- selection #%d ----\n", i);
            free(ex_ptr);
        }
        fprintf(stdout, "==== selection end ====\n");
    }

    /* destroy configuration object */
    cfg_destroy(cfg);

    return 0;
}

@


1.18
log
@Adjust copyright messages for new year 2005.
@
text
@d3 2
a4 3
**  Copyright (c) 2002-2005 Ralf S. Engelschall <rse@@engelschall.com>
**  Copyright (c) 2002-2005 The OSSP Project (http://www.ossp.org/)
**  Copyright (c) 2002-2005 Cable & Wireless (http://www.cw.com/)
@


1.17
log
@Fix optional DMalloc build support.
@
text
@d3 3
a5 3
**  Copyright (c) 2002-2004 Ralf S. Engelschall <rse@@engelschall.com>
**  Copyright (c) 2002-2004 The OSSP Project (http://www.ossp.org/)
**  Copyright (c) 2002-2004 Cable & Wireless (http://www.cw.com/)
@


1.16
log
@- Fixed cfg_test program by correctly passing the used number of
  bytes in the buffer instead of the size of the buffer.
- Accept zero-length strings for parsing.
- Correctly handle end-of-file during plain text token scanning.
@
text
@d38 1
a39 1
#include "cfg_util.h"
@


1.15
log
@some code annotations
@
text
@d47 1
d61 1
a61 1
    if ((rc = cfg_util_readfile(argv[1], &im_ptr, &im_size)) != CFG_OK) {
d75 1
a75 1
    if ((rc = cfg_import(cfg, NULL, CFG_FMT_CFG, im_ptr, im_size)) != CFG_OK) {
@


1.14
log
@Adjust copyright messages for new year 2004.
@
text
@d31 1
d36 1
d41 1
d53 1
d59 1
d65 1
d73 1
d81 2
d85 1
d93 1
d96 2
d100 1
d125 1
@


1.13
log
@update copyright messages for new year
@
text
@d3 3
a5 3
**  Copyright (c) 2002-2003 Ralf S. Engelschall <rse@@engelschall.com>
**  Copyright (c) 2002-2003 The OSSP Project (http://www.ossp.org/)
**  Copyright (c) 2002-2003 Cable & Wireless Deutschland (http://www.cw.com/de/)
@


1.12
log
@better reporting
@
text
@d1 29
@


1.11
log
@more memory handling cleanups
@
text
@d59 1
d66 3
a68 2
        for (i = 1; vec[i] != NULL; i++) {
            fprintf(stdout, "---- selection #%d ----\n", i);
d79 1
@


1.10
log
@add Dmalloc support
@
text
@d45 1
a49 1
        free(im_ptr);
d56 1
d62 1
a62 2
            free(im_ptr);
            /*cfg_destroy(cfg);*/
d70 1
a70 2
                free(im_ptr);
                /*cfg_destroy(cfg);*/
d75 1
a78 2
#if 0
    cfg_syn_destroy(cfg, node);
a79 1
#endif
@


1.9
log
@remove trailing whitespaces
@
text
@d7 1
@


1.8
log
@get rid of warnings
@
text
@d9 1
a9 1
int main(int argc, char *argv[]) 
@


1.7
log
@flush work of today: first cut for real cfg_node_select()
@
text
@a17 1
    cfg_node_t *n;
d61 1
a61 1
            //cfg_destroy(cfg);
d70 1
a70 1
                //cfg_destroy(cfg);
@


1.6
log
@remove no longer needed stuff
@
text
@d17 3
d21 2
a22 2
    if (argc != 2) {
        fprintf(stderr, "USAGE: %s <file>\n", argv[0]);
a45 1

d55 23
@


1.5
log
@Step 2 in API overhauling and implementation filling.
@
text
@a7 3
#include "cfg_node.h"
#include "cfg_syn.h"
#include "cfg_buf.h"
@


1.4
log
@Add line-continuation support and make export output correctly
quote the tokens.
@
text
@d15 5
a19 4
    char *buf_ptr;
    size_t buf_size;
    cfg_node_t *node;
    char err_buf[1024];
d25 2
a26 1
    if ((rc = cfg_util_readfile(argv[1], &buf_ptr, &buf_size)) != CFG_OK) {
a29 2
    rc = cfg_syn_import(NULL, &node, buf_ptr, err_buf, sizeof(err_buf));
    free(buf_ptr);
d31 13
a43 6
    if (rc != CFG_OK)
        fprintf(stderr, "ERROR: %s\n", err_buf);
    else {
        cfg_syn_export(NULL, node, &buf_ptr);
        cfg_syn_destroy(NULL, node);
        fprintf(stdout, "%s", buf_ptr);
d45 16
@


1.3
log
@thanks to Dmalloc we can fix the memory holes
@
text
@d36 1
a36 1
        fprintf(stdout, "%s\n", buf_ptr);
@


1.2
log
@Flush today's work: the library is now able to parse a .cfg file into
an internal node tree and export this again in textual .cfg file format
(including indented blocks).
@
text
@d35 1
@


1.1
log
@Add this first cut for the forthcoming OSSP cfg library to CVS.
This is work in progress and still not ready for use anywhere.
@
text
@d10 1
a10 55

typedef struct {
    int line;
    int col;
    FILE *fp;
} cb_ctx_t;

static void cb_out(cb_ctx_t *ctx, char *str)
{
    int i;

    fprintf(stderr, "cb_out <%s>\n", str);
    fprintf(ctx->fp, "%s", str);
    for (i = 0; str[i] != '\0'; i++) {
        if (str[i] == '\n') {
            ctx->line++;
            ctx->col = 0;
        }
        else {
            ctx->col++;
        }
    }
}

static void cb_fct(void *_ctx, cfg_node_t *node)
{
    cb_ctx_t *ctx = (cb_ctx_t *)_ctx;
    cfg_node_type_t type;
    cfg_node_t *node2;
    cfg_rc_t rc;
    char *token;

    fprintf(stderr, "cb_fct enter\n");
    rc = cfg_node_get(node, CFG_NODE_ATTR_TYPE, &type);
    fprintf(stderr, "rc=%d type=%d\n", rc, type);
    if (type == CFG_NODE_TYPE_SEQ) {
        cb_out(ctx, " {\n");
    }
    else if (type == CFG_NODE_TYPE_DIR) {
        cb_out(ctx, ";\n");
        cfg_node_get(node, CFG_NODE_ATTR_RBROTH, &node2);
        if (node2 == NULL)
            cb_out(ctx, "};\n");
    }
    else if (type == CFG_NODE_TYPE_TOK) {
        cfg_node_get(node, CFG_NODE_ATTR_TOKEN, &token);
        if (token != NULL) {
            cb_out(ctx, token);
            cfg_node_get(node, CFG_NODE_ATTR_RBROTH, &node2);
            if (node2 != NULL)
                cb_out(ctx, " ");
        }
    }
    fprintf(stderr, "cb_fct leave\n");
}
d28 4
a31 1
    if ((rc = cfg_syn(NULL, &node, err_buf, sizeof(err_buf), buf_ptr)) != CFG_OK) {
a32 1
    }
d34 2
a35 6
        cb_ctx_t ctx;

        ctx.line = 0;
        ctx.col = 0;
        ctx.fp = stdout;
        cfg_node_apply(node, cb_fct, &ctx);
a36 1
    free(buf_ptr);
@