extern int r_first;
extern int r_last;
extern RES_TABLE resources[];
+extern RES **res_head;
+
#ifdef HAVE_WIN32
// work around visual studio name manling preventing external linkage since res_all
// is declared as a different type when instantiated.
{"director", store_msgs, ITEM(res_msgs), MD_DIRECTOR, 0, 0},
{"console", store_msgs, ITEM(res_msgs), MD_CONSOLE, 0, 0},
{"operator", store_msgs, ITEM(res_msgs), MD_OPERATOR, 0, 0},
- {NULL, NULL, NULL, 0}
+ {NULL, NULL, NULL, 0, 0}
};
struct s_mtypes {
/* Simply print a message */
-static void prtmsg(void *sock, char *fmt, ...)
+static void prtmsg(void *sock, const char *fmt, ...)
{
va_list arg_ptr;
res_all.hdr.refcnt = 1;
for (i=0; items[i].name; i++) {
- Dmsg3(300, "Item=%s def=%s defval=%d\n", items[i].name,
+ Dmsg3(900, "Item=%s def=%s defval=%d\n", items[i].name,
(items[i].flags & ITEM_DEFAULT) ? "yes" : "no",
items[i].default_value);
if (items[i].flags & ITEM_DEFAULT && items[i].default_value != 0) {
POOLMEM *dest;
int dest_len;
- Dmsg2(300, "store_msgs pass=%d code=%d\n", pass, item->code);
+ Dmsg2(900, "store_msgs pass=%d code=%d\n", pass, item->code);
if (pass == 1) {
switch (item->code) {
case MD_STDOUT:
}
pm_strcat(&dest, lc->str);
dest_len += lc->str_len;
- Dmsg2(100, "store_msgs newdest=%s: dest=%s:\n", lc->str, NPRT(dest));
+ Dmsg2(900, "store_msgs newdest=%s: dest=%s:\n", lc->str, NPRT(dest));
token = lex_get_token(lc, T_ALL);
if (token == T_COMMA) {
continue; /* get another destination */
}
break;
}
- Dmsg1(300, "mail_cmd=%s\n", NPRT(cmd));
+ Dmsg1(900, "mail_cmd=%s\n", NPRT(cmd));
scan_types(lc, (MSGS *)(item->value), item->code, dest, cmd);
free_pool_memory(dest);
- Dmsg0(300, "done with dest codes\n");
+ Dmsg0(900, "done with dest codes\n");
break;
case MD_FILE: /* file */
case MD_APPEND: /* append */
pm_strcpy(&dest, lc->str);
dest_len = lc->str_len;
token = lex_get_token(lc, T_ALL);
- Dmsg1(300, "store_msgs dest=%s:\n", NPRT(dest));
+ Dmsg1(900, "store_msgs dest=%s:\n", NPRT(dest));
if (token != T_EQUALS) {
scan_err1(lc, _("expected an =, got: %s"), lc->str);
}
scan_types(lc, (MSGS *)(item->value), item->code, dest, NULL);
free_pool_memory(dest);
- Dmsg0(300, "done with dest codes\n");
+ Dmsg0(900, "done with dest codes\n");
break;
default:
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
- Dmsg0(300, "Done store_msgs\n");
+ Dmsg0(900, "Done store_msgs\n");
}
/*
if (lc->ch != ',') {
break;
}
- Dmsg0(300, "call lex_get_token() to eat comma\n");
+ Dmsg0(900, "call lex_get_token() to eat comma\n");
lex_get_token(lc, T_ALL); /* eat comma */
}
- Dmsg0(300, "Done scan_types()\n");
+ Dmsg0(900, "Done scan_types()\n");
}
scan_err3(lc, _("Could not find config Resource %s referenced on line %d : %s\n"),
lc->str, lc->line_no, lc->line);
}
+ if (*(item->value)) {
+ scan_err3(lc, _("Attempt to redefine resource \"%s\" referenced on line %d : %s\n"),
+ lc->str, lc->line_no, lc->line);
+ }
*(item->value) = (char *)res;
}
scan_to_eol(lc);
lex_get_token(lc, T_NAME);
if (pass == 2) {
- Dmsg2(300, "Code=%d name=%s\n", item->code, lc->str);
+ Dmsg2(900, "Code=%d name=%s\n", item->code, lc->str);
res = GetResWithName(item->code, lc->str);
if (res == NULL) {
scan_err3(lc, _("Missing config Resource \"%s\" referenced on line %d : %s\n"),
#ifdef xxx
for (int i=0; item->name;; i++, item++) {
if (bit_is_set(i, res->item_present)) {
- Dmsg2(300, "Item %d is present in %s\n", i, res->name);
+ Dmsg2(900, "Item %d is present in %s\n", i, res->name);
} else {
- Dmsg2(300, "Item %d is not present in %s\n", i, res->name);
+ Dmsg2(900, "Item %d is not present in %s\n", i, res->name);
}
}
/* ***FIXME **** add code */
int token;
uint64_t uvalue;
- Dmsg0(400, "Enter store_size\n");
+ Dmsg0(900, "Enter store_size\n");
token = lex_get_token(lc, T_ALL);
errno = 0;
switch (token) {
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
- Dmsg0(400, "Leave store_size\n");
+ Dmsg0(900, "Leave store_size\n");
}
int rindex = rcode - r_first;
LockRes();
- res = resources[rindex].res_head;
+ res = res_head[rindex];
while (res) {
if (strcmp(res->name, name) == 0) {
break;
Emsg0(M_ABORT, 0, "Resource chain not locked.\n");
}
if (res == NULL) {
- nres = resources[rindex].res_head;
+ nres = res_head[rindex];
} else {
nres = res->next;
}
/*********************************************************************
*
* Parse configuration file
- *
+ *
+ * Return 0 if reading failed, 1 otherwise
*/
-void
-parse_config(const char *cf)
+int
+parse_config(const char *cf, int exit_on_error)
{
+ set_exit_on_error(exit_on_error);
LEX *lc = NULL;
int token, i, pass;
int res_type = 0;
/* Make two passes. The first builds the name symbol table,
* and the second picks up the items.
*/
- Dmsg0(300, "Enter parse_config()\n");
+ Dmsg0(900, "Enter parse_config()\n");
for (pass=1; pass <= 2; pass++) {
- Dmsg1(300, "parse_config pass %d\n", pass);
- lc = lex_open_file(lc, cf, NULL);
+ Dmsg1(900, "parse_config pass %d\n", pass);
+ if ((lc = lex_open_file(lc, cf, NULL)) == NULL) {
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
+ }
while ((token=lex_get_token(lc, T_ALL)) != T_EOF) {
- Dmsg1(300, "parse got token=%s\n", lex_tok_to_str(token));
+ Dmsg1(900, "parse got token=%s\n", lex_tok_to_str(token));
switch (state) {
- case p_none:
- if (token == T_EOL) {
+ case p_none:
+ if (token == T_EOL) {
+ break;
+ }
+ if (token != T_IDENTIFIER) {
+ scan_err1(lc, _("Expected a Resource name identifier, got: %s"), lc->str);
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
+ }
+ for (i=0; resources[i].name; i++)
+ if (strcasecmp(resources[i].name, lc->str) == 0) {
+ state = p_resource;
+ items = resources[i].items;
+ res_type = resources[i].rcode;
+ init_resource(res_type, items);
break;
}
- if (token != T_IDENTIFIER) {
- scan_err1(lc, _("Expected a Resource name identifier, got: %s"), lc->str);
- /* NOT REACHED */
+ if (state == p_none) {
+ scan_err1(lc, _("expected resource name, got: %s"), lc->str);
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
+ }
+ break;
+ case p_resource:
+ switch (token) {
+ case T_BOB:
+ level++;
+ break;
+ case T_IDENTIFIER:
+ if (level != 1) {
+ scan_err1(lc, _("not in resource definition: %s"), lc->str);
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
}
- for (i=0; resources[i].name; i++)
- if (strcasecmp(resources[i].name, lc->str) == 0) {
- state = p_resource;
- items = resources[i].items;
- res_type = resources[i].rcode;
- init_resource(res_type, items);
+ for (i=0; items[i].name; i++) {
+ if (strcasecmp(items[i].name, lc->str) == 0) {
+ /* If the ITEM_NO_EQUALS flag is set we do NOT
+ * scan for = after the keyword */
+ if (!(items[i].flags & ITEM_NO_EQUALS)) {
+ token = lex_get_token(lc, T_ALL);
+ Dmsg1 (900, "in T_IDENT got token=%s\n", lex_tok_to_str(token));
+ if (token != T_EQUALS) {
+ scan_err1(lc, _("expected an equals, got: %s"), lc->str);
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
+ }
+ }
+ Dmsg1(900, "calling handler for %s\n", items[i].name);
+ /* Call item handler */
+ items[i].handler(lc, &items[i], i, pass);
+ i = -1;
break;
}
- if (state == p_none) {
- scan_err1(lc, _("expected resource name, got: %s"), lc->str);
- /* NOT REACHED */
+ }
+ if (i >= 0) {
+ Dmsg2(900, "level=%d id=%s\n", level, lc->str);
+ Dmsg1(900, "Keyword = %s\n", lc->str);
+ scan_err1(lc, _("Keyword \"%s\" not permitted in this resource.\n"
+ "Perhaps you left the trailing brace off of the previous resource."), lc->str);
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
}
break;
- case p_resource:
- switch (token) {
- case T_BOB:
- level++;
- break;
- case T_IDENTIFIER:
- if (level != 1) {
- scan_err1(lc, _("not in resource definition: %s"), lc->str);
- /* NOT REACHED */
- }
- for (i=0; items[i].name; i++) {
- if (strcasecmp(items[i].name, lc->str) == 0) {
- /* If the ITEM_NO_EQUALS flag is set we do NOT
- * scan for = after the keyword */
- if (!(items[i].flags & ITEM_NO_EQUALS)) {
- token = lex_get_token(lc, T_ALL);
- Dmsg1 (300, "in T_IDENT got token=%s\n", lex_tok_to_str(token));
- if (token != T_EQUALS) {
- scan_err1(lc, _("expected an equals, got: %s"), lc->str);
- /* NOT REACHED */
- }
- }
- Dmsg1(300, "calling handler for %s\n", items[i].name);
- /* Call item handler */
- items[i].handler(lc, &items[i], i, pass);
- i = -1;
- break;
- }
- }
- if (i >= 0) {
- Dmsg2(300, "level=%d id=%s\n", level, lc->str);
- Dmsg1(300, "Keyword = %s\n", lc->str);
- scan_err1(lc, _("Keyword \"%s\" not permitted in this resource.\n"
- "Perhaps you left the trailing brace off of the previous resource."), lc->str);
- /* NOT REACHED */
- }
- break;
- case T_EOB:
- level--;
- state = p_none;
- Dmsg0(300, "T_EOB => define new resource\n");
- save_resource(res_type, items, pass); /* save resource */
- break;
-
- case T_EOL:
- break;
+ case T_EOB:
+ level--;
+ state = p_none;
+ Dmsg0(900, "T_EOB => define new resource\n");
+ save_resource(res_type, items, pass); /* save resource */
+ break;
- default:
- scan_err2(lc, _("unexpected token %d %s in resource definition"),
- token, lex_tok_to_str(token));
- /* NOT REACHED */
- }
+ case T_EOL:
break;
+
default:
- scan_err1(lc, _("Unknown parser state %d\n"), state);
- /* NOT REACHED */
+ scan_err2(lc, _("unexpected token %d %s in resource definition"),
+ token, lex_tok_to_str(token));
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
+ }
+ break;
+ default:
+ scan_err1(lc, _("Unknown parser state %d\n"), state);
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
}
}
if (state != p_none) {
scan_err0(lc, _("End of conf file reached with unclosed resource."));
+ set_exit_on_error(1); /* Never reached if exit_on_error == 1 */
+ return 0;
}
- if (debug_level > 50 && pass == 2) {
+ if (debug_level >= 900 && pass == 2) {
int i;
for (i=r_first; i<=r_last; i++) {
- dump_resource(i, resources[i-r_first].res_head, prtmsg, NULL);
+ dump_resource(i, res_head[i-r_first], prtmsg, NULL);
}
}
lc = lex_close_file(lc);
}
- Dmsg0(300, "Leave parse_config()\n");
+ Dmsg0(900, "Leave parse_config()\n");
+ set_exit_on_error(1);
+ return 1;
}
/*********************************************************************
void free_config_resources()
{
for (int i=r_first; i<=r_last; i++) {
- free_resource(resources[i-r_first].res_head, i);
- resources[i-r_first].res_head = NULL;
+ free_resource(res_head[i-r_first], i);
+ res_head[i-r_first] = NULL;
}
}
int num = r_last - r_first + 1;
RES **res = (RES **)malloc(num*sizeof(RES *));
for (int i=0; i<num; i++) {
- res[i] = resources[i].res_head;
- resources[i].res_head = NULL;
+ res[i] = res_head[i];
+ res_head[i] = NULL;
}
return res;
}
+
+RES **new_res_head()
+{
+ int size = (r_last - r_first + 1) * sizeof(RES *);
+ RES **res = (RES **)malloc(size);
+ memset(res, 0, size);
+ return res;
+}