/*
- Copyright 2015, 2016 IoT.bzh
+ Copyright (C) 2015-2018 IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
struct zip_stat zstat;
char buffer[32768];
ssize_t sizr, sizw;
- size_t esize;
+ zip_uint64_t esize;
/* open the zip file */
zip = zip_open(zipfile, ZIP_CHECKCONS, &err);
/* extract */
uz64 = zstat.size;
while (uz64) {
- sizr = zip_fread(zfile, buffer, sizeof buffer);
+ sizr = (ssize_t)zip_fread(zfile, buffer, sizeof buffer);
if (sizr < 0) {
ERROR("error while reading %s in %s", zstat.name, zipfile);
goto errorzf;
zip_int64_t z64;
struct zip_source *zsrc;
FILE *fp;
+ struct stat st;
fd = openat(workdirfd, offset ? zws->name : ".", O_DIRECTORY|O_RDONLY);
if (fd < 0) {
ERROR("invalid name %s", zws->name);
goto error;
}
+ if (ent->d_type == DT_UNKNOWN) {
+ fstatat(fd, ent->d_name, &st, 0);
+ if (S_ISREG(st.st_mode))
+ ent->d_type = DT_REG;
+ else if (S_ISDIR(st.st_mode))
+ ent->d_type = DT_DIR;
+ }
switch (ent->d_type) {
case DT_DIR:
z64 = zip_dir_add(zws->zip, zws->name, ZIP_FL_ENC_UTF_8);