Update for sh_integration v4.0.0 refactoring

Author: ThatHackerDudeFromCyberspace

extractor/main.c

@@ -187,8 +187,8 @@ void index_file(char *path, char* filename, bool new) {
                 fileTypeEndPointer = b64Pointer;
             }
 
-            char* fileType = malloc(fileTypeEndPointer - fileTypePointer + 1);
-            strncpy(fileType, fileTypePointer, fileTypeEndPointer - fileTypePointer);
+            char* fileType = malloc((size_t) (fileTypeEndPointer - fileTypePointer + 1));
+            strncpy(fileType, fileTypePointer, (size_t) (fileTypeEndPointer - fileTypePointer));
             fileType[fileTypeEndPointer - fileTypePointer] = '\0';
 
             char* icon_sdr_path = asprintf_hd( "%s/icon.%s", sdr_path, fileType);
@@ -204,15 +204,15 @@ void index_file(char *path, char* filename, bool new) {
                 if (header.icon[i] >= 'A' && header.icon[i] <= 'Z') {
                     value = header.icon[i] - 'A';
                 } else if (header.icon[i] >= 'a' && header.icon[i] <= 'z') {
-                    value = (header.icon[i] - 'a') + 26;
+                    value = (char) (header.icon[i] - 'a') + 26;
                 } else if (header.icon[i] >= '0' && header.icon[i] <= '9') {
-                    value = (header.icon[i] - '0') + 52;
+                    value = (char) (header.icon[i] - '0') + 52;
                 } else if (header.icon[i] == '+') {
                     value = 62;
                 } else if (header.icon[i] == '/') {
                     value = 63;
                 } else if (header.icon[i] != '=') {
-                    Log("Invalid B64 at position %i", i); // Warn
+                    Log("Invalid B64 at position %zu", i); // Warn
                 }
 
                 // Add data to the currentByte
@@ -231,7 +231,7 @@ void index_file(char *path, char* filename, bool new) {
 
                     // Set new currentByte to leftover bits
                     currentByte = 0;
-                    currentByte |= value << (2 + consumedBits);
+                    currentByte |= (char) value << (2 + consumedBits);
                     processedBits = 6 - consumedBits;
                 }
             }
