Continue rewrite

source/fs.c

@@ -79,20 +79,21 @@ int get_number_entries(char *path)
     return count;
 }
 
-Result file_to_buf(FS_Path path, char* buf)
+u32 file_to_buf(FS_Path path, FS_Archive archive, char* buf)
 {
     Handle file;
-    Result res = FSUSER_OpenFile(&file, ArchiveSD, path, FS_OPEN_READ, 0);
-    if (R_FAILED(res)) return res;
+    Result res = FSUSER_OpenFile(&file, archive, path, FS_OPEN_READ, 0);
+    if (R_FAILED(res)) return 0;
 
     u32 size;
     FSFILE_GetSize(file, &size);
     buf = malloc(size);
-    res = FSFILE_Read(file, NULL, 0, buf, size);
-    return res;
+    FSFILE_Read(file, NULL, 0, buf, size);
+    FSFILE_Close(file);
+    return size;
 }
 
-int zip_file_to_buf(char *file_name, u16 *zip_path, char *buf)
+u32 zip_file_to_buf(char *file_name, u16 *zip_path, char *buf)
 {
     ssize_t len = strulen(zip_path, 0x106);
 
@@ -101,20 +102,36 @@ int zip_file_to_buf(char *file_name, u16 *zip_path, char *buf)
 
     unzFile zip_handle = unzOpen((char*)path);
 
-    if (zip_handle == NULL) return 1;
+    if (zip_handle == NULL) return 0;
+    u32 file_size = 0;
 
     if (unzLocateFile(zip_handle, file_name, 0) == UNZ_OK)
     {
         unz_file_info *file_info = malloc(sizeof(unz_file_info));
-        ssize_t file_size = file_info->uncompressed_size;
+        file_size = file_info->uncompressed_size;
         free(file_info);
         buf = malloc(file_size);
         unzOpenCurrentFile(zip_handle);
         unzReadCurrentFile(zip_handle, buf, file_size);
         unzCloseCurrentFile(zip_handle);
-        unzClose(zip_handle);
     }
+    unzClose(zip_handle);
 
     free(path);
-    return 0;
+    return file_size;
+}
+
+u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf)
+{
+    Handle handle;
+    u32 bytes = 0;
+    FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_WRITE | FS_OPEN_CREATE, 0);
+    FSFILE_Write(handle, &bytes, 0, buf, size, FS_WRITE_FLUSH);
+    FSFILE_Close(handle);
+    return bytes;
+}
+
+bool check_file_exists(char *path, FS_Archive archive)
+{
+    return (R_SUMMARY(FSUSER_OpenFile(NULL, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_READ, 0)) == RS_NOTFOUND);
 }