conf2: verified and fixed all parsers

[libucw.git] / lib / conf2-test.c

diff --git a/lib/conf2-test.c b/lib/conf2-test.c
index 428150bc34d8620aab697159a58aa50a6bd79497..99b9b0a846f230e912c1f3ec376876d426d5cb11 100644 (file)
--- a/lib/conf2-test.c
+++ b/lib/conf2-test.c
@@ -7,9 +7,14 @@
 #include "lib/lib.h"
 #include "lib/conf2.h"
 #include "lib/clists.h"
+#include "lib/fastbuf.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <time.h>
+#include <getopt.h>
+
+static int verbose;
 
 struct sub_sect_1 {
   struct cnode n;
@@ -26,6 +31,7 @@ init_sec_1(struct sub_sect_1 *s)
   s->level = "default";
   s->confidence[0] = 5;
   s->confidence[1] = 6;
+  // leave s->list==NULL
   return NULL;
 }
 
@@ -62,6 +68,7 @@ static double d1 = -1.1;
 static struct sub_sect_1 sec1 = { {}, "Charlie", "WBAFC", { 0, -1} };
 static struct clist secs;
 static time_t t1, t2;
+static u32 ip;
 
 static byte *
 init_top(void *ptr UNUSED)
@@ -91,7 +98,7 @@ time_parser(uns number, byte **pars, time_t *ptr)
   return NULL;
 }
 
-static struct cf_section cf_top UNUSED = {
+static struct cf_section cf_top = {
   CF_COMMIT(init_top),
   CF_COMMIT(commit_top),
   CF_ITEMS {
@@ -99,19 +106,59 @@ static struct cf_section cf_top UNUSED = {
     CF_INT_DYN("nrs1", &nrs1, 1000),
     CF_INT_ARY("nrs2", nrs2, 5),
     CF_STRING("str1", &str1),
-    CF_STRING_DYN("str2", &str2, 2),
+    CF_STRING_DYN("str2", &str2, 20),
     CF_U64("u1", &u1),
     CF_DOUBLE("d1", &d1),
     CF_PARSER("FirstTime", &t1, time_parser, -1),
     CF_PARSER("SecondTime", &t2, time_parser, 1),
     CF_SECTION("master", &sec1, &cf_sec_1),
     CF_LIST("slaves", &secs, &cf_sec_1),
+    CF_IP("ip", &ip),
     CF_END
   }
 };
 
+static byte short_opts[] = CF_SHORT_OPTS "v";
+static struct option long_opts[] = {
+       CF_LONG_OPTS
+       {"verbose",     0, 0, 'v'},
+       {NULL,          0, 0, 0}
+};
+
+static char *help = "\
+Usage: conf2-test <options>\n\
+\n\
+Options:\n"
+CF_USAGE
+"-v\t\tBe verbose\n\
+";
+
+static void NONRET
+usage(void)
+{
+       fputs(help, stderr);
+       exit(1);
+}
+
 int
-main(void)
+main(int argc, char *argv[])
 {
+  log_init(argv[0]);
+  cf_declare_section("top", &cf_top, 0);
+  cf_def_file = "lib/conf2.t";
+
+  int opt;
+  while ((opt = cf_get_opt(argc, argv, short_opts, long_opts, NULL)) >= 0)
+    switch (opt) {
+      case 'v': verbose++; break;
+      default: usage();
+    }
+  if (optind < argc)
+    usage();
+
+  struct fastbuf *out = bfdopen(1, 1<<14);
+  cf_dump_sections(out);
+  bclose(out);
+
   return 0;
 }