@@ -348,7 +348,7 @@ void remove_file(const char* path, const char* filename, char* uuid) {
             const int pid = fork();
             if (pid == 0) {
                 Log("Hello from fork!");
-                char* command = buildCommand("source \"%s\"; on_remove;", escapedPath);
+                char* command = asprintf_hd("source \"%s\"; on_remove;", escapedPath);
                 Log("Executing command: %s", command);
                 free(escapedPath);
                 execl("/var/local/mkk/su", command, NULL);
@@ -367,7 +367,7 @@ void remove_file(const char* path, const char* filename, char* uuid) {
     if (access(sdrPath, R_OK|W_OK) == F_OK)
     {
         Log("SDR exists - deleting");
-        recursiveDelete(sdrPath);
+        rmdir_r(sdrPath);
     }
 
     free(sdrPath);

launcher/main.c

@@ -34,7 +34,7 @@ bool shouldExit = false;
 LIPCcode stub(LIPC *lipc, const char *property, void *value, void*) {
     Log("Stub called for \"%s\" with value \"%s\"", property,
            (char *)value);
-    char* mutValue = strdup(value);
+    char* mutValue = strdup((char*) value);
     char *id = strtok((char *)mutValue, ":");
     char *response = asprintf_hd("%s:0:", id);
     Log("Replying with %s", response);
@@ -69,7 +69,7 @@ LIPCcode unload_callback(LIPC* lipc, const char* property, void* value, void* da
     return result;
 }
 
-char* getScriptCommand(char* scriptPath)
+char* getScriptCommand(const char* scriptPath)
 {
     Log("Loading script file");
     FILE* file = fopen(scriptPath, "r");
@@ -94,18 +94,18 @@ char* getScriptCommand(char* scriptPath)
     escapedPath[escapedPathLength] = '\0';
 
     Log("Building command");
-    char* command = buildCommand("sh -l \"%s\"", escapedPath);
+    char* command = asprintf_hd("sh -l \"%s\"", escapedPath);
 
     if (header.useHooks) { // useHooks script - source it and use `on_run`
         Log("Script uses hooks!");
         free(command);
-        command = buildCommand("sh -l -c \"source \\\"%s\\\"; on_run;\"", escapedPath);
+        command = asprintf_hd("sh -l -c \"source \\\"%s\\\"; on_run;\"", escapedPath);
     }
     if (header.useFBInk) {
         Log("Script uses FBInk!");
         char* old_command = strdup(command);
         free(command);
-        command = buildCommand("/mnt/us/libkh/bin/fbink -k; %s 2>&1 | /mnt/us/libkh/bin/fbink -y 5 -r", old_command);
+        command = asprintf_hd("/mnt/us/libkh/bin/fbink -k; %s 2>&1 | /mnt/us/libkh/bin/fbink -y 5 -r", old_command);
         free(old_command);
     }
 
@@ -117,7 +117,7 @@ char* getScriptCommand(char* scriptPath)
 
 LIPCcode go_callback(LIPC* lipc, const char* property, void* value, void* data) {
     Log("go_callback");
-    char* rawFilePath = strchr((const char*)value, ':') + 6 + strlen(SERVICE_NAME) + 1;
+    char* rawFilePath = strchr((char*)value, ':') + 6 + strlen(SERVICE_NAME) + 1;
     char* query = strchr(rawFilePath, '?');
     if (query != NULL) {
         query[0] = 0;

meson.build

@@ -1,4 +1,4 @@
-project('sh_integration', 'c', version : '4.0.0', default_options: ['warning_level=everything'])
+project('sh_integration', 'c', version : '4.0.0', default_options: ['warning_level=everything', 'c_std=gnu23'])
 
 arch = meson.get_external_property('arch', 'armhf')
 if arch == 'armhf'

tests/launcher.h

@@ -9,6 +9,6 @@
 
 LIPCcode stub(LIPC* lipc, const char* property, void* value, void* data);
 LIPCcode pause_callback(LIPC* lipc, const char* property, void* value, void* data);
-char* getScriptCommand(char* scriptPath);
+char* getScriptCommand(const char* scriptPath);
 LIPCcode go_callback(LIPC* lipc, const char* property, void* value, void* data);
 LIPCcode unload_callback(LIPC* lipc, const char* property, void* value, void* data);

tests/utils_test.c

@@ -28,7 +28,7 @@ int main()
     assert(testURLDecode("Testing", "Testing"));
 
 
-    char* command = buildCommand("test %s testing", "hello");
+    char* command = asprintf_hd("test %s testing", "hello");
     assert(strcmp(command, "test hello testing") == 0);
 
     FILE* file = fopen("./tests/test.sh", "r+");

utils/utils.c

@@ -4,6 +4,10 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
+#define __USE_XOPEN_EXTENDED   /* See feature_test_macros(7) */
+#include <ftw.h>
 
 /**
  * @brief vasprintf implementation
@@ -16,8 +20,8 @@ char* vasprintf_hd(const char * format, va_list args)
 {
     va_list args2;
     va_copy (args2, args);
-    int size = vsnprintf(NULL, 0, format, args) + 1;
-    char* str = malloc(size);
+    size_t size = vsnprintf(NULL, 0, format, args) + 1;
+    char* str = (char*) malloc(size);
     vsnprintf(str, size, format, args2);
     va_end(args2);
     return str;
@@ -38,7 +42,7 @@ char* asprintf_hd(const char * format, ...)
     va_end(args);
 }
 
-int hexDecode(char c)
+int hexDecode(const char c)
 {
     if (c >= '0' && c <= '9')
     {
@@ -84,32 +88,32 @@ void strip(char** string)
     *string = finalString;
 }
 
-char* buildCommand(const char* command, const char* sub)
+int internal_delete(const char* fpath, const struct stat*, int typeflag, struct FTW*)
 {
-    char* builtCommand = asprintf_hd(command, sub);
-    return builtCommand;
+    switch (typeflag)
+    {
+        case FTW_F:
+            remove(fpath);
+            break;
+        case FTW_D:
+        case FTW_DP:
+            rmdir(fpath);
+            break;
+        default:
+            break;
+    }
+    return 0;
 }
 
-void recursiveDelete(char* path)
+/**
+ * @brief Deletes a folder recursively, equivalent to "rm -rf"
+ * 
+ * @param path 
+ */
+void rmdir_r(char* path)
 {
-    DIR* dir = opendir(path);
-    struct dirent* item;
-    while ((item = readdir(dir)) != NULL)
-    {
-        if (strcmp(item->d_name, ".") == 0 || strcmp(item->d_name, "..") == 0)
-        {
-            continue;
-        }
-        char* itemPath = asprintf_hd("%s/%s", path, item->d_name);
-        if (item->d_type == DT_DIR)
-        {
-            recursiveDelete(itemPath);
-        }
-        remove(itemPath);
-        free(itemPath);
-    }
-    remove(path);
-    closedir(dir);
+    nftw(path, &internal_delete, 256, FTW_DEPTH);
+    rmdir(path);
 }
 
 void freeScriptHeader(struct ScriptHeader* header)

utils/utils.h

@@ -12,9 +12,7 @@ int hexDecode(char c);
 char* urlDecode(char* raw);
 void strip(char** string);
 
-void recursiveDelete(char* path);
-
-char* buildCommand(const char* command, const char* sub);
+void rmdir_r(char* path);
 
 struct ScriptHeader
 {