X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgtpkg-zip.c;h=e450c0fdcb984909aaee61d1cb8972944a35f705;hb=3a6e947bef1b2942e24d2fdee1a76dbf3305b508;hp=8ad00bb3b4026bdc81efe801c470fb89fa00ed72;hpb=9ab266df6642c6e930e03b3024d7c3d53ef88bbc;p=src%2Fapp-framework-main.git diff --git a/src/wgtpkg-zip.c b/src/wgtpkg-zip.c index 8ad00bb..e450c0f 100644 --- a/src/wgtpkg-zip.c +++ b/src/wgtpkg-zip.c @@ -1,5 +1,7 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh + + author: José Bollo Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,10 +16,9 @@ limitations under the License. */ -#define _BSD_SOURCE /* see readdir */ +#define _DEFAULT_SOURCE #include -#include #include #include #include @@ -25,19 +26,27 @@ #include #include #include -#include #include -#include "wgtpkg.h" +#include "verbose.h" +#include "wgtpkg-files.h" +#include "wgtpkg-workdir.h" +#include "wgtpkg-zip.h" +#define MODE_OF_FILE_CREATION 0644 +#define MODE_OF_DIRECTORY_CREATION 0755 -#if !defined(MODE_OF_FILE_CREATION) -#define MODE_OF_FILE_CREATION 0640 -#endif -#if !defined(MODE_OF_DIRECTORY_CREATION) -#define MODE_OF_DIRECTORY_CREATION 0750 +#if !defined(USE_LIBZIP) +# define USE_LIBZIP 1 #endif +/*********************************************************** + * USING LIBZIP + ***********************************************************/ +#if USE_LIBZIP + +#include + static int is_valid_filename(const char *filename) { int lastsp = 0; @@ -59,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, '/'); @@ -76,13 +85,13 @@ static int create_directory(char *file, int mode) } } if (rc) - syslog(LOG_ERR, "can't create directory %s", file); + ERROR("can't create directory %s", file); if (last != NULL) *last = '/'; 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) { @@ -90,7 +99,7 @@ static int create_file(char *file, int fmode, int dmode) fd = openat(workdirfd, file, O_CREAT|O_WRONLY|O_TRUNC, fmode); } if (fd < 0) - syslog(LOG_ERR, "can't create file %s", file); + ERROR("can't create file %s", file); return fd; } @@ -98,26 +107,28 @@ 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); if (!zip) { - syslog(LOG_ERR, "Can't connect to file %s", zipfile); + ERROR("Can't connect to file %s", zipfile); return -1; } z64 = zip_get_num_entries(zip, 0); if (z64 < 0 || z64 > UINT_MAX) { - syslog(LOG_ERR, "too many entries in %s", zipfile); + ERROR("too many entries in %s", zipfile); goto error; } count = (unsigned int)z64; @@ -129,32 +140,22 @@ int zread(const char *zipfile, unsigned long long maxsize) err = zip_stat_index(zip, index, ZIP_FL_ENC_GUESS, &zstat); /* check the file name */ if (!is_valid_filename(zstat.name)) { - syslog(LOG_ERR, "invalid entry %s found in %s", zstat.name, zipfile); + ERROR("invalid entry %s found in %s", zstat.name, zipfile); goto error; } if (zstat.name[0] == '/') { - syslog(LOG_ERR, "absolute entry %s found in %s", zstat.name, zipfile); + ERROR("absolute entry %s found in %s", zstat.name, zipfile); goto error; } len = strlen(zstat.name); if (len == 0) { - syslog(LOG_ERR, "empty entry found in %s", zipfile); + ERROR("empty entry found in %s", zipfile); goto error; } - if (zstat.size == 0) { - /* directory name */ - if (zstat.name[len - 1] != '/') { - syslog(LOG_ERR, "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] == '/') { - syslog(LOG_ERR, "bad file name %s in %s", zstat.name, zipfile); - goto error; - } + else { /* get the size */ esize += zstat.size; /* record */ @@ -167,7 +168,7 @@ int zread(const char *zipfile, unsigned long long maxsize) /* check the size */ if (maxsize && esize > maxsize) { - syslog(LOG_ERR, "extracted size %zu greater than allowed size %llu", esize, maxsize); + ERROR("extracted size %zu greater than allowed size %llu", esize, maxsize); goto error; } @@ -178,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) @@ -187,26 +190,26 @@ int zread(const char *zipfile, unsigned long long maxsize) /* file name */ zfile = zip_fopen_index(zip, fdesc->zindex, 0); if (!zfile) { - syslog(LOG_ERR, "Can't open %s in %s", zstat.name, zipfile); + ERROR("Can't open %s in %s", zstat.name, zipfile); goto error; } fd = create_file((char*)zstat.name, MODE_OF_FILE_CREATION, MODE_OF_DIRECTORY_CREATION); 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) { - syslog(LOG_ERR, "error while reading %s in %s", zstat.name, zipfile); + 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) { - syslog(LOG_ERR, "error while writing %s", zstat.name); + ERROR("error while writing %s", zstat.name); goto errorzf; } - z64 -= sizw; + uz64 -= (size_t)sizw; } close(fd); zip_fclose(zfile); @@ -231,9 +234,10 @@ 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; @@ -242,13 +246,13 @@ static int zwr(struct zws *zws, int offset) fd = openat(workdirfd, offset ? zws->name : ".", O_DIRECTORY|O_RDONLY); if (fd < 0) { - syslog(LOG_ERR, "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); - syslog(LOG_ERR, "opendir %.*s failed in zwr", offset, zws->name); + ERROR("opendir %.*s failed in zwr", (int)offset, zws->name); return -1; } @@ -262,20 +266,20 @@ static int zwr(struct zws *zws, int offset) (ent->d_name[1] == '.' && len == 2))) ; else if (offset + len >= sizeof(zws->name)) { - syslog(LOG_ERR, "name too long in zwr"); + ERROR("name too long in zwr"); errno = ENAMETOOLONG; goto error; } else { memcpy(zws->name + offset, ent->d_name, 1+len); if (!is_valid_filename(ent->d_name)) { - syslog(LOG_ERR, "invalid name %s", zws->name); + ERROR("invalid name %s", zws->name); goto error; } switch (ent->d_type) { case DT_DIR: z64 = zip_dir_add(zws->zip, zws->name, ZIP_FL_ENC_UTF_8); if (z64 < 0) { - syslog(LOG_ERR, "zip_dir_add of %s failed", zws->name); + ERROR("zip_dir_add of %s failed", zws->name); goto error; } err = zwr(zws, offset + len); @@ -285,24 +289,24 @@ static int zwr(struct zws *zws, int offset) case DT_REG: fd = openat(workdirfd, zws->name, O_RDONLY); if (fd < 0) { - syslog(LOG_ERR, "openat of %s failed", zws->name); + ERROR("openat of %s failed", zws->name); goto error; } fp = fdopen(fd, "r"); if (fp == NULL) { - syslog(LOG_ERR, "fdopen of %s failed", zws->name); + ERROR("fdopen of %s failed", zws->name); close(fd); goto error; } zsrc = zip_source_filep(zws->zip, fp, 0, 0); if (zsrc == NULL) { - syslog(LOG_ERR, "zip_source_file of %s failed", zws->name); + ERROR("zip_source_file of %s failed", zws->name); fclose(fp); goto error; } z64 = zip_file_add(zws->zip, zws->name, zsrc, ZIP_FL_ENC_UTF_8); if (z64 < 0) { - syslog(LOG_ERR, "zip_file_add of %s failed", zws->name); + ERROR("zip_file_add of %s failed", zws->name); zip_source_free(zsrc); goto error; } @@ -329,7 +333,7 @@ int zwrite(const char *zipfile) zws.zip = zip_open(zipfile, ZIP_CREATE|ZIP_TRUNCATE, &err); if (!zws.zip) { - syslog(LOG_ERR, "Can't open %s for write", zipfile); + ERROR("Can't open %s for write", zipfile); return -1; } @@ -338,12 +342,123 @@ int zwrite(const char *zipfile) return err; } +/*********************************************************** + * NOT USING LIBZIP: FORKING + ***********************************************************/ +#else + +#include +#include + +extern char **environ; + +static char *getbin(const char *progname) +{ + char name[PATH_MAX]; + char *path; + int i; + + if (progname[0] == '/') + return access(progname, X_OK) ? NULL : strdup(progname); + + path = getenv("PATH"); + while(path && *path) { + for (i = 0 ; path[i] && path[i] != ':' ; i++) + name[i] = path[i]; + path += i + !!path[i]; + name[i] = '/'; + strcpy(name + i + 1, progname); + if (access(name, X_OK) == 0) + return realpath(name, NULL); + } + return NULL; +} + +static int zrun(const char *name, const char *args[]) +{ + int rc; + siginfo_t si; + char *binary; + + binary = getbin(name); + if (binary == NULL) { + ERROR("error while forking in zrun: can't find %s", name); + return -1; + } + + rc = fork(); + if (rc == 0) { + rc = execve(binary, (char * const*)args, environ); + ERROR("can't execute %s in zrun: %m", args[0]); + _exit(1); + return rc; + } + + free(binary); + if (rc < 0) { + /* can't fork */ + ERROR("error while forking in zrun: %m"); + return rc; + } + + /* wait termination of the child */ + rc = waitid(P_PID, (id_t)rc, &si, WEXITED); + if (rc) + ERROR("unexpected wait status in zrun of %s: %m", args[0]); + else if (si.si_code != CLD_EXITED) + ERROR("unexpected termination status of %s in zrun", args[0]); + else if (si.si_status != 0) + ERROR("child for %s terminated with error code %d in zwrite", args[0], si.si_status); + else + return 0; + return -1; +} + +/* read (extract) 'zipfile' in current directory */ +int zread(const char *zipfile, unsigned long long maxsize) +{ + int rc; + const char *args[6]; + + args[0] = "unzip"; + args[1] = "-q"; + args[2] = "-d"; + args[3] = workdir; + args[4] = zipfile; + args[5] = NULL; + + file_reset(); + rc = zrun(args[0], args); + if (!rc) + rc = fill_files(); + return rc; +} + +/* write (pack) content of the current directory in 'zipfile' */ +int zwrite(const char *zipfile) +{ + const char *args[6]; + + args[0] = "zip"; + args[1] = "-q"; + args[2] = "-r"; + args[3] = zipfile; + args[4] = workdir; + args[5] = NULL; + + return zrun(args[0], args); +} + +#endif +/*********************************************************** +* TESTING +***********************************************************/ #if defined(TEST_READ) int main(int ac, char **av) { for(av++ ; *av ; av++) - zread(*av); + zread(*av, 0); return 0; } #endif