From 76ab73e38cfd34de4f83dce0d515e2983414f4d3 Mon Sep 17 00:00:00 2001
From: NunoSempere <nuno.sempere@protonmail.com>
Date: Tue, 13 Dec 2022 20:18:23 +0000
Subject: [PATCH] tweak: conciseness tweaks.

---
 plugins/libre_redirect/example          | Bin 17008 -> 17040 bytes
 plugins/libre_redirect/example.c        |  16 ++++++----------
 plugins/libre_redirect/libre_redirect.c |  10 ++++++++--
 plugins/libre_redirect/libre_redirect.h |   1 +
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/plugins/libre_redirect/example b/plugins/libre_redirect/example
index d46dfae22428a6a3c376a3b9935e8da1f5356b2e..3d125d5eac65124c80ec46e8ed38b3d3633bf749 100755
GIT binary patch
delta 1080
zcmYjQZERCj7(VaqN^gsmZY}KugKG)G;y#$!x($Ne-E!S20S3s$;W~+cAxlsb7*Uf!
zNXoP~UA6cortkxXi6DtT2A3Zr!8k(%mLRl$$Vdp&WX48R8emeO<oMoRK~M7Ld7k(C
zo}61a2<c%+FN5r%+G&?vX60j-u?iZTS;>-FBMRN%j9H4s@UV2v_vN_<zn|Jx{J_@u
z?a;3GP8Yu3GFLN(Y;U<`zk@NJavw8pd740uPq=k8kyLSU)mO2kmf%S>qhIIxrM#Wm
z^Q4yHDRq=vu6A<i>PURw2-~~B%;fq-o?7K`Gd6Bc&!2fB#O-RU!i>nzA{mT$7s4*=
z^M)IiP?oM1sKJCe$X}NCNsgP+QI<uLW2P+P_g)1~Ao%{=F#cGG@}S8J_vS5nq;dUM
zuJ6n1duJ}GC3At>zNA{>+p|=h=a9X~YT{}M$hT6R8JbC|GyjjVbUzk-ia$(U_2C^t
z2%a2XZvu@CV$b|pZQ&zQDf?L`U4^b5Ao`s}6GVTsXqxCx7NxtgPg``9=&VJ*A?kFM
zJB$&n#KZmwti~JuCeUzhV3}0+5IejJI+s5*hrK)1r^J+g<!xna|An;qnaZ1MQmec#
zGp1~g>em%5s?RE$6uqSJRDA`x-&j-ogvbAo^F7AVz()Ct8lTI>wA}+MYL@JA;i8(W
zn)x(n0oHa$h%{k>(7eYCVU}=;@FT(>3PR)w`|b)+4UGMEPlz_chWkSF5@!AuB0(rW
zpgL?1E`?rvCm4WH{FwM<JRS^0C;k$mgL*tYbwozUax~)z)iU*Y&nHrsd(PU=ZJ$-7
z>?3pH4%<O^&hhW#evwknldVJu1!_%olk6mI)J^!TdcRd*b}x}##bD?ad!4x(ZU}YB
zgT$843W32UuQ3*ybm3@y8x)Nj^^OWC;xA3zz>V5hrva{@v-uco#8b^LK>;V5KZGt+
zS^|``rRAjLpN~@bbvS_0@Xq$~`ZTPEeuFCJVb^>l=#&>D>?MDt^aAsAnBM=+4$OrE
z_WcwM;c3ZdK<he5-ZQv+>%jX1gT}h{<6sn4{A`03%)Qp=EC#H~B03|VLJSW@8Y_9w
f@;$|bk&6g`Da<LY&gxbxcmyjuTj2~wJD2_g$>?&U

delta 1009
zcmX|AYe*DP6ux(KU3bx3b#;1JuI6KxQd`?xOMHwrH4BNByG0MHANGO@u_6K`W3^^j
zx3oiHzmf{t{)9CULH$sQ)IU}bm62&dwPX*ij2_1A%uaRT@O|Gs-#KUQ%$?45I@v}$
z?X<VcF=n1NlE|7iLK4k4g*aV?R1aNEO<r9QFP!7<TMKVppLo%7)}1w93^ly|^vJ0?
zE~?E@o8n_*u!|IoKc&8~IH^?;+X7;nzb{S^<$x#$YpLP`KIy{I0kKtUIFTp?eBA-D
zRqDPM&Ds27D@9Qv%FS=}gd9l_O-MnpM^YY3%0T!tB}5TB{4E{i&|E1Xc1y}VDOma@
zj*y#L+pzqbv5DDwg_arppV^NYN#UPId{Ur(ut8dymTkwPgNAS=IFpO=f6Xwah?Cg2
zPaF0=BEO=%smalZ{Eo6$lf!T(S)k4EB>98+<S)h|eTN_=MM$kfskApR92jV?)d2lv
zus3DeSNs!I(D2ZNFH6DG2My13DkFWR(@v!Cbc$y;%;>ZSX_7fo7DAe%(_W<ca3i&x
zcEPt)Cv5^dZ>Jtu%g?K+{-Mp<@pQAWMW`3H3ft=M?95L{Z_{2BNl33CUlJDl6gI30
zmM+X8L|E@p9t%E?GA(!oWyU83^Q^dCx5n{X^1qJ_Z&R=G>tdmgvz)eB&BWKVXN4{M
z03oozHe9V;5`0Wj{E0CcQAX@V>_!|!e2UnJ*gwhGIAZ%}#w_?P6TdRH1X2FR*mlJ4
zh#?R%a_4NviUM?!l}3vOSr{&i5FEqogO6CRZU0?X#Df@v(4WB@MzHoSjAqPsU8Qlx
zSlyF`a2sRa6k{DYiioo;$GNKbm?(e5v>3OZV~l_&bCDqq9X2?US!M7dlhppqF*A(E
z*r6w{n1<DnJYzHs!%OFCTA?}$$0)r7Cf9jd3|Cy~bR33Uhv_~LmhouXxa>0b!wOu{
zD%uF1qFtuD+H_ns@UV!F-i*H+Bo-!f<d90;J2|y+c@I?+N?u0MY?vx5Fok*D9tKDG
o3F?Jw<pqfq8T#Ho+^tTPGfMklN^qNqTTga@v(k<CVozo6A50ly)&Kwi

diff --git a/plugins/libre_redirect/example.c b/plugins/libre_redirect/example.c
index b21cad1..0b1c9ef 100644
--- a/plugins/libre_redirect/example.c
+++ b/plugins/libre_redirect/example.c
@@ -4,20 +4,16 @@
 
 int main(){
   char uri[] = "https://reddit.com/r/blah";
-
-  int uri_length = strlen(uri);
-  int l = LIBRE_N+uri_length;
-  char uri_filtered[l++];
-  for(int i=0; i<l; i++){
-    uri_filtered[i] = ' ';
-  }
-  uri_filtered[l] = '\0';
+  
+  int l = LIBRE_N + strlen(uri) + 1;
+  char uri_filtered[l];
+  str_init(uri_filtered, l);
 
   int libre_check = libre_redirect(uri, uri_filtered);
   if(!libre_check){
-    printf("Filtered url: %s", uri_filtered);
+    printf("Filtered url: %s\n", uri_filtered);
   }else{
-    printf("Uri: %s", uri);
+    printf("Uri: %s\n", uri);
     // failure; do something with the original uri.
   }
 }
diff --git a/plugins/libre_redirect/libre_redirect.c b/plugins/libre_redirect/libre_redirect.c
index 7d18387..b64b715 100644
--- a/plugins/libre_redirect/libre_redirect.c
+++ b/plugins/libre_redirect/libre_redirect.c
@@ -6,6 +6,13 @@
 
 // int str_replace_start(const char* string, const char* target, const char* replacement, char* output){
 
+void str_init(char* str, int n){
+  for(int i=0; i<n; i++){
+    str[i] = ' ';
+  }
+  str[n] = '\0';
+} // could also use <https://manpages.ubuntu.com/manpages/impish/man3/strinit.3pub.html>
+
 int libre_redirect(const char* uri, char* output){
   /* inv.riverside.rocks */
   // max length
@@ -16,7 +23,7 @@ int libre_redirect(const char* uri, char* output){
     return 1; // not enough memory. 
   }else{
     char tmp_uri[l2++];
-    strcpy(tmp_uri, uri);
+    strcpy(tmp_uri, uri); // includes terminating '\0'
 
     char* sites[] = { 
       "https://youtube.com", 
@@ -39,7 +46,6 @@ int libre_redirect(const char* uri, char* output){
       strcpy(tmp_uri, output);
     }
     strcpy(output, tmp_uri);
-
   }
 
   return 0;
diff --git a/plugins/libre_redirect/libre_redirect.h b/plugins/libre_redirect/libre_redirect.h
index ef5cf77..09e88be 100755
--- a/plugins/libre_redirect/libre_redirect.h
+++ b/plugins/libre_redirect/libre_redirect.h
@@ -4,5 +4,6 @@
 #define LIBRE_N 12
 
 int libre_redirect(const char* uri, char* uri_filtered);
+void str_init(char* str, int n);
 
 #endif