Update date in copyrights

[src/app-framework-main.git] / src / wgtpkg-zip.c

diff --git a/src/wgtpkg-zip.c b/src/wgtpkg-zip.c
index 916d0cd..1653233 100644 (file)
--- a/src/wgtpkg-zip.c
+++ b/src/wgtpkg-zip.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2015 IoT.bzh
+ Copyright (C) 2015-2019 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -33,8 +33,8 @@
 #include "wgtpkg-workdir.h"
 #include "wgtpkg-zip.h"
 
-#define MODE_OF_FILE_CREATION 0640
-#define MODE_OF_DIRECTORY_CREATION 0750
+#define MODE_OF_FILE_CREATION 0644
+#define MODE_OF_DIRECTORY_CREATION 0755
 
 #if !defined(USE_LIBZIP)
 #      define USE_LIBZIP 1
@@ -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
-                || 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)
@@ -68,7 +68,7 @@ static int is_valid_filename(const char *filename)
        return !lastsp;
 }
 
-static int create_directory(char *file, int mode)
+static int create_directory(char *file, mode_t mode)
 {
        int rc;
        char *last = strrchr(file, '/');
@@ -91,7 +91,7 @@ static int create_directory(char *file, int mode)
        return rc;
 }
 
-static int create_file(char *file, int fmode, int dmode)
+static int create_file(char *file, int fmode, mode_t dmode)
 {
        int fd = openat(workdirfd, file, O_CREAT|O_WRONLY|O_TRUNC, fmode);
        if (fd < 0 && errno == ENOENT) {
@@ -107,15 +107,17 @@ static int create_file(char *file, int fmode, int dmode)
 int zread(const char *zipfile, unsigned long long maxsize)
 {
        struct filedesc *fdesc;
-       int err, fd, len;
+       int err, fd;
+       size_t len;
        struct zip *zip;
        zip_int64_t z64;
+       zip_uint64_t uz64;
        unsigned int count, index;
        struct zip_file *zfile;
        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);
@@ -150,20 +152,10 @@ int zread(const char *zipfile, unsigned long long maxsize)
                        ERROR("empty entry found in %s", zipfile);
                        goto error;
                }
-               if (zstat.size == 0) {
-                       /* directory name */
-                       if (zstat.name[len - 1] != '/') {
-                               ERROR("bad directory name %s in %s", zstat.name, zipfile);
-                               goto error;
-                       }
+               if (zstat.name[len - 1] == '/')
                        /* record */
                        fdesc = file_add_directory(zstat.name);
-               } else {
-                       /* directory name */
-                       if (zstat.name[len - 1] == '/') {
-                               ERROR("bad file name %s in %s", zstat.name, zipfile);
-                               goto error;
-                       }
+               else {
                        /* get the size */
                        esize += zstat.size;
                        /* record */
@@ -187,7 +179,9 @@ int zread(const char *zipfile, unsigned long long maxsize)
                assert(fdesc != NULL);
                err = zip_stat_index(zip, fdesc->zindex, ZIP_FL_ENC_GUESS, &zstat);
                assert(zstat.name[0] != '/');
-               if (zstat.size == 0) {
+               len = strlen(zstat.name);
+               assert(len > 0);
+               if (zstat.name[len - 1] == '/') {
                        /* directory name */
                        err = create_directory((char*)zstat.name, MODE_OF_DIRECTORY_CREATION);
                        if (err && errno != EEXIST)
@@ -203,19 +197,19 @@ int zread(const char *zipfile, unsigned long long maxsize)
                        if (fd < 0)
                                goto errorz;
                        /* extract */
-                       z64 = zstat.size;
-                       while (z64) {
-                               sizr = zip_fread(zfile, buffer, sizeof buffer);
+                       uz64 = zstat.size;
+                       while (uz64) {
+                               sizr = (ssize_t)zip_fread(zfile, buffer, sizeof buffer);
                                if (sizr < 0) {
                                        ERROR("error while reading %s in %s", zstat.name, zipfile);
                                        goto errorzf;
                                }
-                               sizw = write(fd, buffer, sizr);
+                               sizw = write(fd, buffer, (size_t)sizr);
                                if (sizw < 0) {
                                        ERROR("error while writing %s", zstat.name);
                                        goto errorzf;
                                }
-                               z64 -= sizw;
+                               uz64 -= (size_t)sizw;
                        }
                        close(fd);
                        zip_fclose(zfile);
@@ -240,24 +234,26 @@ struct zws {
        char buffer[32768];
 };
 
-static int zwr(struct zws *zws, int offset)
+static int zwr(struct zws *zws, size_t offset)
 {
-       int len, err, fd;
+       int err, fd;
+       size_t len;
        DIR *dir;
        struct dirent *ent;
        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("opendir %.*s failed in zwr", offset, zws->name);
+               ERROR("opendir %.*s failed in zwr", (int)offset, zws->name);
                return -1;
        }
        dir = fdopendir(fd);
        if (!dir) {
                close(fd);
-               ERROR("opendir %.*s failed in zwr", offset, zws->name);
+               ERROR("opendir %.*s failed in zwr", (int)offset, zws->name);
                return -1;
        }
 
@@ -267,7 +263,7 @@ static int zwr(struct zws *zws, int offset)
        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)) {
@@ -280,6 +276,13 @@ static int zwr(struct zws *zws, int offset)
                                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);
@@ -444,6 +447,7 @@ int zwrite(const char *zipfile)
 {
        const char *args[6];
 
+       unlink(zipfile);
        args[0] = "zip";
        args[1] = "-q";
        args[2] = "-r";