change formatting + refactor string code

12 files changed, 85 insertions, 97 deletions

diff --git a/makefile b/makefile
index bd59e59..e45ab96 100644
--- a/makefile
+++ b/makefile
@@ -19,7 +19,7 @@ include plugins/plugins.mk
 # PLUGINS=./plugins/stand_in/stand_in.c
 
 ## Formatter
-STYLE_BLUEPRINT=webkit
+STYLE_BLUEPRINT="{BasedOnStyle: webkit, AllowShortIfStatementsOnASingleLine: true}" 
 FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT)
 
 # Runtime files 
diff --git a/plugins/libre_redirect/libre_redirect.c b/plugins/libre_redirect/libre_redirect.c
index b8194e1..e6ec5fc 100644
--- a/plugins/libre_redirect/libre_redirect.c
+++ b/plugins/libre_redirect/libre_redirect.c
@@ -1,14 +1,13 @@
-#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "str_init.h"
-#include "str_replace_start.h"
+#include "../strings/strings.h"
 
 #define LIBRE_N 50
 
 /* Inspired by https://libredirect.github.io/, but in C. */
 
+// Use string manipulation over urls
 int libre_redirect(const char* uri, char* output)
 {
     int len_uri = strlen(uri);
@@ -49,18 +48,18 @@ int libre_redirect(const char* uri, char* output)
             str_init(output, len_output);
             int replace_check = str_replace_start(uri, annoying_sites[i],
                 alternatives[i], output);
-            switch(replace_check){
-                case 0: // no match found
-                    break;
-                case 1: // str_replace_start somehow failed
-                    printf("str_replace_start failed\n");
-                    return 1;
-                    break;
-                case 2: // match succeeded
-                    return 2;
-                    break;
-                default: 
-                    printf("Unreachable state");
+            switch (replace_check) {
+            case 0: // no match found
+                break;
+            case 1: // str_replace_start somehow failed
+                printf("str_replace_start failed\n");
+                return 1;
+                break;
+            case 2: // match succeeded
+                return 2;
+                break;
+            default:
+                printf("Unreachable state");
             }
         }
         strcpy(output, uri);
diff --git a/plugins/libre_redirect/libre_redirect.h b/plugins/libre_redirect/libre_redirect.h
index 2c61397..7addeb0 100644
--- a/plugins/libre_redirect/libre_redirect.h
+++ b/plugins/libre_redirect/libre_redirect.h
@@ -3,4 +3,3 @@
 #define LIBRE_N 50
 
 int libre_redirect(const char* uri, char* uri_filtered);
-void str_init(char* str, int n);
diff --git a/plugins/libre_redirect/str_init.c b/plugins/libre_redirect/str_init.c
deleted file mode 100644
index 3fc548c..0000000
--- a/plugins/libre_redirect/str_init.c
+++ /dev/null
@@ -1,6 +0,0 @@
-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>
diff --git a/plugins/libre_redirect/str_init.h b/plugins/libre_redirect/str_init.h
deleted file mode 100644
index b282b7f..0000000
--- a/plugins/libre_redirect/str_init.h
+++ /dev/null
@@ -1 +0,0 @@
-void str_init(char* str, int n);
diff --git a/plugins/libre_redirect/str_replace_start.c b/plugins/libre_redirect/str_replace_start.c
deleted file mode 100644
index d1fe083..0000000
--- a/plugins/libre_redirect/str_replace_start.c
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
-#define DEBUG false
-
-/*
-See also:
-* <https://web.archive.org/web/20160201212501/coding.debuntu.org/c-implementing-str_replace-replace-all-occurrences-substring>
-* https://github.com/irl/la-cucina/blob/master/str_replace.c
-*/
-
-int str_replace_start(const char* string, const char* target, const char* replacement, char* output)
-{
-    int l1 = strlen(string);
-    int l2 = strlen(target);
-    int l3 = strlen(replacement);
-    int l4 = strlen(output);
-    if (DEBUG)
-        printf("%d,%d,%d,%d\n", l1, l2, l3, l4);
-    // if(DEBUG) printf("%s,%s,%s,%s\n", string, target, replacement, output);
-
-    if ((l4 < (l1 - l2 + l3)) || l4 < l1) {
-        // Not enough memory in output string.
-        if (DEBUG)
-            printf("String not long enough.\n");
-        return 1;
-    }
-    /* else if(l1 < l2){
-    // Not even possible that there is a match.
-    if(DEBUG) printf("Target larger than string.\n");
-    strcpy(output, string);
-  } */
-    else {
-        if (DEBUG)
-            printf("Looking for a match for %s in %s.\n", target, string);
-        int match = true;
-        for (int i = 0; i < l2; i++) {
-            if (string[i] != target[i]) {
-                match = false;
-                break;
-            }
-        }
-        if (match) {
-            if (DEBUG)
-                printf("Found match.\n");
-            for (int i = 0; i < l3; i++) {
-                output[i] = replacement[i];
-            }
-            int counter = l3;
-            for (int i = l2; i < l1; i++) {
-                output[counter] = string[i];
-                counter++;
-            }
-            output[counter] = '\0';
-            return 2; // success
-        } else {
-            if (DEBUG)
-                printf("Did not find match.\n");
-            strcpy(output, string);
-        }
-    }
-
-    return 0;
-}
diff --git a/plugins/libre_redirect/str_replace_start.h b/plugins/libre_redirect/str_replace_start.h
deleted file mode 100644
index 78c79b5..0000000
--- a/plugins/libre_redirect/str_replace_start.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-int str_replace_start(const char* string, const char* target,
-		      const char* replacement, char* output);
diff --git a/plugins/plugins.h b/plugins/plugins.h
index 184e58b..5f7e726 100644
--- a/plugins/plugins.h
+++ b/plugins/plugins.h
@@ -1,3 +1,4 @@
+#include "strings/strings.h"
 #include "libre_redirect/libre_redirect.h"
 #include "readability/readability.h"
 #include "shortcuts/shortcuts.h"
diff --git a/plugins/plugins.mk b/plugins/plugins.mk
index f95cac7..f8d000f 100644
--- a/plugins/plugins.mk
+++ b/plugins/plugins.mk
@@ -1,14 +1,17 @@
+## Shared
+COMMON_CODE=./plugins/strings/strings.c
+
 ## Plugins
 CUSTOM_STYLES=./plugins/style/style.c
 SHORTCUTS=./plugins/shortcuts/shortcuts.c
 READABILITY=./plugins/readability/readability.c 
-LIBRE_REDIRECT=./plugins/libre_redirect/libre_redirect.c ./plugins/libre_redirect/str_replace_start.c ./plugins/libre_redirect/str_init.c 
+LIBRE_REDIRECT=./plugins/libre_redirect/libre_redirect.c
 
 ADBLOCK='-L/usr/lib/wyebrowser/adblock.so' # optional adblocking; depends on https://github.com/jun7/wyebadblock
 
 STAND_IN=./plugins/stand_in/stand_in.c # gives function definitions for the above, which do nothing
 
-PLUGINS=$(CUSTOM_STYLES) $(SHORTCUTS) $(READABILITY) $(LIBRE_REDIRECT) 
+PLUGINS=$(COMMON_CODE) $(CUSTOM_STYLES) $(SHORTCUTS) $(READABILITY) $(LIBRE_REDIRECT) 
 # PLUGINS=$(STAND_IN)
 
 
diff --git a/plugins/shortcuts/shortcuts.c b/plugins/shortcuts/shortcuts.c
index dea48aa..9bf4a25 100644
--- a/plugins/shortcuts/shortcuts.c
+++ b/plugins/shortcuts/shortcuts.c
@@ -2,8 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../libre_redirect/str_init.h"
-#include "../libre_redirect/str_replace_start.h"
+#include "../strings/strings.h"
 
 #define SHORTCUT_N 41
 
diff --git a/plugins/strings/strings.c b/plugins/strings/strings.c
new file mode 100644
index 0000000..59bfdc9
--- /dev/null
+++ b/plugins/strings/strings.c
@@ -0,0 +1,61 @@
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#define DEBUG false
+
+// String manipulation
+void str_init(char* str, int n)
+{
+    // could also use <https://manpages.ubuntu.com/manpages/impish/man3/strinit.3pub.html>
+    for (int i = 0; i < n; i++)
+        str[i] = ' ';
+    str[n] = '\0';
+}
+int str_replace_start(const char* string, const char* target, const char* replacement, char* output)
+{
+    int l1 = strlen(string);
+    int l2 = strlen(target);
+    int l3 = strlen(replacement);
+    int l4 = strlen(output);
+
+    if (DEBUG) {
+        printf("string: %s, target: %s, replacement: %s, output: %s\n", string, target, replacement, output);
+        printf("%d,%d,%d,%d\n", l1, l2, l3, l4);
+    }
+
+    if ((l4 < (l1 - l2 + l3)) || l4 < l1) {
+        printf("Not enough memory in output string.\n");
+        return 1;
+    }
+    int match = true;
+    for (int i = 0; i < l2; i++) {
+        if (string[i] != target[i]) {
+            match = false;
+            break;
+        }
+    }
+    if (match) {
+        if (DEBUG) printf("Found match.\n");
+        for (int i = 0; i < l3; i++) {
+            output[i] = replacement[i];
+        }
+        int counter = l3;
+        for (int i = l2; i < l1; i++) {
+            output[counter] = string[i];
+            counter++;
+        }
+        output[counter] = '\0';
+        return 2; // success
+    } else {
+        if (DEBUG) printf("Did not find match.\n");
+        strcpy(output, string);
+    }
+
+    return 0;
+}
+/*
+See also:
+* <https://web.archive.org/web/20160201212501/coding.debuntu.org/c-implementing-str_replace-replace-all-occurrences-substring>
+* https://github.com/irl/la-cucina/blob/master/str_replace.c
+*/
diff --git a/plugins/strings/strings.h b/plugins/strings/strings.h
new file mode 100644
index 0000000..df08c75
--- /dev/null
+++ b/plugins/strings/strings.h
@@ -0,0 +1,2 @@
+void str_init(char* str, int n);
+int str_replace_start(const char* string, const char* target, const char* replacement, char* output);