=================================================================== RCS file: /cvs/cvs/blind/parse.y,v retrieving revision 1.17 retrieving revision 1.21 diff -u -p -r1.17 -r1.21 --- blind/parse.y 2022/04/10 21:04:06 1.17 +++ blind/parse.y 2022/04/19 02:48:43 1.21 @@ -25,53 +25,52 @@ #include "config.h" #include "log.h" -#define START_EXPAND 1 -#define DONE_EXPAND 2 +#define EXPAND_ON 1 +#define EXPAND_OFF 2 -static struct file *f; +int lookup(char *); +int igetc(void); +int lgetc(int); +int findeol(void); +void lungetc(int); +int kw_cmp(const void *, const void *); +int yyparse(void); +int yylex(void); +int yyerror(const char *, ...) + __attribute__((__format__ (printf, 1, 2))) + __attribute__((__nonnull__ (1))); -int lookup(char *); -int igetc(void); -int lgetc(int); -int findeol(void); -void lungetc(int); -int kw_cmp(const void *, const void *); -int yyparse(void); -int yylex(void); -int yyerror(const char *, ...) - __attribute__((__format__ (printf, 1, 2))) - __attribute__((__nonnull__ (1))); +int symset(const char *, const char *, int); +char *symget(const char *); -int config_load(struct blind *); -struct file *config_push(const char *); -int config_close(void); +int config_load(struct blind *); +int config_close(void); -static int expanding; -static int errors = 0; -struct blind *env = NULL; - -TAILQ_HEAD(symhead, sym) symhead = TAILQ_HEAD_INITIALIZER(symhead); +TAILQ_HEAD(symhead, sym) symhead = TAILQ_HEAD_INITIALIZER(symhead); struct sym { - TAILQ_ENTRY(sym) entry; - int used; - int persist; - char *nam; - char *val; + TAILQ_ENTRY(sym) entry; + int used; + int persist; + char *nam; + char *val; }; -char *symget(const char *); - typedef struct { union { - int64_t number; - char *string; + int64_t number; + char *string; } v; int lineno; } YYSTYPE; +static int expanding; +static int errors = 0; +struct blind *env = NULL; +static struct file *f = NULL; + %} -%token ACTION ARROW DISABLE ENABLE EXPIRE ERROR SET +%token ACTION ARROW COMPRESSION DISABLE ENABLE EXPIRE ERROR SET %token NUMBER %token STRING @@ -79,40 +78,64 @@ typedef struct { grammar : | grammar '\n' - | grammar set '\n' - | grammar error '\n' { errors++; } - ; + | grammar varset '\n' + | grammar set '\n' + | grammar error '\n' { errors++; } + ; +varset : STRING '=' STRING { + char *s = $1; + while (*s++) { + if (isspace((unsigned char)*s)) { + yyerror("macro contain whitespace"); + free($1); + free($3); + YYERROR; + } + } + if (symset($1, $3, 0) == -1) + log_fatal("cannot store variable"); + free($1); + free($3); +} +; + set : SET EXPIRE NUMBER { - env->bl_ttl = $3; + env->bl_ttl = $3; } -| SET ACTION ENABLE { - env->bl_opt |= BL_OPT_ACTION; - } -| SET ACTION DISABLE { - env->bl_opt |= !BL_OPT_ACTION; - } + | SET ACTION ENABLE { + env->bl_opt |= BL_OPT_ACTION; +} + | SET ACTION DISABLE { + env->bl_opt |= !BL_OPT_ACTION; +} + | SET COMPRESSION ENABLE { + env->bl_opt |= BL_OPT_COMPRESS; +} + | SET COMPRESSION DISABLE { + env->bl_opt |= !BL_OPT_COMPRESS; +} ; %% struct keywords { - const char *k_name; - int k_val; + const char *k_name; + int k_val; }; int yyerror(const char *fmt, ...) { - va_list ap; - char *msg; + va_list ap; + char *msg; errors++; va_start(ap, fmt); if (vasprintf(&msg, fmt, ap) == -1) log_fatal("yyerror vasprintf"); va_end(ap); - log_info("%s:%d: %s", f->name, yylval.lineno, msg); + log_info("%s:%d: %s", f->name, yylval.lineno, msg); free(msg); return (0); } @@ -126,15 +149,15 @@ kw_cmp(const void *k, const void *e) int lookup(char *s) { - /* this has to be sorted always */ static const struct keywords keywords[] = { - { "action", ACTION }, - { "disable", DISABLE }, - { "enable", ENABLE }, - { "expire", EXPIRE }, - { "set", SET }, + { "action", ACTION }, + { "compression", COMPRESSION }, + { "disable", DISABLE }, + { "enable", ENABLE }, + { "expire", EXPIRE }, + { "set", SET }, }; - const struct keywords *p; + const struct keywords *p; p = bsearch(s, keywords, sizeof(keywords)/sizeof(keywords[0]), sizeof(keywords[0]), kw_cmp); @@ -145,6 +168,46 @@ lookup(char *s) return (STRING); } +int +symset(const char *nam, const char *val, int persist) +{ + struct sym *sym; + + TAILQ_FOREACH(sym, &symhead, entry) { + if (strcmp(nam, sym->nam) == 0) + break; + } + + if (sym != NULL) { + if (sym->persist == 1) + return (0); + else { + free(sym->nam); + free(sym->val); + TAILQ_REMOVE(&symhead, sym, entry); + free(sym); + } + } + if ((sym = calloc(1, sizeof(*sym))) == NULL) + return (-1); + + sym->nam = strdup(nam); + if (sym->nam == NULL) { + free(sym); + return (-1); + } + sym->val = strdup(val); + if (sym->val == NULL) { + free(sym->nam); + free(sym); + return (-1); + } + sym->used = 0; + sym->persist = persist; + TAILQ_INSERT_TAIL(&symhead, sym, entry); + return (0); +} + char * symget(const char *nam) { @@ -170,9 +233,9 @@ igetc(void) else c = getc(f->stream); - if (c == START_EXPAND) + if (c == EXPAND_ON) expanding = 1; - else if (c == DONE_EXPAND) + else if (c == EXPAND_OFF) expanding = 0; else break; @@ -183,13 +246,13 @@ igetc(void) int lgetc(int quotec) { - int c, next; + int c, next; if (quotec) { if ((c = igetc()) == EOF) { yyerror("reached end of file while parsing " "quoted string"); - if (config_close() == EOF) + if (config_close() == EOF) return (EOF); return (quotec); } @@ -207,20 +270,9 @@ lgetc(int quotec) } if (c == EOF) { - /* - * Fake EOL when hit EOF for the first time. This gets line - * count right if last line in included file is syntactically - * invalid and has no newline. - */ - if (f->eof == 0) { - f->eof = 1; - return ('\n'); - } - while (c == EOF) { - if (config_close() == EOF) - return (EOF); - c = igetc(); - } + if (config_close() == EOF) + return (EOF); + c = igetc(); } return (c); } @@ -246,7 +298,6 @@ findeol(void) { int c; - /* skip to either EOF or the first real EOL */ while (1) { c = lgetc(0); if (c == '\n') { @@ -262,20 +313,21 @@ findeol(void) int yylex(void) { - char buf[8096]; - char *p, *val; - int quotec, next, c; - int token; + char buf[8096]; + char *p, *val; + int quotec, next, c; + int token; top: p = buf; while ((c = lgetc(0)) == ' ' || c == '\t') - ; /* nothing */ + ; yylval.lineno = f->lineno; if (c == '#') while ((c = lgetc(0)) != '\n' && c != EOF) - ; /* nothing */ + ; + if (c == '$' && !expanding) { while (1) { if ((c = lgetc(0)) == EOF) @@ -299,12 +351,12 @@ top: return (findeol()); } p = val + strlen(val) - 1; - lungetc(DONE_EXPAND); + lungetc(EXPAND_OFF); while (p >= val) { lungetc((unsigned char)*p); p--; } - lungetc(START_EXPAND); + lungetc(EXPAND_ON); goto top; } @@ -354,7 +406,7 @@ top: if (c == '-' || isdigit(c)) { do { *p++ = c; - if ((size_t)(p-buf) >= sizeof(buf)) { + if ((size_t)(p-buf) >= sizeof(buf)) { yyerror("string too long"); return (findeol()); } @@ -435,7 +487,7 @@ config_load(struct blind *temp) log_debug("cannot duplicate name"); free(f); return (-1); - } + } if ((f->stream = fopen(f->name, "r")) == NULL) { log_debug("cannot open config file"); free(f->name);