diff options
Diffstat (limited to 'src/Common/libzip/zip_source_remove.c')
| -rw-r--r-- | src/Common/libzip/zip_source_remove.c | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/Common/libzip/zip_source_remove.c b/src/Common/libzip/zip_source_remove.c index 470a5eda..c1d73ab9 100644 --- a/src/Common/libzip/zip_source_remove.c +++ b/src/Common/libzip/zip_source_remove.c @@ -1,10 +1,10 @@ /* zip_source_remove.c -- remove empty archive - Copyright (C) 2014 Dieter Baron and Thomas Klausner - + Copyright (C) 2014-2021 Dieter Baron and Thomas Klausner + This file is part of libzip, a library to manipulate ZIP archives. - The authors can be contacted at <libzip@nih.at> - + The authors can be contacted at <info@libzip.org> + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -17,7 +17,7 @@ 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -36,26 +36,30 @@ int -zip_source_remove(zip_source_t *src) -{ +zip_source_remove(zip_source_t *src) { + if (ZIP_SOURCE_IS_LAYERED(src)) { + zip_error_set(&src->error, ZIP_ER_OPNOTSUPP, 0); + return -1; + } + if (src->write_state == ZIP_SOURCE_WRITE_REMOVED) { return 0; } - + if (ZIP_SOURCE_IS_OPEN_READING(src)) { - if (zip_source_close(src) < 0) { - return -1; - } + if (zip_source_close(src) < 0) { + return -1; + } } if (src->write_state != ZIP_SOURCE_WRITE_CLOSED) { zip_source_rollback_write(src); } - + if (_zip_source_call(src, NULL, 0, ZIP_SOURCE_REMOVE) < 0) { return -1; } - + src->write_state = ZIP_SOURCE_WRITE_REMOVED; - + return 0; } |