Almost finishing the yacc thing

.clangd

@@ -0,0 +1,2 @@
+CompileFlags:
+	Add: [-Wall, -I/usr/local/include]

sakisafecli/.depend

@@ -0,0 +1 @@
+sakisafecli.full: /usr/lib/libc.a

sakisafecli/Makefile

@@ -1,8 +1,14 @@
 PROG   = sakisafecli
-SRCS  += funcs.c sakisafecli.c config.c
+SRCS   = parse.y
+SRCS  += funcs.c sakisafecli.c config.c lex.yy.c
 MAN    = sakisafecli.1 sakisafeclirc.5
 LDADD  = -lssl -lz -lpthread -lnghttp2 -lcurl -lconfig -lcrypto -L/usr/local/lib
+YFLAGS = -d
 PREFIX = /usr/local
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/man/man
+
+lex.yy.c: parse.l
+	lex parse.l
+
 .include <bsd.prog.mk>

sakisafecli/config.c

@@ -8,20 +8,20 @@ void
 print_config()
 {
 	puts("Current configuration:");
-	printf("Server: %s\n",server);
-	if(socks_proxy_flag)
-		printf("Socks proxy url: %s",socks_proxy_url);
-	if(http_proxy_flag)
-		printf("HTTP proxy url: %s",http_proxy_url);
-	if(silent_flag)
+	printf("Server: %s\n",rc.server);
+	if(rc.socks_proxy_flag)
+		printf("Socks proxy url: %s",rc.socks_proxy_url);
+	if(rc.http_proxy_flag)
+		printf("HTTP proxy url: %s",rc.http_proxy_url);
+	if(rc.silent_flag)
 		puts("Silent: true");
 	else
 		puts("Silent: false");
-	if(ipv6_flag)
+	if(rc.ipv6_flag)
 		printf("Force IPv6: true\n");
 	else
 		printf("Force IPv6: false\n");
-	if(ipv4_flag)
+	if(rc.ipv4_flag)
 		printf("Force IPv4: true\n");
 	else
 		printf("Force IPv4: false\n");
@@ -30,38 +30,20 @@ print_config()
 }
 
 void
-parse_config_file(FILE *config)
+init_config(struct config *rc)
 {
-
-	config_t runtime_config;
-
-	config_init(&runtime_config);
-	config_read(&runtime_config, config);
-	config_setting_t *cur;
-	cur = config_lookup(&runtime_config, "server");
-	if(config != NULL) {
-		if(cur != NULL)
-			server = (char *)config_setting_get_string(cur);
-		cur = config_lookup(&runtime_config, "socks_proxy");
-		if(cur != NULL)
-			socks_proxy_url = (char *)config_setting_get_string(cur);
-		cur = config_lookup(&runtime_config, "http_proxy");
-		if(cur != NULL)
-			http_proxy_url = (char *)config_setting_get_string(cur);
-		cur = config_lookup(&runtime_config, "use_socks_proxy");
-		if(cur != NULL)
-			socks_proxy_flag = config_setting_get_bool(cur);
-		cur = config_lookup(&runtime_config, "use_http_proxy");
-		if(cur != NULL)
-			http_proxy_flag = config_setting_get_bool(cur);
-		cur = config_lookup(&runtime_config, "silent");
-		if(cur != NULL)
-			silent_flag = config_setting_get_bool(cur);
-		cur = config_lookup(&runtime_config, "force_ipv6");
-		if(cur != NULL)
-			ipv6_flag = config_setting_get_bool(cur);
-		cur = config_lookup(&runtime_config, "force_ipv4");
-		if(cur != NULL)
-			ipv4_flag = config_setting_get_bool(cur);
-	}
+	rc->http_proxy_flag = false;
+	rc->socks_proxy_flag = false;
+	rc->http_proxy_url = NULL;
+	rc->socks_proxy_url = NULL;
+	rc->ipv4_flag = false;
+	rc->ipv6_flag = false;
+	rc->silent_flag = false;
+	rc->server = "https://lainsafe.delegao.moe";
+}
+void
+load_config()
+{
+	yyin = fopen("/usr/home/qorg/.sakisafeclirc","r");
+	yyparse();
 }

sakisafecli/config.h

@@ -1,9 +1,24 @@
-#include <libconfig.h>
+#include <stdbool.h>
+#include <stdio.h>
 
-/* Parse the config file */
-void
-parse_config_file(FILE *config);
+struct config
+{
+	bool ipv6_flag;
+	bool ipv4_flag;
+	bool http_proxy_flag;
+	bool socks_proxy_flag;
+	bool silent_flag;
+	bool paste_flag;
+	char *http_proxy_url;
+	char *socks_proxy_url;
+	char *server;
+};
 
