Close #21

TheAlexDev23 · May 16, 2023 · 4d4106b · 4d4106b
1 parent 8c2ffec
commit 4d4106b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/lib/libjapml/json.c b/lib/libjapml/json.c
@@ -43,8 +43,8 @@ japml_list_t* japml_json_to_pkg_file(json_object *obj)
         json_object* url_obj = json_object_object_get(item, "url");
         json_object* file_loc_obj = json_object_object_get(item, "file name");
 
-        pkg_file->url = (char*)json_object_get_string(url_obj);
-        pkg_file->rel_file_loc = (char*)json_object_get_string(file_loc_obj);
+        pkg_file->url = japml_json_obj_to_string(url_obj);
+        pkg_file->rel_file_loc = japml_json_obj_to_string(file_loc_obj);
 
         japml_list_add(&files, pkg_file);
     }

diff --git a/lib/libjapml/package.c b/lib/libjapml/package.c
@@ -179,6 +179,11 @@ int japml_package_add_to_list_no_rep(japml_list_t** list, japml_package_t* packa
 void japml_package_free_f(void* ptr)
 {
     japml_package_file_t* file = (japml_package_file_t*)ptr;
+    if (file == NULL)
+    {
+        return;
+    }
+
     free(file->url);
     free(file->rel_file_loc);
     free(file);

diff --git a/lib/libjapml/parser.c b/lib/libjapml/parser.c
@@ -215,7 +215,7 @@ japml_list_t* japml_get_param_list(int count, int argc, char** argv)
     japml_list_t* list = NULL;
     while (argv[count + 1] != NULL && !japml_input_is_param(argv[count + 1]))
     {
-        char* param = malloc(sizeof(char) * (strlen(argv[count + 1]) + 1));
+        char* param = malloc(strlen(argv[count + 1]) + 1);
         strcpy(param, argv[count + 1]);
         japml_list_add(&list, param);
         count++;

diff --git a/lib/libjapml/system.c b/lib/libjapml/system.c
@@ -11,14 +11,17 @@
 
 int japml_run_single_instruction(char* instruction, char* dir)
 {
-    char* cmd = japml_str_replace(instruction, JAPML_PACKAGE_DIR_VAR, dir);
+    char* cmd1 = japml_str_replace(instruction, JAPML_PACKAGE_DIR_VAR "/", dir);
+    char* cmd2 = japml_str_replace(cmd1, JAPML_PACKAGE_DIR_VAR, dir);
 
-    char* surpressed_cmd = malloc(strlen(cmd) + strlen(" 1>  2> ") 
+    free(cmd1);
+
+    char* surpressed_cmd = malloc(strlen(cmd2) + strlen(" 1>>  2>> ") 
         + strlen(JAPML_SYSTEM_OUT_STDIO) + strlen(JAPML_SYSTEM_OUT_ERR) + 1);
 
-    sprintf(surpressed_cmd, "%s 1> " JAPML_SYSTEM_OUT_STDIO " 2> " JAPML_SYSTEM_OUT_ERR, cmd);
+    sprintf(surpressed_cmd, "%s 1>> " JAPML_SYSTEM_OUT_STDIO " 2>> " JAPML_SYSTEM_OUT_ERR, cmd2);
 
-    free(cmd);
+    free(cmd2);
 
     if (system(surpressed_cmd) == -1)
     {

diff --git a/src/update.c b/src/update.c
@@ -11,6 +11,8 @@ int update_packages(japml_handle_t* handle, japml_list_t* targets, bool systemwi
 
     if (systemwide)
     {
+        if (targets != NULL ) { japml_list_free(targets); }
+
         // We ignore the passed targets since we are doing a system wide update
         targets = japml_db_local_get_all_packages_name(handle);
     }
@@ -23,17 +25,13 @@ int update_packages(japml_handle_t* handle, japml_list_t* targets, bool systemwi
 
     if (remove_packages(handle, targets, true))
     {
-        japml_list_free_data(targets);
         return -1;
     }
 
     if (install_packages(handle, targets))
     {
-        japml_list_free_data(targets);
         return -1;
     }
 
-    japml_list_free_data(targets);
-
     return 0;
 }