Resources: res_new() requires an active pool

[libucw.git] / ucw / conf-input.c

diff --git a/ucw/conf-input.c b/ucw/conf-input.c
index e0ef334de960f4151e508353007906050ef7d134..fffc6d57e5cd5d8088755bb9c0730768c63cc421 100644 (file)
--- a/ucw/conf-input.c
+++ b/ucw/conf-input.c
@@ -223,7 +223,7 @@ parse_fastbuf(const char *name_fb, struct fastbuf *fb, uns depth)
       else if (depth > 8)
        err = "Too many nested files";
       else if (*line && *line != '#')          // because the contents of line_buf is not re-entrant and will be cleared
       else if (depth > 8)
        err = "Too many nested files";
       else if (*line && *line != '#')          // because the contents of line_buf is not re-entrant and will be cleared

-       err = "The input command must be the last one on a line";
+       err = "The include command must be the last one on a line";

       if (err)
        goto error;
       struct fastbuf *new_fb = bopen_try(pars[0], O_RDONLY, 1<<14);
       if (err)
        goto error;
       struct fastbuf *new_fb = bopen_try(pars[0], O_RDONLY, 1<<14);


@@ -499,9 +499,10 @@ cf_getopt(int argc, char * const argv[], const char *short_opts, const struct op
 #endif
     } else {
       /* unhandled option or end of options */
 #endif
     } else {
       /* unhandled option or end of options */

-      if (res != ':' && res != '?')
+      if (res != ':' && res != '?') {

        load_default();
        load_default();

-      final_commit();
+       final_commit();
+      }

       other_options++;
       return res;
     }
       other_options++;
       return res;
     }