* definitions as well as any specific store routines
* for the resource records.
*
+ * N.B. This is a two pass parser, so if you malloc() a string
+ * in a "store" routine, you must ensure to do it during
+ * only one of the two passes, or to free it between.
+ * Also, note that the resource record is malloced and
+ * saved in save_resource() during pass 1. Anything that
+ * you want saved after pass two (e.g. resource pointers)
+ * must explicitly be done in save_resource. Take a look
+ * at the Job resource in src/dird/dird_conf.c to see how
+ * it is done.
+ *
* Kern Sibbald, January MM
+ *
+ * Version $Id$
*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
*/
extern int r_first;
extern int r_last;
-extern pthread_mutex_t res_mutex;
-extern struct s_res resources[];
-extern CURES res_all;
+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.
+extern "C" CURES res_all;
+extern "C" int res_all_size;
+#else
+extern CURES res_all;
extern int res_all_size;
+#endif
-static int res_locked = 0; /* set when resource chains locked */
+
+static brwlock_t res_lock; /* resource lock */
+static int res_locked = 0; /* set when resource chains locked -- for debug */
/* Forward referenced subroutines */
static void scan_types(LEX *lc, MSGS *msg, int dest, char *where, char *cmd);
/* Message resource directives
* name handler value code flags default_value
*/
-struct res_items msgs_items[] = {
+RES_ITEM msgs_items[] = {
{"name", store_name, ITEM(res_msgs.hdr.name), 0, 0, 0},
{"description", store_str, ITEM(res_msgs.hdr.desc), 0, 0, 0},
{"mailcommand", store_str, ITEM(res_msgs.mail_cmd), 0, 0, 0},
{"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 {
- char *name;
+ const char *name;
int token;
};
/* Various message types */
{"skipped", M_SKIPPED},
{"mount", M_MOUNT},
{"terminate", M_TERM},
+ {"restored", M_RESTORED},
{"all", M_MAX+1},
{NULL, 0}
};
/* Simply print a message */
-static void prtmsg(void *sock, char *fmt, ...)
+static void prtmsg(void *sock, const char *fmt, ...)
{
va_list arg_ptr;
va_end(arg_ptr);
}
-#ifdef DEBUG
-char *res_to_str(int rcode)
+const char *res_to_str(int rcode)
{
if (rcode < r_first || rcode > r_last) {
- return "***UNKNOWN***";
+ return _("***UNKNOWN***");
} else {
return resources[rcode-r_first].name;
}
}
-#endif /* DEBUG */
/*
* Initialize the static structure to zeros, then
* apply all the default values.
*/
-void init_resource(int type, struct res_items *items)
+void init_resource(int type, RES_ITEM *items, int pass)
{
int i;
int rindex = type - r_first;
+ static bool first = true;
+ int errstat;
+
+ if (first && (errstat=rwl_init(&res_lock)) != 0) {
+ Emsg1(M_ABORT, 0, _("Unable to initialize resource lock. ERR=%s\n"),
+ strerror(errstat));
+ }
+ first = false;
memset(&res_all, 0, res_all_size);
res_all.hdr.rcode = type;
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) {
*(int *)(items[i].value) = items[i].default_value;
} else if (items[i].handler == store_int64) {
*(int64_t *)(items[i].value) = items[i].default_value;
- } else if (items[i].handler == store_size ||
- items[i].handler == store_time) {
- *(uint64_t *)(items[i].value) = items[i].default_value;
+ } else if (items[i].handler == store_size) {
+ *(uint64_t *)(items[i].value) = (uint64_t)items[i].default_value;
+ } else if (items[i].handler == store_time) {
+ *(utime_t *)(items[i].value) = (utime_t)items[i].default_value;
+ } else if (pass == 1 && items[i].handler == store_addresses) {
+ init_default_addresses((dlist**)items[i].value, items[i].default_value);
}
}
/* If this triggers, take a look at lib/parse_conf.h */
if (i >= MAX_RES_ITEMS) {
- Emsg1(M_ABORT, 0, _("Too many items in %s resource\n"), resources[rindex]);
+ Emsg1(M_ERROR_TERM, 0, _("Too many items in %s resource\n"), resources[rindex]);
}
}
}
/* Store Messages Destination information */
-void store_msgs(LEX *lc, struct res_items *item, int index, int pass)
+void store_msgs(LEX *lc, RES_ITEM *item, int index, int pass)
{
int token;
- char *dest, *cmd;
- int dest_len;
+ char *cmd;
+ POOLMEM *dest;
+ int dest_len;
- Dmsg2(200, "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:
- case MD_STDERR:
- case MD_SYSLOG: /* syslog */
- case MD_CONSOLE:
- scan_types(lc, (MSGS *)(item->value), item->code, NULL, NULL);
- break;
- case MD_OPERATOR: /* send to operator */
- case MD_DIRECTOR: /* send to Director */
- case MD_MAIL: /* mail */
- case MD_MAIL_ON_ERROR: /* mail if Job errors */
- if (item->code == MD_OPERATOR) {
- cmd = res_all.res_msgs.operator_cmd;
- } else {
- cmd = res_all.res_msgs.mail_cmd;
- }
- dest = (char *) get_pool_memory(PM_MESSAGE);
- dest_len = 0;
- dest[0] = 0;
- /* Pick up comma separated list of destinations */
- for ( ;; ) {
- token = lex_get_token(lc); /* scan destination */
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected a message destination, got: %s", lc->str);
- }
- dest = (char *) check_pool_memory_size(dest, dest_len + lc->str_len + 2);
- if (dest[0] != 0) {
- strcat(dest, " "); /* separate multiple destinations with space */
- dest_len++;
- }
- strcat(dest, lc->str);
- dest_len += lc->str_len;
- Dmsg2(100, "store_msgs newdest=%s: dest=%s:\n", lc->str, dest);
- token = lex_get_token(lc);
- if (token == T_COMMA) {
- continue; /* get another destination */
- }
- if (token != T_EQUALS) {
- scan_err1(lc, "expected an =, got: %s", lc->str);
- }
- break;
+ case MD_STDOUT:
+ case MD_STDERR:
+ case MD_SYSLOG: /* syslog */
+ case MD_CONSOLE:
+ scan_types(lc, (MSGS *)(item->value), item->code, NULL, NULL);
+ break;
+ case MD_OPERATOR: /* send to operator */
+ case MD_DIRECTOR: /* send to Director */
+ case MD_MAIL: /* mail */
+ case MD_MAIL_ON_ERROR: /* mail if Job errors */
+ if (item->code == MD_OPERATOR) {
+ cmd = res_all.res_msgs.operator_cmd;
+ } else {
+ cmd = res_all.res_msgs.mail_cmd;
+ }
+ dest = get_pool_memory(PM_MESSAGE);
+ dest[0] = 0;
+ dest_len = 0;
+ /* Pick up comma separated list of destinations */
+ for ( ;; ) {
+ token = lex_get_token(lc, T_NAME); /* scan destination */
+ dest = check_pool_memory_size(dest, dest_len + lc->str_len + 2);
+ if (dest[0] != 0) {
+ pm_strcat(&dest, " "); /* separate multiple destinations with space */
+ dest_len++;
}
- Dmsg1(200, "mail_cmd=%s\n", cmd);
- scan_types(lc, (MSGS *)(item->value), item->code, dest, cmd);
- free_pool_memory(dest);
- Dmsg0(200, "done with dest codes\n");
- break;
- case MD_FILE: /* file */
- case MD_APPEND: /* append */
- dest = (char *) get_pool_memory(PM_MESSAGE);
- /* Pick up a single destination */
- token = lex_get_token(lc); /* scan destination */
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected a message destination, got: %s", lc->str);
+ pm_strcat(&dest, lc->str);
+ dest_len += lc->str_len;
+ 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 */
}
- dest = (char *) check_pool_memory_size(dest, dest_len + lc->str_len + 2);
- strcpy(dest, lc->str);
- dest_len = lc->str_len;
- token = lex_get_token(lc);
- Dmsg1(200, "store_msgs dest=%s:\n", dest);
if (token != T_EQUALS) {
- scan_err1(lc, "expected an =, got: %s", lc->str);
+ scan_err1(lc, _("expected an =, got: %s"), lc->str);
}
- scan_types(lc, (MSGS *)(item->value), item->code, dest, NULL);
- free_pool_memory(dest);
- Dmsg0(200, "done with dest codes\n");
break;
+ }
+ Dmsg1(900, "mail_cmd=%s\n", NPRT(cmd));
+ scan_types(lc, (MSGS *)(item->value), item->code, dest, cmd);
+ free_pool_memory(dest);
+ Dmsg0(900, "done with dest codes\n");
+ break;
+ case MD_FILE: /* file */
+ case MD_APPEND: /* append */
+ dest = get_pool_memory(PM_MESSAGE);
+ /* Pick up a single destination */
+ token = lex_get_token(lc, T_NAME); /* scan destination */
+ pm_strcpy(&dest, lc->str);
+ dest_len = lc->str_len;
+ token = lex_get_token(lc, T_ALL);
+ 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(900, "done with dest codes\n");
+ break;
- default:
- scan_err1(lc, "Unknown item code: %d\n", item->code);
- break;
+ default:
+ scan_err1(lc, _("Unknown item code: %d\n"), item->code);
+ break;
}
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
- Dmsg0(200, "Done store_msgs\n");
+ Dmsg0(900, "Done store_msgs\n");
}
/*
*/
static void scan_types(LEX *lc, MSGS *msg, int dest_code, char *where, char *cmd)
{
- int token, i, found, quit, is_not;
- int msg_type;
+ int i, found, quit, is_not;
+ int msg_type = 0;
char *str;
for (quit=0; !quit;) {
- token = lex_get_token(lc); /* expect at least one type */
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected a message type, got: %s", lc->str);
- }
+ lex_get_token(lc, T_NAME); /* expect at least one type */
found = FALSE;
if (lc->str[0] == '!') {
is_not = TRUE;
str = &lc->str[0];
}
for (i=0; msg_types[i].name; i++) {
- if (strcmp(str, msg_types[i].name) == 0) {
+ if (strcasecmp(str, msg_types[i].name) == 0) {
msg_type = msg_types[i].token;
found = TRUE;
break;
}
}
if (!found) {
- scan_err1(lc, "message type: %s not found", str);
+ scan_err1(lc, _("message type: %s not found"), str);
+ /* NOT REACHED */
}
if (msg_type == M_MAX+1) { /* all? */
if (lc->ch != ',') {
break;
}
- Dmsg0(200, "call lex_get_token() to eat comma\n");
- token = lex_get_token(lc); /* eat comma */
+ Dmsg0(900, "call lex_get_token() to eat comma\n");
+ lex_get_token(lc, T_ALL); /* eat comma */
}
- Dmsg0(200, "Done scan_types()\n");
+ Dmsg0(900, "Done scan_types()\n");
}
* This routine is ONLY for resource names
* Store a name at specified address.
*/
-void store_name(LEX *lc, struct res_items *item, int index, int pass)
+void store_name(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s", lc->str);
- } else if (lc->str_len > MAX_RES_NAME_LENGTH) {
- scan_err3(lc, "name %s length %d too long, max is %d\n", lc->str,
- lc->str_len, MAX_RES_NAME_LENGTH);
- } else {
- /* Store the name both pass 1 and pass 2 */
- *(item->value) = bstrdup(lc->str);
+ POOLMEM *msg = get_pool_memory(PM_EMSG);
+ lex_get_token(lc, T_NAME);
+ if (!is_name_valid(lc->str, &msg)) {
+ scan_err1(lc, "%s\n", msg);
+ }
+ free_pool_memory(msg);
+ /* Store the name both pass 1 and pass 2 */
+ if (*(item->value)) {
+ scan_err2(lc, _("Attempt to redefine name \"%s\" to \"%s\"."),
+ *(item->value), lc->str);
}
+ *(item->value) = bstrdup(lc->str);
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
* Store a name string at specified address
* A name string is limited to MAX_RES_NAME_LENGTH
*/
-void store_strname(LEX *lc, struct res_items *item, int index, int pass)
+void store_strname(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s", lc->str);
- } else if (lc->str_len > MAX_RES_NAME_LENGTH) {
- scan_err3(lc, "name %s length %d too long, max is %d\n", lc->str,
- lc->str_len, MAX_RES_NAME_LENGTH);
- } else {
- /* Store the name */
- if (pass == 1)
- *(item->value) = bstrdup(lc->str);
+ lex_get_token(lc, T_NAME);
+ /* Store the name */
+ if (pass == 1) {
+ *(item->value) = bstrdup(lc->str);
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
-
-
/* Store a string at specified address */
-void store_str(LEX *lc, struct res_items *item, int index, int pass)
+void store_str(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s", lc->str);
- } else {
- if (pass == 1) {
- *(item->value) = bstrdup(lc->str);
- }
+ lex_get_token(lc, T_STRING);
+ if (pass == 1) {
+ *(item->value) = bstrdup(lc->str);
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
-/* Store a directory name at specified address */
-void store_dir(LEX *lc, struct res_items *item, int index, int pass)
+/*
+ * Store a directory name at specified address. Note, we do
+ * shell expansion except if the string begins with a vertical
+ * bar (i.e. it will likely be passed to the shell later).
+ */
+void store_dir(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s", lc->str);
- } else {
- if (pass == 1) {
- do_shell_expansion(lc->str);
- *(item->value) = bstrdup(lc->str);
+ lex_get_token(lc, T_STRING);
+ if (pass == 1) {
+ if (lc->str[0] != '|') {
+ do_shell_expansion(lc->str, sizeof(lc->str));
}
+ *(item->value) = bstrdup(lc->str);
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
/* Store a password specified address in MD5 coding */
-void store_password(LEX *lc, struct res_items *item, int index, int pass)
+void store_password(LEX *lc, RES_ITEM *item, int index, int pass)
{
- unsigned int token, i, j;
+ unsigned int i, j;
struct MD5Context md5c;
unsigned char signature[16];
char sig[100];
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s\n", lc->str);
- } else {
- if (pass == 1) {
- MD5Init(&md5c);
- MD5Update(&md5c, (unsigned char *) (lc->str), lc->str_len);
- MD5Final(signature, &md5c);
- for (i = j = 0; i < sizeof(signature); i++) {
- sprintf(&sig[j], "%02x", signature[i]);
- j += 2;
- }
- *(item->value) = bstrdup(sig);
+ lex_get_token(lc, T_STRING);
+ if (pass == 1) {
+ MD5Init(&md5c);
+ MD5Update(&md5c, (unsigned char *) (lc->str), lc->str_len);
+ MD5Final(signature, &md5c);
+ for (i = j = 0; i < sizeof(signature); i++) {
+ sprintf(&sig[j], "%02x", signature[i]);
+ j += 2;
}
+ *(item->value) = bstrdup(sig);
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
* If we are in pass 2, do a lookup of the
* resource.
*/
-void store_res(LEX *lc, struct res_items *item, int index, int pass)
+void store_res(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
RES *res;
- token = lex_get_token(lc);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected a Resource name, got: %s", lc->str);
- }
+ lex_get_token(lc, T_NAME);
if (pass == 2) {
res = GetResWithName(item->code, lc->str);
if (res == NULL) {
- scan_err3(lc, "Could not find Resource %s referenced on line %d : %s\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;
set_bit(index, res_all.hdr.item_present);
}
-
-/* Store an integer at specified address */
-void store_int(LEX *lc, struct res_items *item, int index, int pass)
+/*
+ * Store default values for Resource from xxxDefs
+ * If we are in pass 2, do a lookup of the
+ * resource and store everything not explicitly set
+ * in main resource.
+ *
+ * Note, here item points to the main resource (e.g. Job, not
+ * the jobdefs, which we look up).
+ */
+void store_defs(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
+ RES *res;
- token = lex_get_token(lc);
- if (token != T_NUMBER || !is_a_number(lc->str)) {
- scan_err1(lc, "expected an integer number, got: %s", lc->str);
- } else {
- errno = 0;
- *(int *)(item->value) = (int)strtod(lc->str, NULL);
- if (errno != 0) {
- scan_err1(lc, "expected an integer number, got: %s", lc->str);
- }
+ lex_get_token(lc, T_NAME);
+ if (pass == 2) {
+ 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"),
+ lc->str, lc->line_no, lc->line);
+ }
+ /* for each item not set, we copy the field from res */
+#ifdef xxx
+ for (int i=0; item->name;; i++, item++) {
+ if (bit_is_set(i, res->item_present)) {
+ Dmsg2(900, "Item %d is present in %s\n", i, res->name);
+ } else {
+ Dmsg2(900, "Item %d is not present in %s\n", i, res->name);
+ }
+ }
+ /* ***FIXME **** add code */
+#endif
}
scan_to_eol(lc);
+}
+
+
+
+/* Store an integer at specified address */
+void store_int(LEX *lc, RES_ITEM *item, int index, int pass)
+{
+ lex_get_token(lc, T_INT32);
+ *(int *)(item->value) = lc->int32_val;
+ scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
/* Store a positive integer at specified address */
-void store_pint(LEX *lc, struct res_items *item, int index, int pass)
+void store_pint(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc);
- if (token != T_NUMBER || !is_a_number(lc->str)) {
- scan_err1(lc, "expected a positive integer number, got: %s", lc->str);
- } else {
- errno = 0;
- token = (int)strtod(lc->str, NULL);
- if (errno != 0 || token < 0) {
- scan_err1(lc, "expected a postive integer number, got: %s", lc->str);
- }
- *(int *)(item->value) = token;
- }
+ lex_get_token(lc, T_PINT32);
+ *(int *)(item->value) = lc->pint32_val;
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
/* Store an 64 bit integer at specified address */
-void store_int64(LEX *lc, struct res_items *item, int index, int pass)
+void store_int64(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc);
- Dmsg2(400, "int64=:%s: %f\n", lc->str, strtod(lc->str, NULL));
- if (token != T_NUMBER || !is_a_number(lc->str)) {
- scan_err1(lc, "expected an integer number, got: %s", lc->str);
- } else {
- errno = 0;
- *(int64_t *)(item->value) = (int64_t)strtod(lc->str, NULL);
- if (errno != 0)
- scan_err1(lc, "expected an integer number, got: %s", lc->str);
- }
+ lex_get_token(lc, T_INT64);
+ *(int64_t *)(item->value) = lc->int64_val;
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
/* Store a size in bytes */
-void store_size(LEX *lc, struct res_items *item, int index, int pass)
+void store_size(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token, i, ch;
- uint64_t value;
- int mod[] = {'*', 'k', 'm', 'g', 0}; /* first item * not used */
- uint64_t mult[] = {1, /* byte */
- 1024, /* kilobyte */
- 1048576, /* megabyte */
- 1073741824}; /* gigabyte */
-
-#ifdef we_have_a_compiler_that_works
- int mod[] = {'*', 'k', 'm', 'g', 't', 0};
- uint64_t mult[] = {1, /* byte */
- 1024, /* kilobyte */
- 1048576, /* megabyte */
- 1073741824, /* gigabyte */
- 1099511627776};/* terabyte */
-#endif
+ int token;
+ uint64_t uvalue;
- Dmsg0(400, "Enter store_size\n");
- token = lex_get_token(lc);
+ Dmsg0(900, "Enter store_size\n");
+ token = lex_get_token(lc, T_ALL);
errno = 0;
switch (token) {
case T_NUMBER:
- Dmsg2(400, "size num=:%s: %f\n", lc->str, strtod(lc->str, NULL));
- value = (uint64_t)strtod(lc->str, NULL);
- if (errno != 0 || token < 0) {
- scan_err1(lc, "expected a size number, got: %s", lc->str);
- }
- *(uint64_t *)(item->value) = value;
- break;
case T_IDENTIFIER:
- case T_STRING:
- /* Look for modifier */
- ch = lc->str[lc->str_len - 1];
- i = 0;
- if (ISALPHA(ch)) {
- if (ISUPPER(ch)) {
- ch = tolower(ch);
- }
- while (mod[++i] != 0) {
- if (ch == mod[i]) {
- lc->str_len--;
- lc->str[lc->str_len] = 0; /* strip modifier */
- break;
- }
- }
- }
- if (mod[i] == 0 || !is_a_number(lc->str)) {
- scan_err1(lc, "expected a size number, got: %s", lc->str);
+ case T_UNQUOTED_STRING:
+ if (!size_to_uint64(lc->str, lc->str_len, &uvalue)) {
+ scan_err1(lc, _("expected a size number, got: %s"), lc->str);
}
- Dmsg3(400, "size str=:%s: %f i=%d\n", lc->str, strtod(lc->str, NULL), i);
-
- value = (uint64_t)strtod(lc->str, NULL);
- Dmsg1(400, "Int value = %d\n", (int)value);
- if (errno != 0 || value < 0) {
- scan_err1(lc, "expected a size number, got: %s", lc->str);
- }
- *(uint64_t *)(item->value) = value * mult[i];
- Dmsg2(400, "Full value = %f %" lld "\n", strtod(lc->str, NULL) * mult[i],
- value *mult[i]);
+ *(uint64_t *)(item->value) = uvalue;
break;
default:
- scan_err1(lc, "expected a size, got: %s", lc->str);
+ scan_err1(lc, _("expected a size, got: %s"), lc->str);
break;
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
- Dmsg0(400, "Leave store_size\n");
+ Dmsg0(900, "Leave store_size\n");
}
/* Store a time period in seconds */
-void store_time(LEX *lc, struct res_items *item, int index, int pass)
+void store_time(LEX *lc, RES_ITEM *item, int index, int pass)
{
int token;
- btime_t value;
+ utime_t utime;
+ char period[500];
- token = lex_get_token(lc);
+ token = lex_get_token(lc, T_ALL);
errno = 0;
switch (token) {
case T_NUMBER:
- value = (btime_t)strtod(lc->str, NULL);
- if (errno != 0 || value < 0) {
- scan_err1(lc, "expected a time period, got: %s", lc->str);
- }
- *(btime_t *)(item->value) = value;
- break;
case T_IDENTIFIER:
- case T_STRING:
- if (!string_to_btime(lc->str, &value)) {
- scan_err1(lc, "expected a time period, got: %s", lc->str);
+ case T_UNQUOTED_STRING:
+ bstrncpy(period, lc->str, sizeof(period));
+ if (lc->ch == ' ') {
+ token = lex_get_token(lc, T_ALL);
+ switch (token) {
+ case T_IDENTIFIER:
+ case T_UNQUOTED_STRING:
+ bstrncat(period, lc->str, sizeof(period));
+ break;
+ }
+ }
+ if (!duration_to_utime(period, &utime)) {
+ scan_err1(lc, _("expected a time period, got: %s"), period);
}
- *(btime_t *)(item->value) = value;
+ *(utime_t *)(item->value) = utime;
break;
default:
- scan_err1(lc, "expected a time period, got: %s", lc->str);
+ scan_err1(lc, _("expected a time period, got: %s"), lc->str);
break;
}
- scan_to_eol(lc);
+ if (token != T_EOL) {
+ scan_to_eol(lc);
+ }
set_bit(index, res_all.hdr.item_present);
}
/* Store a yes/no in a bit field */
-void store_yesno(LEX *lc, struct res_items *item, int index, int pass)
+void store_yesno(LEX *lc, RES_ITEM *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc);
- lcase(lc->str);
- if (token != T_IDENTIFIER && token != T_STRING && token != T_QUOTED_STRING) {
- scan_err1(lc, "expected an identifier or string, got: %s", lc->str);
- } else if (strcmp(lc->str, "yes") == 0) {
+ lex_get_token(lc, T_NAME);
+ if (strcasecmp(lc->str, "yes") == 0) {
*(int *)(item->value) |= item->code;
- } else if (strcmp(lc->str, "no") == 0) {
+ } else if (strcasecmp(lc->str, "no") == 0) {
*(int *)(item->value) &= ~(item->code);
} else {
- scan_err1(lc, "Expect a YES or NO, got: %s", lc->str);
+ scan_err1(lc, _("Expect a YES or NO, got: %s"), lc->str);
}
scan_to_eol(lc);
set_bit(index, res_all.hdr.item_present);
}
-/*
- * Scan to "logical" end of line. I.e. end of line,
- * or semicolon.
- */
-void scan_to_eol(LEX *lc)
-{
- int token;
- Dmsg0(150, "start scan to eof\n");
- while ((token = lex_get_token(lc)) != T_EOL) {
- }
- Dmsg0(150, "done scan to eof\n");
-}
-
-
-/*
- * Format a scanner error message
- */
-void s_err(char *file, int line, LEX *lc, char *msg, ...)
-{
- va_list arg_ptr;
- char buf[MAXSTRING];
-
- va_start(arg_ptr, msg);
- bvsnprintf(buf, sizeof(buf), msg, arg_ptr);
- va_end(arg_ptr);
-
- e_msg(file, line, M_ABORT, 0, "Config error: %s,\n\
- : Line %d, col %d of file %s\n%s\n",
- buf, lc->line_no, lc->col_no, lc->fname, lc->line);
-}
+/* #define TRACE_RES */
-void LockRes()
+void b_LockRes(const char *file, int line)
{
- P(res_mutex);
- res_locked = 1;
+ int errstat;
+#ifdef TRACE_RES
+ Dmsg4(000, "LockRes %d,%d at %s:%d\n", res_locked, res_lock.w_active,
+ file, line);
+#endif
+ if ((errstat=rwl_writelock(&res_lock)) != 0) {
+ Emsg3(M_ABORT, 0, "rwl_writelock failure at %s:%d: ERR=%s\n",
+ file, line, strerror(errstat));
+ }
+ res_locked++;
}
-void UnlockRes()
+void b_UnlockRes(const char *file, int line)
{
- res_locked = 0;
- V(res_mutex);
+ int errstat;
+ res_locked--;
+#ifdef TRACE_RES
+ Dmsg4(000, "UnLockRes %d,%d at %s:%d\n", res_locked, res_lock.w_active,
+ file, line);
+#endif
+ if ((errstat=rwl_writeunlock(&res_lock)) != 0) {
+ Emsg3(M_ABORT, 0, "rwl_writeunlock failure at %s:%d:. ERR=%s\n",
+ file, line, strerror(errstat));
+ }
}
/*
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(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, res_type, pass;
+ int token, i, pass;
+ int res_type = 0;
enum parse_state state = p_none;
- struct res_items *items;
+ RES_ITEM *items = NULL;
int level = 0;
/* Make two passes. The first builds the name symbol table,
* and the second picks up the items.
*/
- Dmsg0(200, "Enter parse_config()\n");
- for (pass=1; pass<= 2; pass++) {
- Dmsg1(200, "parse_config pass %d\n", pass);
- lc = lex_open_file(lc, cf);
- while ((token=lex_get_token(lc)) != T_EOF) {
- Dmsg1(150, "parse got token=%s\n", lex_tok_to_str(token));
+ Dmsg0(900, "Enter parse_config()\n");
+ for (pass=1; pass <= 2; pass++) {
+ 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(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, pass);
break;
}
- if (token != T_IDENTIFIER) {
- scan_err1(lc, "Expected a Resource name identifier, got: %s", lc->str);
+ 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;
}
- lcase(lc->str);
- for (i=0; resources[i].name; i++)
- if (strcmp(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);
+ }
+ 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);
- }
- lcase(lc->str);
- for (i=0; items[i].name; i++) {
- if (strcmp(items[i].name, lc->str) == 0) {
- token = lex_get_token(lc);
- Dmsg1 (150, "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);
- }
- Dmsg1(150, "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(150, "level=%d id=%s\n", level, lc->str);
- Dmsg1(150, "Keyword = %s\n", lc->str);
- scan_err1(lc, "Keyword %s not permitted in this resource", lc->str);
- }
- break;
- case T_EOB:
- level--;
- state = p_none;
- Dmsg0(150, "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));
- }
+ case T_EOL:
break;
+
default:
- scan_err1(lc, "Unknown parser state %d\n", state);
+ 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 (debug_level > 50 && pass == 2) {
+ 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 >= 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(200, "Leave parse_config()\n");
+ Dmsg0(900, "Leave parse_config()\n");
+ set_exit_on_error(1);
+ return 1;
}
/*********************************************************************
* Free configuration resources
*
*/
-void
-free_config_resources()
+void free_config_resources()
{
- int i;
- for (i=r_first; i<=r_last; i++) {
- free_resource(i);
+ for (int i=r_first; i<=r_last; i++) {
+ free_resource(res_head[i-r_first], i);
+ res_head[i-r_first] = NULL;
+ }
+}
+
+RES **save_config_resources()
+{
+ int num = r_last - r_first + 1;
+ RES **res = (RES **)malloc(num*sizeof(RES *));
+ for (int i=0; i<num; i++) {
+ 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;
}
projects / bacula / bacula / blobdiff