Skip to content

Commit

Permalink
Add support for sources to supply last modification time in DOS format.
Browse files Browse the repository at this point in the history
  • Loading branch information
dillof committed Apr 19, 2024
1 parent 802fef0 commit e49c545
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ add_library(zip
zip_source_file_stdio.c
zip_source_free.c
zip_source_function.c
zip_source_get_dostime.c
zip_source_get_file_attributes.c
zip_source_is_deleted.c
zip_source_layered.c
Expand Down
3 changes: 2 additions & 1 deletion lib/zip.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,8 @@ enum zip_source_cmd {
ZIP_SOURCE_BEGIN_WRITE_CLONING, /* like ZIP_SOURCE_BEGIN_WRITE, but keep part of original file */
ZIP_SOURCE_ACCEPT_EMPTY, /* whether empty files are valid archives */
ZIP_SOURCE_GET_FILE_ATTRIBUTES, /* get additional file attributes */
ZIP_SOURCE_SUPPORTS_REOPEN /* allow reading from changed entry */
ZIP_SOURCE_SUPPORTS_REOPEN, /* allow reading from changed entry */
ZIP_SOURCE_GET_DOS_TIME /* get last modification time in DOS format */
};
typedef enum zip_source_cmd zip_source_cmd_t;

Expand Down
78 changes: 78 additions & 0 deletions lib/zip_source_get_dostime.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
zip_source_stat.c -- get meta information from zip_source
Copyright (C) 2009-2021 Dieter Baron and Thomas Klausner
This file is part of libzip, a library to manipulate ZIP archives.
The authors can be contacted at <[email protected]>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
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
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/


#include "zipint.h"


ZIP_EXTERN int
zip_source_get_dos_time(zip_source_t *src, zip_uint16_t *dos_time, zip_uint16_t *dos_date) {
if (src->source_closed) {
return -1;
}
if (dos_time == NULL || dos_date == NULL) {
zip_error_set(&src->error, ZIP_ER_INVAL, 0);
return -1;
}

if (src->write_state == ZIP_SOURCE_WRITE_REMOVED) {
zip_error_set(&src->error, ZIP_ER_READ, ENOENT);
}

if (zip_source_supports(src) & ZIP_SOURCE_MAKE_COMMAND_BITMASK(ZIP_SOURCE_GET_DOS_TIME)) {
zip_uint16_t data[2];
if (_zip_source_call(src, data, sizeof(data), ZIP_SOURCE_GET_DOS_TIME) < 0) {
return -1;
}
*dos_time = data[0];
*dos_date = data[1];
return 0;
}
else {
zip_stat_t st;
zip_stat_init(&st);

if (zip_source_stat(src, &st) < 0) {
return -1;
}

if (!(st.valid & ZIP_STAT_MTIME)) {
*dos_time = 0;
*dos_date = 0;
return 0;
}
else {
return _zip_u2d_time(st.mtime, dos_time, dos_date, &src->error);
}
}
}
2 changes: 2 additions & 0 deletions lib/zipint.h
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,8 @@ void _zip_set_open_error(int *zep, const zip_error_t *err, int ze);
bool zip_source_accept_empty(zip_source_t *src);
zip_int64_t _zip_source_call(zip_source_t *src, void *data, zip_uint64_t length, zip_source_cmd_t command);
bool _zip_source_eof(zip_source_t *);
int zip_source_get_dos_time(zip_source_t *src, zip_uint16_t *dos_time, zip_uint16_t *dos_date);

zip_source_t *_zip_source_file_or_p(const char *, FILE *, zip_uint64_t, zip_int64_t, const zip_stat_t *, zip_error_t *error);
bool _zip_source_had_error(zip_source_t *);
void _zip_source_invalidate(zip_source_t *src);
Expand Down

0 comments on commit e49c545

Please sign in to comment.