-/* Print the current settings */
+extern struct config rc;
+extern FILE *yyin;
+/* Init the config */
 void
-print_config();	
+init_config(struct config *rc);
+
+void
+load_config();

sakisafecli/parse.l

@@ -0,0 +1,20 @@
+%{
+#include <stdio.h>
+#include "parse.h"
+%}
+
+%%
+=                      return EQUAL;
+server                  return SERVERTOK;
+ipv4                    return IP4TOK;
+ipv6                    return IP6TOK;
+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;
+#.*
+
+%%

sakisafecli/parse.y

@@ -0,0 +1,98 @@
+%{
+#include <stdio.h>
+#include "string.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include "config.h"
+
+    struct config rc;
+    int yyparse(void);
+    void yyerror(const char *str) {
+	   fprintf(stderr,"Error reading config file: %s\n",str);
+	   _exit(-1);
+    }
+
+    int yywrap()
+    {
+	   return 1;
+    }
+
+	   %}
+
+%union YYSTYPE {
+    int val;
+    char *str;
+}
+
+%token SERVERTOK HPTOK SPTOK USPTOK UHPTOK IP4TOK IP6TOK SILTOK QUOTE
+%token URL SEMICOLON WORD EQUAL
+
+%%
+
+conf_statements:
+|
+conf_statements conf_statement SEMICOLON
+;
+
+conf_statement:
+statements
+|
+IP4TOK quotedword
+{
+    if($2.val)
+	   rc.ipv4_flag = true;
+    else
+	   rc.ipv4_flag = false;
+}
+|
+IP6TOK quotedword
+{
+    if($2.val)
+	   rc.ipv6_flag = true;
+    else
+	   rc.ipv6_flag = false;
+}
+|
+SERVERTOK quotedname
+{
+    rc.server = $2.str;
+}
+|
+HPTOK quotedname
+{
+    rc.http_proxy_url = $2.str;
+}
+|
+SPTOK quotedname
+{
+    rc.socks_proxy_url = $2.str;
+}
+|
+SILTOK quotedword
+{
+    if($2.val)
+	   rc.silent_flag = true;
+    else
+	   rc.silent_flag = false;
+}			 
+;
+
+quotedname:
+EQUAL QUOTE URL QUOTE
+{
+    $$=$3;
+}
+
+quotedword:
+EQUAL QUOTE WORD QUOTE
+{
+    $$=$3;
+}
+
+statements:
+| statements statement
+;
+
+statement: URL | quotedname | quotedword
+
+%%

sakisafecli/sakisafecli.c

@@ -15,14 +15,6 @@
 
 /* Config variables */
 
-bool ipv6_flag = false, ipv4_flag = false, http_proxy_flag = false,
-	socks_proxy_flag = false, silent_flag = false, paste_flag = false;
-
-char *http_proxy_url, *socks_proxy_url;
-
-config_t runtime_config;
-
-char *server = "https://lainsafe.delegao.moe";
 const char *path = ".cache/sakisafelinks";
 int
 main(int argc, char **argv)
@@ -35,7 +27,6 @@ main(int argc, char **argv)
 #endif
 
 	char *form_key = "file";
-
 	char *buffer = (char *)calloc(1024, sizeof(char));
 
 	if(buffer == NULL) {
@@ -43,27 +34,9 @@ main(int argc, char **argv)
 		return -1;
 	}
 	char config_location[512];
-	char *sakisafeclirc_env = getenv("SAKISAFECLIRC");
-
-	if(sakisafeclirc_env == NULL) {
-		snprintf(config_location, 512, "%s/.sakisafeclirc", getenv("HOME"));
-		FILE *fp = fopen(config_location, "r");
-		if(fp != NULL) {
-			parse_config_file(fp);
-			fclose(fp);
-		}
-	} else {
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
-		strlcpy(config_location, sakisafeclirc_env, 512);
-#else /* Linux sucks! */
-		strncpy(config_location, sakisafeclirc_env, 512);
-#endif
-		FILE *fp = fopen(config_location, "r");
-		if(fp != NULL) {
-			parse_config_file(fp);
-			fclose(fp);
-		}
-	}
+	
+	init_config(&rc);
+	load_config();
 	/* libcurl initialization */
 
 	CURL *easy_handle = curl_easy_init();
