More fixes to reporting jobs run

[bacula/bacula] / bacula / src / lib / lex.h

diff --git a/bacula/src/lib/lex.h b/bacula/src/lib/lex.h
index ec642a95be9e4ad79bbdbe6c7ab29c4ec1d57909..199d34c1106baccc36624b66a7901a38b94e0ae2 100644 (file)
--- a/bacula/src/lib/lex.h
+++ b/bacula/src/lib/lex.h
@@ -43,7 +43,7 @@
 #define T_NUMBER                      102
 #define T_IPADDR                      103
 #define T_IDENTIFIER                  104
-#define T_STRING                      105
+#define T_UNQUOTED_STRING             105
 #define T_QUOTED_STRING               106
 #define T_BOB                         108  /* begin block */
 #define T_EOB                         109  /* end of block */
@@ -60,7 +60,10 @@
 #define T_PINT32_RANGE                115  /* positive integer range */
 #define T_INT32                       116  /* integer */
 #define T_INT64                       117  /* 64 bit integer */
-#define T_NAME                        118  /* resource name */
+#define T_NAME                        118  /* name max 128 chars */
+#define T_STRING                      119  /* string */
+
+#define T_ALL                           0  /* no expectations */
 
 /* Lexical state */
 enum lex_state {
@@ -81,7 +84,6 @@ enum lex_state {
 typedef struct s_lex_context {
    struct s_lex_context *next;        /* pointer to next lexical context */
    int options;                       /* scan options */
-   int expect;                        /* types expected */
    char *fname;                       /* filename */
    FILE *fd;                          /* file descriptor */
    char line[MAXSTRING];              /* input line */
@@ -89,6 +91,7 @@ typedef struct s_lex_context {
    int str_len;                       /* length of string */
    int line_no;                       /* file line number */
    int col_no;                        /* char position on line */
+   int begin_line_no;                 /* line no of beginning of string */
    enum lex_state state;              /* lex_state variable */
    int ch;                            /* last char/L_VAL returned by get_char */
    int token;
@@ -96,6 +99,21 @@ typedef struct s_lex_context {
    uint32_t pint32_val2;
    int32_t int32_val;
    int64_t int64_val;
+   void (*scan_error)(const char *file, int line, struct s_lex_context *lc, const char *msg, ...);
+   void *caller_ctx;                  /* caller private data */
 } LEX;
 
+typedef void (LEX_ERROR_HANDLER)(const char *file, int line, LEX *lc, const char *msg, ...);
+
+/* Lexical scanning errors in parsing conf files */
+#define scan_err0(lc, msg) lc->scan_error(__FILE__, __LINE__, lc, msg)
+#define scan_err1(lc, msg, a1) lc->scan_error(__FILE__, __LINE__, lc, msg, a1)
+#define scan_err2(lc, msg, a1, a2) lc->scan_error(__FILE__, __LINE__, lc, msg, a1, a2)
+#define scan_err3(lc, msg, a1, a2, a3) lc->scan_error(__FILE__, __LINE__, lc, msg, a1, a2, a3)
+#define scan_err4(lc, msg, a1, a2, a3, a4) lc->scan_error(__FILE__, __LINE__, lc, msg, a1, a2, a3, a4)
+#define scan_err5(lc, msg, a1, a2, a3, a4, a5) lc->scan_error(__FILE__, __LINE__, lc, msg, a1, a2, a3, a4, a5)
+#define scan_err6(lc, msg, a1, a2, a3, a4, a5, a6) lc->scan_error(__FILE__, __LINE__, lc, msg, a1, a2, a3, a4, a5, a6)
+
+void scan_to_eol(LEX *lc);
+
 #endif /* _LEX_H */