From 313a5a401361ecedc8935ccd644fad8e308f8735 Mon Sep 17 00:00:00 2001
From: TheDarkBug <adrianoliviero23@gmail.com>
Date: Wed, 14 Apr 2021 10:32:12 +0200
Subject: [PATCH] Improved parse_config(), added man page to .gitignore

---
 .gitignore    |   2 +-
 uwufetch.1.gz | Bin 1180 -> 0 bytes
 uwufetch.c    |  40 ++++++----------------------------------
 3 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 uwufetch.1.gz

diff --git a/.gitignore b/.gitignore
index 6d00c33..580a1f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 uwufetch
 *.zip
 *.vscode
-*.1
\ No newline at end of file
+*.gz
\ No newline at end of file
diff --git a/uwufetch.1.gz b/uwufetch.1.gz
deleted file mode 100644
index bdd5de8a7ad96ebd66ae910987a0777a4cad8e63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1180
zcmV;N1Y`RjiwFpSCUjr`19f+GW@U6^Xf81Tg;rZ{;y4t3=T{tcUpi6?)6Uzz(UK`>
zTZjl~c2v;HBqs4Tu`|9j@bBl?4wR&jk<v???>l#&bNZ_*7#b}KqFGGxd=Dw*R1!@S
z*z6%BJP|S6_wT;-`m3v6e=&xu<&Wj}VDUJ<f~!0H8J3deaR2q*zL?5vsg5(a>)+!m
zGO~TIAB|x;d<lB}Fzg)>w=jf)78KN8X<7i|TLD^#9JWHjGvj7=0~?~y62XD*2_GOA
zw4~gg^yDD7n1Uc%N)pq)QxyH2&cbLCIc2Nu>%;n>5ntwOc*Q@H^(<UWX4A+W9nOaH
zr{zm9UDT&2U<6<BxBUl2M^KZT<XZx(SIXB!#f&wf7!R%$=!`-xQUOGPLxH9{4c7_X
z5|isMUQF!8#71EfnsWBSKukEqnGlKs0S^LJkd#76bmm1QUPQu_mZDR{(IhRvS!r`@
z4?Pz+DX5p3d6^l_%d^fAu%FO~v?ef5aJHRgc&i!5Y!S@gwvLH4$4kh)gd9z|pwfPF
z%sdBW%2G&Mrp|V@F`5akd<iVWa5i5ABN$Dh#eDLx{K(tr1nvA?0h~M-Oi|iz4m{nH
zykxwEX*?d#G#F_T3*44)WzMne=g$<)c1O+`3Vv>KMs&mMwdk-eK?vbZ+IO0Wikwk#
z`fL#-Nt5_Qxt>+CP9Am-yuvLWUsg*<@fX{jrKP6r+6${N=YO!#Uw_24xEPZENhLbC
zg+;XQ%7F*NA1~*LuTrg7ulcWa&A%nGs1N0@R=>bNm6S)zD7fgwhdhB$WfZ;5DJd^W
z3`GejRdx7Piq>tN6ID*TOGF~%bCF=OxIR~hr;phf1by<GC7rB>=kEg17aX>RCsK5Y
zs{t+B`5PA%hih$iuD^U~_+k8KKOc@gYv9|F;5Y&s9mPSK3UB~X^4@tBJVY4TWd1V>
zU`mn6FNT&=(aHs9yFcU|S!^d%lNMDZeyd2;(Y;jeAhOlJ6spTjw?ZWl(P}Ier4P}l
zleU$VZdCHAX7B=ZQtb_KJZ$fyAbOln+$?rUTpl(GW`{&6MJkD1CsfI#Ut=()9)a}&
z9(;pyk7&^3jjDPB>DdiL+D*s}l2Z#U?_;c6;cjf=;(`5#<n|q>tZj1@+226LwAW=%
zPUal$HLlqFrV{)+d<ma}sI?X)Zaj2G@vnn1ZqC#r^u*i`VYl_pphQ9c^SVo(y5c(u
zX{;63iNJtxp?jQS@U{kLtz9*~v^3Cz2Iei+7kYccSUchB4Z-Cx45p*u^sx>>uCmIL
zHdJG1AuWyD3Y)6m*>R@&9mYvi7gviD>KoH~@0hg)@AEsOIBrsB#1Q>O2|BaIBx$`3
zklfY_#dl_dg9Q~+rHI5{L9sFu!sES9>ht6=m_`8%rz3crg+J$$r^UFLVHANy`py!J
zufaYcT`fI@&);yQ#W)G*jaz|ZQSK#6GwoMniO%&htxNUyV31;knN2?y#bA-q5s_~X
uCLJ793~))NgMu(VkW>w7JI0HCk$5YI%f)y$k9r^6e(yJY_<p7f3;+N;YdCuV

diff --git a/uwufetch.c b/uwufetch.c
index a070ba6..e1d22f2 100644
--- a/uwufetch.c
+++ b/uwufetch.c
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
 				break;
 		}
 	}
-	if (argc == 1 || a_i_flag == 0) print_ascii();
+	if (argc == 1 && a_i_flag == 0) print_ascii();
 	else if (a_i_flag) print_image();
 	uwu_name();
 	print_info();
@@ -113,40 +113,12 @@ void parse_config() {
 	char line[256];
 	char *homedir = getenv("HOME");
 	
-	//FILE *config = fopen(strcat(homedir, "/.config/uwufetch/config"), "r");
-	FILE *config = fopen("./config", "r");
-	if(config == NULL) {
-		return;
-	}
+	FILE *config = fopen(strcat(homedir, "/.config/uwufetch/config"), "r");
+	if(config == NULL) return;
 	while(fgets(line, sizeof(line), config)) {
-		if(line[0] == '#') {
-			break;
-		}
-		char key[32];
-		char value[64];
-		int len = strlen(line);
-		int delim_position;
-		// parse key
-		for(int i = 0;i < len;i++) {
-			if(line[i] == '=') {
-				delim_position = i;
-				break;
-			}
-			key[i] = line[i];
-		}
-		// parse value
-		for(int i = delim_position + 1;i < len;i++) {
-			if(line[i] == '#' || line[i] == '\n') {
-				break;
-			}
-			value[i - delim_position - 1] = line[i];
-		}
-		if(strcmp("image", key) == 0) {
-			a_i_flag = 1;
-			snprintf(image_name, 32, "%s", value);
-		} else if(strcmp("distro", key) == 0) {
-			snprintf(version_name, 64, "%s", value);
-		}
+		if(line[0] == '#') continue;
+		if (sscanf(line, "image=%s", image_name)) a_i_flag = 1;
+		sscanf(line, "distro=%s", version_name);
 	}
 }