X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fpkg_dest.c;h=341d0a84cc720d229b63fe4e01525d6f4064b70f;hb=758527e6e714fa077445a6f9f12b5e0a295d2af8;hp=f015dd6dbffa3eed687f660de865d73e55f28f65;hpb=4b0b7ca249bfa4ecc099c2ca56527eb91776f198;p=oweals%2Fopkg-lede.git

diff --git a/libopkg/pkg_dest.c b/libopkg/pkg_dest.c
index f015dd6..341d0a8 100644
--- a/libopkg/pkg_dest.c
+++ b/libopkg/pkg_dest.c
@@ -1,4 +1,4 @@
-/* pkg_dest.c - the itsy package management system
+/* pkg_dest.c - the opkg package management system
 
    Carl D. Worth
 
@@ -15,78 +15,69 @@
    General Public License for more details.
 */
 
-#include "opkg.h"
+#include <stdio.h>
 
 #include "pkg_dest.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "sprintf_alloc.h"
+#include "opkg_conf.h"
+#include "opkg_cmd.h"
+#include "opkg_defines.h"
+#include "libbb/libbb.h"
 
-int pkg_dest_init(pkg_dest_t *dest, const char *name, const char *root_dir,const char * lists_dir)
+int pkg_dest_init(pkg_dest_t * dest, const char *name, const char *root_dir,
+		  const char *lists_dir)
 {
-    dest->name = strdup(name);
+	dest->name = xstrdup(name);
 
-    /* Guarantee that dest->root_dir ends with a '/' */
-    if (str_ends_with(root_dir, "/")) {
-	dest->root_dir = strdup(root_dir);
-    } else {
-	sprintf_alloc(&dest->root_dir, "%s/", root_dir);
-    }
-    file_mkdir_hier(dest->root_dir, 0755);
+	/* Guarantee that dest->root_dir ends with a '/' */
+	if (root_dir[strlen(root_dir) - 1] == '/') {
+		dest->root_dir = xstrdup(root_dir);
+	} else {
+		sprintf_alloc(&dest->root_dir, "%s/", root_dir);
+	}
+	file_mkdir_hier(dest->root_dir, 0755);
 
-    sprintf_alloc(&dest->opkg_dir, "%s%s",
-		  dest->root_dir, OPKG_STATE_DIR_PREFIX);
-    file_mkdir_hier(dest->opkg_dir, 0755);
+	sprintf_alloc(&dest->opkg_dir, "%s%s",
+		      dest->root_dir, OPKG_STATE_DIR_PREFIX);
+	file_mkdir_hier(dest->opkg_dir, 0755);
 
-    if (str_starts_with (lists_dir, "/")) 
-        sprintf_alloc(&dest->lists_dir, "%s", lists_dir);
-    else
-        sprintf_alloc(&dest->lists_dir, "/%s", lists_dir);
+	if (lists_dir[0] == '/')
+		sprintf_alloc(&dest->lists_dir, "%s", lists_dir);
+	else
+		sprintf_alloc(&dest->lists_dir, "/%s", lists_dir);
 
-    file_mkdir_hier(dest->lists_dir, 0755);
+	file_mkdir_hier(dest->lists_dir, 0755);
 
-    sprintf_alloc(&dest->info_dir, "%s/%s",
-		  dest->opkg_dir, OPKG_INFO_DIR_SUFFIX);
-    file_mkdir_hier(dest->info_dir, 0755);
+	sprintf_alloc(&dest->info_dir, "%s/%s",
+		      dest->opkg_dir, OPKG_INFO_DIR_SUFFIX);
+	file_mkdir_hier(dest->info_dir, 0755);
 
-    sprintf_alloc(&dest->status_file_name, "%s/%s",
-		  dest->opkg_dir, OPKG_STATUS_FILE_SUFFIX);
+	sprintf_alloc(&dest->status_file_name, "%s/%s",
+		      dest->opkg_dir, OPKG_STATUS_FILE_SUFFIX);
 
-    sprintf_alloc(&dest->status_file_tmp_name, "%s/%s.tmp",
-		  dest->opkg_dir, OPKG_STATUS_FILE_SUFFIX);
-
-    dest->status_file = NULL;
-
-    return 0;
+	return 0;
 }
 
-void pkg_dest_deinit(pkg_dest_t *dest)
+void pkg_dest_deinit(pkg_dest_t * dest)
 {
-    free(dest->name);
-    dest->name = NULL;
-
-    free(dest->root_dir);
-    dest->root_dir = NULL;
-
-    free(dest->opkg_dir);
-    dest->opkg_dir = NULL;
+	free(dest->name);
+	dest->name = NULL;
 
-    free(dest->lists_dir);
-    dest->lists_dir = NULL;
+	free(dest->root_dir);
+	dest->root_dir = NULL;
 
-    free(dest->info_dir);
-    dest->info_dir = NULL;
+	free(dest->opkg_dir);
+	dest->opkg_dir = NULL;
 
-    free(dest->status_file_name);
-    dest->status_file_name = NULL;
+	free(dest->lists_dir);
+	dest->lists_dir = NULL;
 
-    free(dest->status_file_tmp_name);
-    dest->status_file_tmp_name = NULL;
+	free(dest->info_dir);
+	dest->info_dir = NULL;
 
-    if (dest->status_file) {
-	fclose(dest->status_file);
-    }
-    dest->status_file = NULL;
+	free(dest->status_file_name);
+	dest->status_file_name = NULL;
 
-    dest->root_dir = NULL;
+	dest->root_dir = NULL;
 }