Minor config file fixes (example, conversion, and error reporting).

[ircu2.10.12-pk.git] / ircd / convert-conf.c

diff --git a/ircd/convert-conf.c b/ircd/convert-conf.c
index 5505b3d26b432e43c02bc871440520011ec3d994..0ff07d1b16f74e0e18b58ac8afd369a52aa2e84d 100644 (file)
--- a/ircd/convert-conf.c
+++ b/ircd/convert-conf.c
@@ -111,6 +111,14 @@ struct string_list {
     char value[1];
 };
 
+/** Find or insert the element from \a list that contains \a value.
+ * If an element of \a list already contains \a value, return it.
+ * Otherwise, append a new element to \a list containing \a value and
+ * return it.
+ * @param[in,out] list A list of strings.
+ * @param[in] value A string to search for.
+ * @return A string list element from \a list containing \a value.
+ */
 static struct string_list *string_get(struct string_list **list, const char *value)
 {
     struct string_list *curr;
@@ -309,10 +317,15 @@ static void finish_features(void)
     struct feature *feat;
     size_t ii;
 
-    fputs("Features {\n\t\"OPLEVELS\" = \"FALSE\";\n", stdout);
-    fputs("Features {\n\t\"ZANNELS\" = \"FALSE\";\n", stdout);
+    fputs("Features {\n", stdout);
+    fputs("\t\"OPLEVELS\" = \"FALSE\";\n", stdout);
+    fputs("\t\"ZANNELS\" = \"FALSE\";\n", stdout);
 
     for (feat = features; feat; feat = feat->next) {
+        /* Display the original feature line we are talking about. */
+        for (sl = feat->origins; sl; sl = sl->next)
+            fprintf(stdout, "# %s\n", sl->value);
+
         /* See if the feature was remapped to an oper privilege. */
         for (rmf = remapped_features; rmf->name; rmf++)
             if (0 == strcmp(feat->name, rmf->name))
@@ -408,7 +421,7 @@ static void finish_operators(void)
         }
         for (ii = 0; (remap = &remapped_features[ii++])->name; ) {
             if (!remap->feature || !remap->privilege
-                || !remap->feature->values || !remap->flags & mask)
+                || !remap->feature->values || !(remap->flags & mask))
                 continue;
             fprintf(stdout, "\t%s = %s;\n", remap->privilege,
                     strcmp(remap->feature->values->value, "TRUE") ? "no" : "yes");