*/
/*
- Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+ Copyright (C) 2000-2003 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
{"skipped", M_SKIPPED},
{"mount", M_MOUNT},
{"terminate", M_TERM},
+ {"restored", M_RESTORED},
{"all", M_MAX+1},
{NULL, 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;
}
}
/* If this triggers, take a look at lib/parse_conf.h */
int token;
char *cmd;
POOLMEM *dest;
- int dest_len;
+ int dest_len;
Dmsg2(200, "store_msgs pass=%d code=%d\n", pass, item->code);
if (pass == 1) {
cmd = res_all.res_msgs.mail_cmd;
}
dest = get_pool_memory(PM_MESSAGE);
- dest_len = 0;
dest[0] = 0;
+ dest_len = 0;
/* Pick up comma separated list of destinations */
for ( ;; ) {
token = lex_get_token(lc, T_NAME); /* scan destination */
- dest = (char *) check_pool_memory_size(dest, dest_len + lc->str_len + 2);
+ dest = check_pool_memory_size(dest, dest_len + lc->str_len + 2);
if (dest[0] != 0) {
strcat(dest, " "); /* separate multiple destinations with space */
dest_len++;
dest = get_pool_memory(PM_MESSAGE);
/* Pick up a single destination */
token = lex_get_token(lc, T_NAME); /* scan destination */
- dest = check_pool_memory_size(dest, dest_len + lc->str_len + 2);
- strcpy(dest, lc->str);
+ pm_strcpy(&dest, lc->str);
dest_len = lc->str_len;
token = lex_get_token(lc, T_ALL);
Dmsg1(200, "store_msgs dest=%s:\n", NPRT(dest));
*/
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, T_NAME); /* expect at least one type */
+ 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);
+ /* NOT REACHED */
}
if (msg_type == M_MAX+1) { /* all? */
break;
}
Dmsg0(200, "call lex_get_token() to eat comma\n");
- token = lex_get_token(lc, T_ALL); /* eat comma */
+ lex_get_token(lc, T_ALL); /* eat comma */
}
Dmsg0(200, "Done scan_types()\n");
}
*/
void store_name(LEX *lc, struct res_items *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc, T_NAME);
+ lex_get_token(lc, T_NAME);
/* Store the name both pass 1 and pass 2 */
*(item->value) = bstrdup(lc->str);
scan_to_eol(lc);
*/
void store_strname(LEX *lc, struct res_items *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc, T_NAME);
+ lex_get_token(lc, T_NAME);
/* Store the name */
if (pass == 1) {
*(item->value) = bstrdup(lc->str);
/* Store a string at specified address */
void store_str(LEX *lc, struct res_items *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc, T_STRING);
+ lex_get_token(lc, T_STRING);
if (pass == 1) {
*(item->value) = bstrdup(lc->str);
}
set_bit(index, res_all.hdr.item_present);
}
-/* Store a directory name at specified address */
+/*
+ * 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, struct res_items *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc, T_STRING);
+ lex_get_token(lc, T_STRING);
if (pass == 1) {
- do_shell_expansion(lc->str);
+ if (lc->str[0] != '|') {
+ do_shell_expansion(lc->str, sizeof(lc->str));
+ }
*(item->value) = bstrdup(lc->str);
}
scan_to_eol(lc);
/* Store a password specified address in MD5 coding */
void store_password(LEX *lc, struct res_items *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, T_STRING);
+ lex_get_token(lc, T_STRING);
if (pass == 1) {
MD5Init(&md5c);
MD5Update(&md5c, (unsigned char *) (lc->str), lc->str_len);
*/
void store_res(LEX *lc, struct res_items *item, int index, int pass)
{
- int token;
RES *res;
- token = lex_get_token(lc, T_NAME);
+ lex_get_token(lc, T_NAME);
if (pass == 2) {
res = GetResWithName(item->code, lc->str);
if (res == NULL) {
/* Store an integer at specified address */
void store_int(LEX *lc, struct res_items *item, int index, int pass)
{
- int token;
-
- token = lex_get_token(lc, T_INT32);
+ 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)
{
- int token;
-
- token = lex_get_token(lc, T_PINT32);
+ 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)
{
- int token;
-
- token = lex_get_token(lc, T_INT64);
+ 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)
{
- 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, 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_UNQUOTED_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);
- }
- 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) {
+ if (!size_to_uint64(lc->str, lc->str_len, &uvalue)) {
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);
void store_time(LEX *lc, struct res_items *item, int index, int pass)
{
int token;
- btime_t value;
+ utime_t utime;
+ char period[500];
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_UNQUOTED_STRING:
- if (!string_to_btime(lc->str, &value)) {
- scan_err1(lc, "expected a time period, got: %s", lc->str);
+ 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);
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)
{
- int token;
-
- token = lex_get_token(lc, T_NAME);
+ lex_get_token(lc, T_NAME);
if (strcasecmp(lc->str, "yes") == 0) {
*(int *)(item->value) |= item->code;
} else if (strcasecmp(lc->str, "no") == 0) {
parse_config(char *cf)
{
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;
+ struct res_items *items = NULL;
int level = 0;
/* Make two passes. The first builds the name symbol table,
}
if (token != T_IDENTIFIER) {
scan_err1(lc, "Expected a Resource name identifier, got: %s", lc->str);
+ /* NOT REACHED */
}
for (i=0; resources[i].name; i++)
if (strcasecmp(resources[i].name, lc->str) == 0) {
}
if (state == p_none) {
scan_err1(lc, "expected resource name, got: %s", lc->str);
+ /* NOT REACHED */
}
break;
case p_resource:
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) {
- token = lex_get_token(lc, T_ALL);
- 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);
+ /* 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 (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);
+ /* NOT REACHED */
+ }
}
Dmsg1(150, "calling handler for %s\n", items[i].name);
/* Call item handler */
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);
+ 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;
default:
scan_err2(lc, "unexpected token %d %s in resource definition",
token, lex_tok_to_str(token));
+ /* NOT REACHED */
}
break;
default:
scan_err1(lc, "Unknown parser state %d\n", state);
+ /* NOT REACHED */
}
}
+ if (state != p_none) {
+ scan_err0(lc, "End of conf file reached with unclosed resource.");
+ }
if (debug_level > 50 && pass == 2) {
int i;
for (i=r_first; i<=r_last; i++) {
projects / bacula / bacula / blobdiff