Minor fixes

makefile

@@ -34,7 +34,7 @@ DBGFLAGS = -g -fsanitize=address
 
 # set local lib to lib/*/*.a
 LOCAL_LIBS = $(wildcard lib/*/*.a)
-LIBS = ${LOCAL_LIBS} -lcurl -lsqlite3 -lm -lcrypto
+LIBS = ${LOCAL_LIBS} -lcurl -lm -lcrypto
 
 # change these to proper directories where each file should be
 SRCDIR   = src

src/clean.c

@@ -21,7 +21,7 @@
 
     int result = 0;
 
     char** cleanup_loc;
     msg(WARNING, "This will delete: %s", cleanups);
     int count = splita(cleanups, ':', &cleanup_loc);
 
@@ -30,7 +30,7 @@
       struct stat st;
       if (lstat(cleanup_loc[i], &st) != 0)
       {
-        msg(ERROR,"Error getting file info\n");
+        dbg(2, "Error getting file info");
       }
       else
       {

src/download.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <curl/curl.h>
 
 // Include necessary headers
 
@@ -17,6 +17,7 @@
     if(curl)
     {
         CURLcode res;
+        curl_easy_setopt(curl, CURLOPT_USERAGENT, "CCCP/1.0 (https://www.sovietlinux.org/)");
         curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
         curl_easy_setopt(curl, CURLOPT_URL, url);
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, NULL);

src/install.c

@@ -1,4 +1,4 @@
 #define _GNU_SOURCE
 
 #include <stdio.h>
 #include <sys/stat.h>
@@ -40,7 +40,7 @@
   - 0: Package installed successfully.
   - -1: Installation failed.
 */
 int f_install_package_source(const char* spm_path, int as_dep, char* repo) {
     // Check if spm_path is NULL
 
     if (spm_path == NULL) {
@@ -82,25 +82,25 @@
     {
         dbg(1, "Getting environment variables...");
         char* env_path = calloc(MAX_PATH, 1);
         sprintf(env_path, "%s/%s", getenv("SOVIET_ENV_DIR"), pkg.environment);
 
         readConfig(env_path, 1);
     }
 
     // Set global environment variables
 
     if (pkg.exports != NULL && pkg.exportsCount > 0 && strlen(pkg.exports[0]) > 0) 
     {
         dbg(1, "Setting environment variables...");
         char* env_path = calloc(MAX_PATH, 1);
         sprintf(env_path, "%s/%s", getenv("SOVIET_ENV_DIR"), pkg.name);
 
         FILE *env_file;
         env_file = fopen(env_path, "w"); 
 
         for (int i = 0; i < pkg.exportsCount; i++)
         {
-            fprintf(env_file, "%s \n", pkg.exports[i]);
+            fprintf(env_file, "%s\n", pkg.exports[i]);
 
             if((pkg.exports[i][0] != '#' || (pkg.exports[i][0] != '/' && pkg.exports[i][1] != '/')) && strstr(pkg.exports[i], "=") != 0)
             {
@@ -115,7 +115,7 @@
                 dbg(2, "Key: %s Value: %s", key, value);
 
                 // Set environment variables based on the key-value pairs in the config file
                 setenv(key, value, 1);
             }
         }
 
@@ -160,7 +160,7 @@
 
 
     // Check if a package is a collection
     if(strcmp(pkg.type, "con") != 0)
     {
         // Legacy directory path for compatibility
         char legacy_dir[MAX_PATH];
@@ -483,9 +483,7 @@
         free(pkg->optional);
     }
     if (pkg->files) {
-        for (int i = 0; i < pkg->filesCount; i++) {
-            if (pkg->files[i] != NULL) free(pkg->files[i]);
-        }
+        if (*pkg->files) free(*pkg->files);
         free(pkg->files);
     }
     return 0;

src/list.c

@@ -131,7 +131,7 @@ char ** search(char *term, int *num_results) {
 
     if (files_array != NULL) {
         // Print each file path
-        for (int i = 0; i < num_files-1; i++) 
+        for (int i = 0; i < num_files; i++) 
         {
 
             // This will break if the files are not separated into repos

src/make.c

@@ -107,9 +107,9 @@ int make(char* package_dir, struct package* pkg) {
 
             SHA256((unsigned char*) buffer, size, hash);
 
-            if (hash[0] == 0) {
-                msg(FATAL, "Could not verify the file's hash");
-                return -1;
+            if (hash == NULL) {
+                    msg(FATAL, "Could not verify the file's hash");
+                    return -1;
             }
 
             dbg(1, "Hash is %s", file_sha256);

src/uninstall.c

@@ -65,7 +65,7 @@ int uninstall(char* name)
 
                 //dbg(3, "Removing %s", loc_path);                
                 if (rmany(loc_path) != 0) {
-                    msg(FATAL,"Failed to remove %s",loc_path);
+                    msg(ERROR,"Failed to remove %s",loc_path);
                     perror("remove");
                 }
             }