Commit Diff

Commit:
f862d389ff60b517257e709b739ad13309d53be4
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
turn log styles into strings from yacc point of view having styles as reserved keywords means that variables / macros can't be called `common', `condensed', etc... which is not great and not obvious either. Instead, let's keep the log styles as strings and match on them. This also allows to have a slightly better error message in case of a typo. See: https://codeberg.org/op/gmid/issues/1
Actions:
Patch | Tree
commit - 574f71f7a3854e5aabfd7f1f93f0df5cec700562
commit + f862d389ff60b517257e709b739ad13309d53be4
blob - cd3d2d0064c89a57315d08f55b662422e29e7f69
blob + a570543b87a7001f839d3d67d13382d02fce2c94
--- parse.y
+++ parse.y
@@ -1,7 +1,7 @@
 %{
 
 /*
- * Copyright (c) 2021, 2022, 2023 Omar Polo <op@omarpolo.com>
+ * Copyright (c) 2021-2024 Omar Polo <op@omarpolo.com>
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
  * Copyright (c) 2004 Ryan McBride <mcbride@openbsd.org>
@@ -125,12 +125,12 @@ typedef struct {
 
 %token	ACCESS ALIAS AUTO
 %token	BLOCK
-%token	CA CERT CHROOT CLIENT COMBINED COMMON CONDENSED
+%token	CA CERT CHROOT CLIENT
 %token	DEFAULT
 %token	FACILITY FASTCGI FOR_HOST
 %token	INCLUDE INDEX IPV6
 %token	KEY
-%token	LANG LEGACY LISTEN LOCATION LOG
+%token	LANG LISTEN LOCATION LOG
 %token	OCSP OFF ON
 %token	PARAM PORT PREFORK PROTO PROTOCOLS PROXY
 %token	RELAY_TO REQUIRE RETURN ROOT
@@ -263,18 +263,19 @@ logopts		: /* empty */
 logopt		: ACCESS string		{
 			free(conf->log_access);
 			conf->log_access = $2;
-		}
-		| STYLE COMMON		{
-			conf->log_format = LOG_FORMAT_COMMON;
 		}
-		| STYLE COMBINED	{
-			conf->log_format = LOG_FORMAT_COMBINED;
-		}
-		| STYLE CONDENSED	{
-			conf->log_format = LOG_FORMAT_CONDENSED;
-		}
-		| STYLE LEGACY		{
-			conf->log_format = LOG_FORMAT_LEGACY;
+		| STYLE string {
+			if (!strcmp("combined", $2))
+				conf->log_format = LOG_FORMAT_COMBINED;
+			else if (!strcmp("common", $2))
+				conf->log_format = LOG_FORMAT_COMMON;
+			else if (!strcmp("condensed", $2))
+				conf->log_format = LOG_FORMAT_CONDENSED;
+			else if (!strcmp("legacy", $2))
+				conf->log_format = LOG_FORMAT_LEGACY;
+			else
+				yyerror("unknown log style: %s", $2);
+			free($2);
 		}
 		| SYSLOG FACILITY string {
 			const char *str = $3;
@@ -654,9 +655,6 @@ static const struct keyword {
 	{"cert", CERT},
 	{"chroot", CHROOT},
 	{"client", CLIENT},
-	{"combined", COMBINED},
-	{"common", COMMON},
-	{"condensed", CONDENSED},
 	{"default", DEFAULT},
 	{"facility", FACILITY},
 	{"fastcgi", FASTCGI},
@@ -666,7 +664,6 @@ static const struct keyword {
 	{"ipv6", IPV6},
 	{"key", KEY},
 	{"lang", LANG},
-	{"legacy", LEGACY},
 	{"listen", LISTEN},
 	{"location", LOCATION},
 	{"log", LOG},