wgtpkg-zip: fix bug when file's size is zero

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

diff --git a/src/wgtpkg-zip.c b/src/wgtpkg-zip.c
index 4984998..f7813c4 100644 (file)
--- a/src/wgtpkg-zip.c
+++ b/src/wgtpkg-zip.c
@@ -1,6 +1,8 @@
 /*
  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
@@ -14,10 +16,9 @@
  limitations under the License.
 */
 
-#define _BSD_SOURCE /* see readdir */
+#define _DEFAULT_SOURCE
 
 #include <limits.h>
-#include <zip.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -28,16 +29,24 @@
 #include <unistd.h>
 
 #include "verbose.h"
-#include "wgtpkg.h"
+#include "wgtpkg-files.h"
+#include "wgtpkg-workdir.h"
+#include "wgtpkg-zip.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;
@@ -141,20 +150,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 */
@@ -178,7 +177,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)
@@ -338,12 +339,123 @@ int zwrite(const char *zipfile)
        return err;
 }
 
+/***********************************************************
+ *        NOT USING LIBZIP: FORKING
+ ***********************************************************/
+#else
+
+#include <sys/wait.h>
+#include <stdlib.h>
+
+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