*/
void scan_to_eol(LEX *lc)
{
- int token;
Dmsg0(150, "start scan to eof\n");
- while ((token = lex_get_token(lc, T_ALL)) != T_EOL)
+ while (lex_get_token(lc, T_ALL) != T_EOL)
{ }
Dmsg0(150, "done scan to eof\n");
}
{
va_list arg_ptr;
char buf[MAXSTRING];
+ char more[MAXSTRING];
va_start(arg_ptr, msg);
bvsnprintf(buf, sizeof(buf), msg, arg_ptr);
va_end(arg_ptr);
- e_msg(file, line, M_ERROR_TERM, 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);
+ if (lc->line_no > lc->begin_line_no) {
+ sprintf(more, _("Problem probably begins at Line %d.\n"), lc->begin_line_no);
+ } else {
+ more[0] = 0;
+ }
+ e_msg(file, line, M_ERROR_TERM, 0, _("Config error: %s\n\
+ : Line %d, col %d of file %s\n%s\n%s"),
+ buf, lc->line_no, lc->col_no, lc->fname, lc->line, more);
}
* Free the current file, and retrieve the contents
* of the previous packet if any.
*/
-LEX *
-lex_close_file(LEX *lf)
+LEX *lex_close_file(LEX *lf)
{
LEX *of;
- Dmsg1(20, "Close lex file: %s\n", lf->fname);
+ Dmsg1(40, "Close lex file: %s\n", lf->fname);
if (lf == NULL) {
Emsg0(M_ABORT, 0, "Close of NULL file\n");
}
of = lf->next;
fclose(lf->fd);
- Dmsg1(29, "Close cfg file %s\n", lf->fname);
+ Dmsg1(49, "Close cfg file %s\n", lf->fname);
free(lf->fname);
if (of) {
of->options = lf->options; /* preserve options */
memcpy(lf, of, sizeof(LEX));
- Dmsg1(29, "Restart scan of cfg file %s\n", of->fname);
+ Dmsg1(49, "Restart scan of cfg file %s\n", of->fname);
} else {
of = lf;
lf = NULL;
* the next field.
*
*/
-LEX *
-lex_open_file(LEX *lf, char *filename, LEX_ERROR_HANDLER *scan_error)
+LEX *lex_open_file(LEX *lf, char *filename, LEX_ERROR_HANDLER *scan_error)
{
LEX *nf;
if ((fd = fopen(fname, "r")) == NULL) {
- Emsg2(M_ABORT, 0, "Cannot open config file %s: %s\n", fname, strerror(errno));
+ Emsg2(M_ERROR_TERM, 0, _("Cannot open config file %s: %s\n"),
+ fname, strerror(errno));
}
- Dmsg1(29, "Open config file: %s\n", fname);
+ Dmsg1(49, "Open config file: %s\n", fname);
nf = (LEX *)malloc(sizeof(LEX));
if (lf) {
memcpy(nf, lf, sizeof(LEX));
} else {
lf->scan_error = s_err;
}
- Dmsg1(29, "Return lex=%x\n", lf);
+ Dmsg1(49, "Return lex=%x\n", lf);
return lf;
}
* L_EOF if end of file
* L_EOL if end of line
*/
-int
-lex_get_char(LEX *lf)
+int lex_get_char(LEX *lf)
{
- if (lf->ch == L_EOF)
+ if (lf->ch == L_EOF) {
Emsg0(M_ABORT, 0, "get_char: called after EOF\n");
+ }
if (lf->ch == L_EOL) {
if (fgets(lf->line, MAXSTRING, lf->fd) == NULL) {
lf->ch = L_EOF;
return lf->ch;
}
-void
-lex_unget_char(LEX *lf)
+void lex_unget_char(LEX *lf)
{
lf->col_no--;
if (lf->ch == L_EOL)
static void add_str(LEX *lf, int ch)
{
if (lf->str_len >= MAXSTRING-3) {
- Emsg2(M_ABORT, 0, "Token too long, file: %s, line %s\n", lf->fname, lf->line_no);
+ Emsg3(M_ERROR_TERM, 0, _(
+ "Token too long, file: %s, line %d, begins at line %d\n"),
+ lf->fname, lf->line_no, lf->begin_line_no);
}
lf->str[lf->str_len++] = ch;
lf->str[lf->str_len] = 0;
{
lf->str_len = 0;
lf->str[0] = 0;
- if (ch != 0)
+ if (ch != 0) {
add_str(lf, ch);
+ }
+ lf->begin_line_no = lf->line_no; /* save start string line no */
}
#ifdef DEBUG
-static char *
-lex_state_to_str(int state)
+static char *lex_state_to_str(int state)
{
switch (state) {
case lex_none: return "none";
* Convert a lex token to a string
* used for debug/error printing.
*/
-char *
-lex_tok_to_str(int token)
+char *lex_tok_to_str(int token)
{
switch(token) {
case L_EOF: return "L_EOF";
static uint32_t scan_pint(LEX *lf, char *str)
{
- double dval;
+ double dval = 0;
if (!is_a_number(str)) {
scan_err1(lf, "expected a positive integer number, got: %s", str);
+ /* NOT REACHED */
} else {
errno = 0;
dval = strtod(str, NULL);
if (errno != 0 || dval < 0) {
scan_err1(lf, "expected a postive integer number, got: %s", str);
+ /* NOT REACHED */
}
}
return (uint32_t)dval;
switch (lf->state) {
case lex_none:
Dmsg2(290, "Lex state lex_none ch=%d,%x\n", ch, ch);
- if (ISSPACE(ch))
+ if (B_ISSPACE(ch))
break;
- if (ISALPHA(ch)) {
+ if (B_ISALPHA(ch)) {
if (lf->options & LOPT_NO_IDENT)
lf->state = lex_string;
else
begin_str(lf, ch);
break;
}
- if (ISDIGIT(ch)) {
+ if (B_ISDIGIT(ch)) {
lf->state = lex_number;
begin_str(lf, ch);
break;
if (ch == L_EOL) {
lf->state = lex_none;
token = T_EOL;
+ } else if (ch == L_EOF) {
+ token = T_ERROR;
}
break;
case lex_number:
Dmsg2(290, "Lex state lex_number ch=%x %c\n", ch, ch);
+ if (ch == L_EOF) {
+ token = T_ERROR;
+ break;
+ }
/* Might want to allow trailing specifications here */
- if (ISDIGIT(ch)) {
+ if (B_ISDIGIT(ch)) {
add_str(lf, ch);
break;
}
/* A valid number can be terminated by the following */
- if (ISSPACE(ch) || ch == L_EOL || ch == ',' || ch == ';') {
+ if (B_ISSPACE(ch) || ch == L_EOL || ch == ',' || ch == ';') {
token = T_NUMBER;
lf->state = lex_none;
} else {
lex_unget_char(lf);
break;
case lex_ip_addr:
+ if (ch == L_EOF) {
+ token = T_ERROR;
+ break;
+ }
Dmsg1(290, "Lex state lex_ip_addr ch=%x\n", ch);
break;
case lex_string:
Dmsg1(290, "Lex state lex_string ch=%x\n", ch);
+ if (ch == L_EOF) {
+ token = T_ERROR;
+ break;
+ }
if (ch == '\n' || ch == L_EOL || ch == '=' || ch == '}' || ch == '{' ||
- ch == ';' || ch == ',' || ch == '#' || (ISSPACE(ch)) ) {
+ ch == ';' || ch == ',' || ch == '#' || (B_ISSPACE(ch)) ) {
lex_unget_char(lf);
token = T_UNQUOTED_STRING;
lf->state = lex_none;
break;
case lex_identifier:
Dmsg2(290, "Lex state lex_identifier ch=%x %c\n", ch, ch);
- if (ISALPHA(ch)) {
+ if (B_ISALPHA(ch)) {
add_str(lf, ch);
break;
- } else if (ISSPACE(ch)) {
+ } else if (B_ISSPACE(ch)) {
break;
} else if (ch == '\n' || ch == L_EOL || ch == '=' || ch == '}' || ch == '{' ||
ch == ';' || ch == ',' || ch == '"' || ch == '#') {
break;
case lex_quoted_string:
Dmsg2(290, "Lex state lex_quoted_string ch=%x %c\n", ch, ch);
+ if (ch == L_EOF) {
+ token = T_ERROR;
+ break;
+ }
if (ch == L_EOL) {
esc_next = FALSE;
break;
add_str(lf, ch);
break;
case lex_include: /* scanning a filename */
- if (ISSPACE(ch) || ch == '\n' || ch == L_EOL || ch == '}' || ch == '{' ||
+ if (ch == L_EOF) {
+ token = T_ERROR;
+ break;
+ }
+ if (B_ISSPACE(ch) || ch == '\n' || ch == L_EOL || ch == '}' || ch == '{' ||
ch == ';' || ch == ',' || ch == '"' || ch == '#') {
lf->state = lex_none;
lf = lex_open_file(lf, lf->str, NULL);
case T_STRING:
if (token != T_IDENTIFIER && token != T_UNQUOTED_STRING && token != T_QUOTED_STRING) {
- scan_err2(lf, "expected a name, got %s: %s",
+ scan_err2(lf, "expected a string, got %s: %s",
lex_tok_to_str(token), lf->str);
token = T_ERROR;
} else {