/*
Copyright 2015 IoT.bzh
+ author: José Bollo <jose.bollo@iot.bzh>
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
#define _BSD_SOURCE /* see readdir */
#include <limits.h>
-#include <zip.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <assert.h>
#include <dirent.h>
#include <string.h>
-#include <syslog.h>
#include <unistd.h>
+#include "verbose.h"
#include "wgtpkg.h"
-
-#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 <zip.h>
+
static int is_valid_filename(const char *filename)
{
int lastsp = 0;
}
}
if (rc)
- syslog(LOG_ERR, "can't create directory %s", file);
+ ERROR("can't create directory %s", file);
if (last != NULL)
*last = '/';
return rc;
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;
}
/* 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;
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);
+ ERROR("bad directory name %s in %s", zstat.name, zipfile);
goto error;
}
/* record */
} else {
/* directory name */
if (zstat.name[len - 1] == '/') {
- syslog(LOG_ERR, "bad file name %s in %s", zstat.name, zipfile);
+ ERROR("bad file name %s in %s", zstat.name, zipfile);
goto error;
}
/* get the size */
/* 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;
}
/* 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);
while (z64) {
sizr = 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);
if (sizw < 0) {
- syslog(LOG_ERR, "error while writing %s", zstat.name);
+ ERROR("error while writing %s", zstat.name);
goto errorzf;
}
z64 -= sizw;
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", 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", offset, zws->name);
return -1;
}
(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);
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;
}
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;
}
return err;
}
+/***********************************************************
+ * NOT USING LIBZIP: FORKING
+ ***********************************************************/
+#else
+
+#include <sys/wait.h>
+
+extern char **environ;
+
+static int zrun(const char *path, const char *args[])
+{
+ int rc;
+ siginfo_t si;
+
+ rc = fork();
+ if (rc < 0) {
+ /* can't fork */
+ ERROR("error while forking in zrun: %m");
+ return rc;
+ }
+ if (!rc) {
+ rc = execve(realpath(path, NULL), (char * const*)args, environ);
+ ERROR("can't execute %s in zrun: %m", args[0]);
+ _exit(1);
+ 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(PATH_TO_UNZIP, 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] = workdir;
+ args[4] = zipfile;
+ args[5] = NULL;
+
+ return zrun(PATH_TO_ZIP, 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