66
77\*******************************************************************/
88
9+ #include < cstring>
910#include < cassert>
1011#include < sstream>
1112
1213#include " jar_file.h"
1314
14- #ifdef HAVE_LIBZIP
15- #include < zip.h>
16- #endif
17-
1815/* ******************************************************************\
1916
2017Function: jar_filet::open
@@ -29,33 +26,32 @@ Function: jar_filet::open
2926
3027void jar_filet::open (const std::string &filename)
3128{
32- #ifdef HAVE_LIBZIP
33- if (zip!=nullptr )
34- // NOLINTNEXTLINE(readability/identifiers)
35- zip_close (static_cast <struct zip *>(zip));
36-
37- int zip_error;
38- zip=zip_open (filename.c_str (), 0 , &zip_error);
29+ if (!mz_ok)
30+ {
31+ memset (&zip, 0 , sizeof (zip));
32+ mz_bool mz_open=mz_zip_reader_init_file (&zip, filename.c_str (), 0 );
33+ mz_ok=mz_open==MZ_TRUE;
34+ }
3935
40- if (zip!= nullptr )
36+ if (mz_ok )
4137 {
4238 std::size_t number_of_files=
43- // NOLINTNEXTLINE(readability/identifiers)
44- zip_get_num_entries (static_cast <struct zip *>(zip), 0 );
39+ mz_zip_reader_get_num_files (&zip);
4540
4641 index .reserve (number_of_files);
4742
4843 for (std::size_t i=0 ; i<number_of_files; i++)
4944 {
50- std::string file_name=
51- // NOLINTNEXTLINE(readability/identifiers)
52- zip_get_name (static_cast <struct zip *>(zip), i, 0 );
45+ mz_uint filename_length=mz_zip_reader_get_filename (&zip, i, nullptr , 0 );
46+ char *filename_char=new char [filename_length+1 ];
47+ mz_uint filename_len=
48+ mz_zip_reader_get_filename (&zip, i, filename_char, filename_length);
49+ assert (filename_length==filename_len);
50+ std::string file_name (filename_char);
51+ delete[] filename_char;
5352 index .push_back (file_name);
5453 }
5554 }
56- #else
57- zip=nullptr ;
58- #endif
5955}
6056
6157/* ******************************************************************\
@@ -72,11 +68,11 @@ Function: jar_filet::~jar_filet
7268
7369jar_filet::~jar_filet ()
7470{
75- # ifdef HAVE_LIBZIP
76- if (zip!= nullptr )
77- // NOLINTNEXTLINE(readability/identifiers)
78- zip_close ( static_cast < struct zip *>(zip)) ;
79- # endif
71+ if (mz_ok)
72+ {
73+ mz_zip_reader_end (&zip);
74+ mz_ok= false ;
75+ }
8076}
8177
8278/* ******************************************************************\
@@ -91,47 +87,29 @@ Function: jar_filet::get_entry
9187
9288\*******************************************************************/
9389
94- #define ZIP_READ_SIZE 10000
95-
9690std::string jar_filet::get_entry (std::size_t i)
9791{
98- if (zip== nullptr )
92+ if (!mz_ok )
9993 return std::string (" "
10094
10195 assert (i<index .size ());
10296
10397 std::string dest;
10498
105- #ifdef HAVE_LIBZIP
106- void *zip_e=zip; // zip is both a type and a non-type
107- // NOLINTNEXTLINE(readability/identifiers)
108- struct zip *zip_p=static_cast <struct zip *>(zip_e);
109-
110- // NOLINTNEXTLINE(readability/identifiers)
111- struct zip_file *zip_file=zip_fopen_index (zip_p, i, 0 );
112-
113- if (zip_file==NULL )
114- {
115- zip_close (zip_p);
116- zip=nullptr ;
117- return std::string (" " // error
118- }
119-
99+ mz_zip_archive_file_stat file_stat;
100+ memset (&file_stat, 0 , sizeof (file_stat));
101+ mz_bool stat_ok=mz_zip_reader_file_stat (&zip, i, &file_stat);
102+ if (stat_ok!=MZ_TRUE)
103+ return std::string ();
120104 std::vector<char > buffer;
121- buffer.resize (ZIP_READ_SIZE);
122-
123- while (true )
124- {
125- int bytes_read=
126- zip_fread (zip_file, buffer.data (), ZIP_READ_SIZE);
127- assert (bytes_read<=ZIP_READ_SIZE);
128- if (bytes_read<=0 )
129- break ;
130- dest.insert (dest.end (), buffer.begin (), buffer.begin ()+bytes_read);
131- }
132-
133- zip_fclose (zip_file);
134- #endif
105+ size_t bufsize=file_stat.m_uncomp_size ;
106+ buffer.resize (bufsize);
107+ mz_bool read_ok=
108+ mz_zip_reader_extract_to_mem (&zip, i, buffer.data (), bufsize, 0 );
109+ if (read_ok!=MZ_TRUE)
110+ return std::string ();
111+
112+ dest.insert (dest.end (), buffer.begin (), buffer.end ());
135113
136114 return dest;
137115}
0 commit comments