X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fconf-input.c;h=fffc6d57e5cd5d8088755bb9c0730768c63cc421;hb=bfca2c42bc0e749f8611339568be502f22ac5e9c;hp=e0ef334de960f4151e508353007906050ef7d134;hpb=b05c4e0038343a70f086d85f17bb1947fa789d16;p=libucw.git diff --git a/ucw/conf-input.c b/ucw/conf-input.c index e0ef334d..fffc6d57 100644 --- 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 - 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); @@ -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 */ - if (res != ':' && res != '?') + if (res != ':' && res != '?') { load_default(); - final_commit(); + final_commit(); + } other_options++; return res; }