joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-08 19:32:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move out C++ ZIP stdbuf

Browse Source
This commit is contained in:
Jonathan Campbell 2025-02-06 16:15:02 -08:00
parent a03a4d6f6e
commit 7e62fd4228
2 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
include/zipcppstdbuf.h Normal file
View File

@ -0,0 +1,47 @@
#ifndef ZIPSTREAMBUF
#define ZIPSTREAMBUF
#include "zip.h"
#include "unzip.h"
#include "ioapi.h"
#include <assert.h>
/* std::streambuf for writing to ZIP archive directly.
* ZIP archive writer can only write one file at a time, do not
* use multiple instances of this C++ class at a time! No seeking,
* only sequential output! */
class zip_ostreambuf : public std::streambuf {
public:
using Base = std::streambuf;
public:
zip_ostreambuf(zipFile &n_zf) : basic_streambuf(), zf(n_zf) { }
virtual ~zip_ostreambuf() { }
public:
virtual std::streamsize xsputn(const Base::char_type *s, std::streamsize count) override {
assert(zf != NULL);
const int err = zipWriteInFileInZip(zf, (void*)s, count);
if (err != ZIP_OK) {
zf_err = err;
return 0;
}
return count;
}
public:
int close(void) {
int err;
if ((err=zipCloseFileInZip(zf)) != ZIP_OK) return err;
if (zf_err != ZIP_OK) return zf_err;
return ZIP_OK;
}
private:
zipFile zf = NULL;
int zf_err = ZIP_OK;
};
#endif

36
src/misc/savestates.cpp
View File

@ -34,6 +34,7 @@
#include "vs/zlib/contrib/minizip/zip.c"
#include "vs/zlib/contrib/minizip/unzip.c"
#include "vs/zlib/contrib/minizip/ioapi.c"
#include "zipcppstdbuf.h"
#if !defined(HX_DOS)
#include "../libs/tinyfiledialogs/tinyfiledialogs.h"
#endif
@ -42,41 +43,6 @@
extern SDL_AudioDeviceID SDL2_AudioDevice; /* valid IDs are 2 or higher, 1 for compat, 0 is never a valid ID */
#endif
/* std::streambuf for writing to ZIP archive directly.
* ZIP archive writer can only write one file at a time, do not
* use multiple instances of this C++ class at a time! No seeking,
* only sequential output! */
class zip_ostreambuf : public std::streambuf {
public:
using Base = std::streambuf;
public:
zip_ostreambuf(zipFile &n_zf) : basic_streambuf(), zf(n_zf) { }
virtual ~zip_ostreambuf() { }
public:
virtual std::streamsize xsputn(const Base::char_type *s, std::streamsize count) override {
assert(zf != NULL);
const int err = zipWriteInFileInZip(zf, (void*)s, count);
if (err != ZIP_OK) {
zf_err = err;
return 0;
}
return count;
}
public:
int close(void) {
int err;
if ((err=zipCloseFileInZip(zf)) != ZIP_OK) return err;
if (zf_err != ZIP_OK) return zf_err;
return ZIP_OK;
}
private:
zipFile zf = NULL;
int zf_err = ZIP_OK;
};
extern unsigned int page;
extern int autosave_last[10], autosave_count;
extern std::string autosave_name[10], savefilename;