From 1bfee5c1a0ddaebb10d50e2335962d995bc641ce Mon Sep 17 00:00:00 2001
From: qorg11 <teru-sama@riseup.net>
Date: Sat, 2 Jul 2022 18:53:22 +0200
Subject: [PATCH] Almost finishing the yacc thing

---
 sakisafecli/Makefile |  2 +-
 sakisafecli/config.y |  0
 sakisafecli/parse.l  | 12 +++++++-----
 sakisafecli/parse.y  | 38 +++++++++++++++++++++++++-------------
 4 files changed, 33 insertions(+), 19 deletions(-)
 delete mode 100644 sakisafecli/config.y

diff --git a/sakisafecli/Makefile b/sakisafecli/Makefile
index 7862ab4..113ff41 100644
--- a/sakisafecli/Makefile
+++ b/sakisafecli/Makefile
@@ -8,7 +8,7 @@ PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man
 
-lex.yy.c:
+lex.yy.c: parse.l
 	lex parse.l
 
 .include <bsd.prog.mk>
diff --git a/sakisafecli/config.y b/sakisafecli/config.y
deleted file mode 100644
index e69de29..0000000
diff --git a/sakisafecli/parse.l b/sakisafecli/parse.l
index 051c64e..e9632dd 100644
--- a/sakisafecli/parse.l
+++ b/sakisafecli/parse.l
@@ -1,18 +1,20 @@
 %{
 #include <stdio.h>
-#define YYSTYPE char*
 #include "parse.h"
-extern YYSTYPE yylval;
 %}
 
 %%
+=                      return EQUAL;
 server                  return SERVERTOK;
 ipv4                    return IP4TOK;
 ipv6                    return IP6TOK;
-[a-zA-Z][a-zA-Z0-9]*    yylval=strdup(yytext); return WORD;
-[a-zA-Z0-9\/.-]+        yylval=strdup(yytext); return URL;
-\n                      /* ignore EOL */;
+silent                  return SILTOK;
+[a-zA-Z][a-zA-Z0-9]*    yylval.val = !strcmp(yytext,"true"); return WORD;
+(http|https).*[a-zA-Z0-9\/.-]+        yylval.str = strdup(yytext); return URL;
+\n                      return SEMICOLON;
 [ \t]+
 \"                     return QUOTE;
 ;                      return SEMICOLON;
+#.*
+
 %%
diff --git a/sakisafecli/parse.y b/sakisafecli/parse.y
index 3ad578b..eadf110 100644
--- a/sakisafecli/parse.y
+++ b/sakisafecli/parse.y
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include "config.h"
-#define YYSTYPE char*
+
     struct config rc;
     int yyparse(void);
     void yyerror(const char *str) {
@@ -17,11 +17,15 @@
 	   return 1;
     }
 
-%}
+	   %}
 
+%union YYSTYPE {
+    int val;
+    char *str;
+}
 
-%token SERVERTOK HPTOK SPTOK USPTOK UHPTOK IP4TOK IP6TOK QUOTE URL SEMICOLON WORD
-
+%token SERVERTOK HPTOK SPTOK USPTOK UHPTOK IP4TOK IP6TOK SILTOK QUOTE
+%token URL SEMICOLON WORD EQUAL
 
 %%
 
@@ -35,7 +39,7 @@ statements
 |
 IP4TOK quotedword
 {
-    if(!strcmp($2,"true"))
+    if($2.val)
 	   rc.ipv4_flag = true;
     else
 	   rc.ipv4_flag = false;
@@ -43,7 +47,7 @@ IP4TOK quotedword
 |
 IP6TOK quotedword
 {
-    if(!strcmp($2,"true"))
+    if($2.val)
 	   rc.ipv6_flag = true;
     else
 	   rc.ipv6_flag = false;
@@ -51,30 +55,38 @@ IP6TOK quotedword
 |
 SERVERTOK quotedname
 {
-    rc.server = $2;
+    rc.server = $2.str;
 }
 |
 HPTOK quotedname
 {
-    rc.http_proxy_url = $2;
+    rc.http_proxy_url = $2.str;
 }
 |
 SPTOK quotedname
 {
-    rc.socks_proxy_url = $2;
+    rc.socks_proxy_url = $2.str;
 }
+|
+SILTOK quotedword
+{
+    if($2.val)
+	   rc.silent_flag = true;
+    else
+	   rc.silent_flag = false;
+}			 
 ;
 
 quotedname:
-QUOTE URL QUOTE
+EQUAL QUOTE URL QUOTE
 {
-    $$=$2;
+    $$=$3;
 }
 
 quotedword:
-QUOTE WORD QUOTE
+EQUAL QUOTE WORD QUOTE
 {
-    $$=$2;
+    $$=$3;
 }
 
 statements: