summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/file_sys/vfs_libzip.cpp88
-rw-r--r--src/core/file_sys/vfs_libzip.h13
3 files changed, 0 insertions, 103 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 7140d0db8..4c01703ca 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -106,8 +106,6 @@ add_library(core STATIC
106 file_sys/vfs_concat.h 106 file_sys/vfs_concat.h
107 file_sys/vfs_layered.cpp 107 file_sys/vfs_layered.cpp
108 file_sys/vfs_layered.h 108 file_sys/vfs_layered.h
109 file_sys/vfs_libzip.cpp
110 file_sys/vfs_libzip.h
111 file_sys/vfs_offset.cpp 109 file_sys/vfs_offset.cpp
112 file_sys/vfs_offset.h 110 file_sys/vfs_offset.h
113 file_sys/vfs_real.cpp 111 file_sys/vfs_real.cpp
diff --git a/src/core/file_sys/vfs_libzip.cpp b/src/core/file_sys/vfs_libzip.cpp
deleted file mode 100644
index 00e256779..000000000
--- a/src/core/file_sys/vfs_libzip.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
1// Copyright 2019 yuzu emulator team
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include <string>
6
7#ifdef __GNUC__
8#pragma GCC diagnostic push
9#pragma GCC diagnostic ignored "-Wshadow"
10#endif
11#include <zip.h>
12#ifdef __GNUC__
13#pragma GCC diagnostic pop
14#endif
15
16#include "common/fs/path_util.h"
17#include "core/file_sys/vfs.h"
18#include "core/file_sys/vfs_libzip.h"
19#include "core/file_sys/vfs_vector.h"
20
21namespace FileSys {
22
23VirtualDir ExtractZIP(VirtualFile file) {
24 zip_error_t error{};
25
26 const auto data = file->ReadAllBytes();
27 std::unique_ptr<zip_source_t, decltype(&zip_source_close)> src{
28 zip_source_buffer_create(data.data(), data.size(), 0, &error), zip_source_close};
29 if (src == nullptr)
30 return nullptr;
31
32 std::unique_ptr<zip_t, decltype(&zip_close)> zip{zip_open_from_source(src.get(), 0, &error),
33 zip_close};
34 if (zip == nullptr)
35 return nullptr;
36
37 std::shared_ptr<VectorVfsDirectory> out = std::make_shared<VectorVfsDirectory>();
38
39 const auto num_entries = static_cast<std::size_t>(zip_get_num_entries(zip.get(), 0));
40
41 zip_stat_t stat{};
42 zip_stat_init(&stat);
43
44 for (std::size_t i = 0; i < num_entries; ++i) {
45 const auto stat_res = zip_stat_index(zip.get(), i, 0, &stat);
46 if (stat_res == -1)
47 return nullptr;
48
49 const std::string name(stat.name);
50 if (name.empty())
51 continue;
52
53 if (name.back() != '/') {
54 std::unique_ptr<zip_file_t, decltype(&zip_fclose)> file2{
55 zip_fopen_index(zip.get(), i, 0), zip_fclose};
56
57 std::vector<u8> buf(stat.size);
58 if (zip_fread(file2.get(), buf.data(), buf.size()) != s64(buf.size()))
59 return nullptr;
60
61 const auto parts = Common::FS::SplitPathComponents(stat.name);
62 const auto new_file = std::make_shared<VectorVfsFile>(buf, parts.back());
63
64 std::shared_ptr<VectorVfsDirectory> dtrv = out;
65 for (std::size_t j = 0; j < parts.size() - 1; ++j) {
66 if (dtrv == nullptr)
67 return nullptr;
68 const auto subdir = dtrv->GetSubdirectory(parts[j]);
69 if (subdir == nullptr) {
70 const auto temp = std::make_shared<VectorVfsDirectory>(
71 std::vector<VirtualFile>{}, std::vector<VirtualDir>{}, parts[j]);
72 dtrv->AddDirectory(temp);
73 dtrv = temp;
74 } else {
75 dtrv = std::dynamic_pointer_cast<VectorVfsDirectory>(subdir);
76 }
77 }
78
79 if (dtrv == nullptr)
80 return nullptr;
81 dtrv->AddFile(new_file);
82 }
83 }
84
85 return out;
86}
87
88} // namespace FileSys
diff --git a/src/core/file_sys/vfs_libzip.h b/src/core/file_sys/vfs_libzip.h
deleted file mode 100644
index f68af576a..000000000
--- a/src/core/file_sys/vfs_libzip.h
+++ /dev/null
@@ -1,13 +0,0 @@
1// Copyright 2019 yuzu emulator team
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include "core/file_sys/vfs_types.h"
8
9namespace FileSys {
10
11VirtualDir ExtractZIP(VirtualFile zip);
12
13} // namespace FileSys