Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add wait for start jobs"
[src/app-framework-main.git]
/
src
/
wgtpkg-zip.c
diff --git
a/src/wgtpkg-zip.c
b/src/wgtpkg-zip.c
index
aba0520
..
c1b59e7
100644
(file)
--- a/
src/wgtpkg-zip.c
+++ b/
src/wgtpkg-zip.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright
2015
IoT.bzh
+ Copyright
(C) 2015-2020
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-58,7
+58,7
@@
static int is_valid_filename(const char *filename)
if ((c < 0x1f)
|| ((lastsp = (c == 0x20)) && index == 0)
|| c == 0x7f || c == 0x3c || c == 0x3e
if ((c < 0x1f)
|| ((lastsp = (c == 0x20)) && index == 0)
|| c == 0x7f || c == 0x3c || c == 0x3e
- || c == 0x3a || c == 0x22
+ || c == 0x3a || c == 0x22
|| c == 0x5c || c == 0x7c || c == 0x3f
|| c == 0x2a || c == 0x5e || c == 0x60
|| c == 0x7b || c == 0x7d || c == 0x21)
|| c == 0x5c || c == 0x7c || c == 0x3f
|| c == 0x2a || c == 0x5e || c == 0x60
|| c == 0x7b || c == 0x7d || c == 0x21)
@@
-117,7
+117,7
@@
int zread(const char *zipfile, unsigned long long maxsize)
struct zip_stat zstat;
char buffer[32768];
ssize_t sizr, sizw;
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);
/* open the zip file */
zip = zip_open(zipfile, ZIP_CHECKCONS, &err);
@@
-199,7
+199,7
@@
int zread(const char *zipfile, unsigned long long maxsize)
/* extract */
uz64 = zstat.size;
while (uz64) {
/* 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;
if (sizr < 0) {
ERROR("error while reading %s in %s", zstat.name, zipfile);
goto errorzf;
@@
-243,6
+243,7
@@
static int zwr(struct zws *zws, size_t offset)
zip_int64_t z64;
struct zip_source *zsrc;
FILE *fp;
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) {
fd = openat(workdirfd, offset ? zws->name : ".", O_DIRECTORY|O_RDONLY);
if (fd < 0) {
@@
-262,7
+263,7
@@
static int zwr(struct zws *zws, size_t offset)
ent = readdir(dir);
while (ent != NULL) {
len = strlen(ent->d_name);
ent = readdir(dir);
while (ent != NULL) {
len = strlen(ent->d_name);
- if (ent->d_name[0] == '.' && (len == 1 ||
+ if (ent->d_name[0] == '.' && (len == 1 ||
(ent->d_name[1] == '.' && len == 2)))
;
else if (offset + len >= sizeof(zws->name)) {
(ent->d_name[1] == '.' && len == 2)))
;
else if (offset + len >= sizeof(zws->name)) {
@@
-275,6
+276,13
@@
static int zwr(struct zws *zws, size_t offset)
ERROR("invalid name %s", zws->name);
goto error;
}
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);
switch (ent->d_type) {
case DT_DIR:
z64 = zip_dir_add(zws->zip, zws->name, ZIP_FL_ENC_UTF_8);
@@
-439,6
+447,7
@@
int zwrite(const char *zipfile)
{
const char *args[6];
{
const char *args[6];
+ unlink(zipfile);
args[0] = "zip";
args[1] = "-q";
args[2] = "-r";
args[0] = "zip";
args[1] = "-q";
args[2] = "-r";