radsecproxy-1.6.5.

[libradsec.git] / catgconf.c

diff --git a/catgconf.c b/catgconf.c
index dc0f312..42b1d40 100644 (file)
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,3 +1,12 @@
+/*
+ * Copyright (C) 2008 Stig Venaas <venaas@uninett.no>
+ * Copyright (C) 2010,2011,2012 NORDUnet A/S
+ *
+ * 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.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
@@ -5,17 +14,20 @@
 #include "debug.h"
 #include "gconfig.h"
 
-void listconfig(struct gconffile **cf, char *block, int compact) {
-    char *opt, *val;
+int listconfig(struct gconffile **cf, char *block, int compact) {
+    char *opt = NULL, *val = NULL;
     int conftype;
 
     for (;;) {
-       getconfigline(cf, block, &opt, &val, &conftype);
-       if (!opt)
-           return;
+       free(opt);
+       free(val);
+       if (!getconfigline(cf, block, &opt, &val, &conftype))
+            return -1;
+        if (!opt)
+            return 0;           /* Success.  */
 
        if (conftype == CONF_STR && !strcasecmp(opt, "include")) {
-           if (!pushgconffiles(cf, val))
+           if (!pushgconfpaths(cf, val))
                debugx(1, DBG_ERR, "failed to include config file %s", val);
            continue;
        }
@@ -29,20 +41,24 @@ void listconfig(struct gconffile **cf, char *block, int compact) {
            break;
        case CONF_CBK:
            printf("%s %s {%s", opt, val, compact ? "" : "\n");
-           listconfig(cf, val, compact);
+           if (listconfig(cf, val, compact))
+                return -1;
            printf("}\n");
            break;
        default:
            printf("Unsupported config type\n");
+            return -1;
        }
     }
+
+    return 0;                   /* Success.  */
 }
 
 int main(int argc, char **argv) {
     int c, compact = 0;
     struct gconffile *cfs;
 
-    debug_init("catgconf");
+    debug_init("radsecproxy-conf");
     debug_set_level(DBG_WARN);
 
     while ((c = getopt(argc, argv, "c")) != -1) {
@@ -58,10 +74,13 @@ int main(int argc, char **argv) {
         goto usage;
 
     cfs = openconfigfile(argv[optind]);
-    listconfig(&cfs, NULL, compact);
-    return 0;
+    return listconfig(&cfs, NULL, compact);
 
 usage:
     debug(DBG_ERR, "Usage:\n%s [ -c ] configfile", argv[0]);
     exit(1);
 }
+
+/* Local Variables: */
+/* c-file-style: "stroustrup" */
+/* End: */