Allows using wallpaper files without extensions

src/helpers/System.cpp

@@ -0,0 +1,18 @@
+#include "System.hpp"
+#include "../defines.hpp"
+#include <array>
+
+// Execute a shell command and get the output
+std::string execAndGet(const char* cmd) {
+    std::array<char, 128>   buffer;
+    std::string             result;
+    const std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd, "r"), pclose);
+    if (!pipe) {
+        Debug::log(ERR, "execAndGet: failed in pipe");
+        return "";
+    }
+    while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr) {
+        result += buffer.data();
+    }
+    return result;
+}

src/helpers/System.hpp

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "../includes.hpp"
+
+std::string execAndGet(const char*);

src/render/WallpaperTarget.cpp

@@ -10,22 +10,22 @@ void CWallpaperTarget::create(const std::string& path) {
     const auto BEGINLOAD = std::chrono::system_clock::now();
 
     cairo_surface_t* CAIROSURFACE = nullptr;
-    const auto len = path.length()+36;
-    char cmd[len];
-    sprintf(cmd, "file -b --mime-type %s", path.c_str());
-    FILE *file = popen(cmd, "r");
-    char file_type[16];
-    fread(file_type, 1, 15, file);
-    file_type[15]='\0';
-    pclose(file);
-    Debug::log(LOG, "File: %s", file_type);
-    if (strncmp(file_type, "image/png", 9) == 0) { // file_type may have new line and EOF at the end
+    const std::string cmd = "file -b --mime-type " + path;
+    std::string file_type(execAndGet(cmd.c_str()));
+    if (file_type.contains("image/png")) { //Do not change to == as string has newline at the end
         CAIROSURFACE = cairo_image_surface_create_from_png(path.c_str());
-    } else if (strncmp(file_type, "image/jpeg", 10) == 0) {
+    } else if (file_type.contains("image/jpeg")) { 
         CAIROSURFACE = JPEG::createSurfaceFromJPEG(path);
         m_bHasAlpha = false;
-    } else {
+    }
+    else if (file_type == "")
+    {
+        Debug::log(CRIT, "file command didn't return anything, are you sure file is isntalled?");
+        exit(1);
+    }
+    else {
         Debug::log(CRIT, "unrecognized image %s", path.c_str());
+        Debug::log(LOG, "Returned file type is: %s", file_type.c_str());
         exit(1);
     }
 

src/render/WallpaperTarget.hpp

@@ -2,8 +2,7 @@
 
 #include "../defines.hpp"
 #include "../helpers/Jpeg.hpp"
-#include <stdio.h>
-#include <string.h>
+#include "../helpers/System.hpp"
 
 class CWallpaperTarget {
 public: