LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #282 from jkanefendt/libzip-compat 

Use zip_error_strerror and zip_discard if available
pull/275/head
Extra Fu 2020-06-23 12:24:12 -04:00 committed by GitHub
parent 3d3b17adb8 5da8f1872b
commit b3dd794515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SoObjects/SOGo/SOGoZipArchiver.m
View File

@ -56,7 +56,14 @@
int errorp;
self->z = zip_open([file cString], ZIP_CREATE | ZIP_EXCL, &errorp);
if (self->z == NULL) {
NSLog(@"Failed to open zip output file %@: %@", file, zip_strerror(self->z));
#if defined(LIBZIP_VERSION_MAJOR) && LIBZIP_VERSION_MAJOR >= 1
zip_error_t ziperror;
zip_error_init_with_code(&ziperror, errorp);
NSLog(@"Failed to open zip output file %@: %@", file,
[NSString stringWithCString: zip_error_strerror(&ziperror)]);
#else
NSLog(@"Failed to open zip output file %@", file);
#endif
} else {
ret = self;
}
@ -100,6 +107,9 @@
if (self->z != NULL) {
if (zip_close(self->z) != 0) {
NSLog(@"Failed to close zip archive: %@", [NSString stringWithCString: zip_strerror(self->z)]);
#if defined(LIBZIP_VERSION_MAJOR) && (LIBZIP_VERSION_MAJOR >= 1 || LIBZIP_VERSION_MINOR >= 11)
zip_discard(self->z);
#endif
success = NO;
}
self->z = NULL;