@@ -105,7 +78,7 @@ main(int argc, char **argv)
 		 -1) {
 		switch(c) {
 			case 's':
-				server = optarg;
+				rc.server = optarg;
 				break;
 			case 'h':
 				print_help();
@@ -114,26 +87,26 @@ main(int argc, char **argv)
 				return 0;
 				break;
 			case 'p':
-				socks_proxy_url = optarg;
-				socks_proxy_flag = true;
+				rc.socks_proxy_url = optarg;
+				rc.socks_proxy_flag = true;
 				break;
 			case 'P':
-				http_proxy_url = optarg;
-				http_proxy_flag = true;
+				rc.http_proxy_url = optarg;
+				rc.http_proxy_flag = true;
 				break;
 			case 'S':
-				silent_flag = true;
+				rc.silent_flag = true;
 				break;
 			case '4':
-				ipv4_flag = true;
+				rc.ipv4_flag = true;
 				break;
 			case '6':
-				ipv6_flag = true;
+				rc.ipv6_flag = true;
 				break;
 			case 'x':
 				/* We don't want the progress bar in this case */
-				silent_flag = true;
-				paste_flag = true;
+				rc.silent_flag = true;
+				rc.paste_flag = true;
 				break;
 			case '?':
 				print_usage();
@@ -149,7 +122,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if(access(argv[optind], F_OK) && !paste_flag) {
+	if(access(argv[optind], F_OK) && !rc.paste_flag) {
 		fprintf(stderr, "Error opening file\n");
 		return -1;
 	}
@@ -157,27 +130,27 @@ main(int argc, char **argv)
 	/* curl options */
 	curl_easy_setopt(easy_handle, CURLOPT_WRITEFUNCTION, write_data);
 	curl_easy_setopt(easy_handle, CURLOPT_WRITEDATA, buffer);
-	curl_easy_setopt(easy_handle, CURLOPT_URL, server);
+	curl_easy_setopt(easy_handle, CURLOPT_URL, rc.server);
 
 	/* Proxy options */
 
-	if(socks_proxy_flag && http_proxy_flag) {
+	if(rc.socks_proxy_flag && rc.http_proxy_flag) {
 		fprintf(stderr, "Socks_Proxy and HTTP_PROXY can't be used at once\n");
 		return -1;
-	} else if(socks_proxy_flag) {
-		curl_easy_setopt(easy_handle, CURLOPT_PROXY, socks_proxy_url);
+	} else if(rc.socks_proxy_flag) {
+		curl_easy_setopt(easy_handle, CURLOPT_PROXY, rc.socks_proxy_url);
 		curl_easy_setopt(
 			easy_handle, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
-	} else if(http_proxy_flag) {
-		curl_easy_setopt(easy_handle, CURLOPT_PROXY, http_proxy_url);
+	} else if(rc.http_proxy_flag) {
+		curl_easy_setopt(easy_handle, CURLOPT_PROXY, rc.http_proxy_url);
 		curl_easy_setopt(easy_handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
 	}
 
 	/* Which address to use */
 
-	if(ipv6_flag)
+	if(rc.ipv6_flag)
 		curl_easy_setopt(easy_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
-	else if(ipv4_flag)
+	else if(rc.ipv4_flag)
 		curl_easy_setopt(easy_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 	else
 		curl_easy_setopt(
@@ -194,21 +167,21 @@ main(int argc, char **argv)
 	file_data = curl_mime_addpart(mime);
 	char *filename = argv[optind];
 
-	if(paste_flag)
+	if(rc.paste_flag)
 		filename = "/dev/stdin";
 
 	curl_mime_filedata(file_data, filename);
 	curl_mime_name(file_data, form_key);
-	if(paste_flag)
+	if(rc.paste_flag)
 		curl_mime_filename(file_data, "-");
 
-	curl_easy_setopt(easy_handle, CURLOPT_NOPROGRESS, silent_flag);
+	curl_easy_setopt(easy_handle, CURLOPT_NOPROGRESS, rc.silent_flag);
 	curl_easy_setopt(easy_handle, CURLOPT_PROGRESSFUNCTION, progress);
 
 	curl_easy_setopt(easy_handle, CURLOPT_MIMEPOST, mime);
 	curl_easy_perform(easy_handle);
 
-	if(!silent_flag)
+	if(!rc.silent_flag)
 		putchar('\n');
 
 	puts(buffer);
@@ -217,6 +190,5 @@ main(int argc, char **argv)
 	curl_easy_cleanup(easy_handle);
 
 	free(buffer);
-	config_destroy(&runtime_config);
 	return 0;
 }