cmake: improves error detection

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

diff --git a/src/wgtpkg-install.c b/src/wgtpkg-install.c
index 37a47ff..264606a 100644 (file)
--- a/src/wgtpkg-install.c
+++ b/src/wgtpkg-install.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
@@ -16,24 +18,31 @@
 
 #define _GNU_SOURCE
 
+#include <limits.h>
 #include <errno.h>
-#include <syslog.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
 #include <unistd.h>
+#include <stdio.h>
 
 #include "verbose.h"
-#include "wgtpkg.h"
 #include "wgt.h"
 #include "wgt-info.h"
+#include "wgtpkg-files.h"
+#include "wgtpkg-workdir.h"
+#include "wgtpkg-zip.h"
+#include "wgtpkg-permissions.h"
+#include "wgtpkg-digsig.h"
+#include "wgtpkg-install.h"
 #include "secmgr-wrap.h"
+#include "utils-dir.h"
 
 static int check_defined(const void *data, const char *name)
 {
        if (data)
                return 0;
-       syslog(LOG_ERR, "widget has no defined '%s' (temporary constraints)", name);
+       ERROR("widget has no defined '%s' (temporary constraints)", name);
        errno = EINVAL;
        return -1;
 }
@@ -49,7 +58,7 @@ static int check_valid_string(const char *value, const char *name)
        c = value[pos];
        while(c) {
                if (!isalnum(c) && !strchr(".-_", c)) {
-                       syslog(LOG_ERR, "forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
+                       ERROR("forbidden char %c in '%s' -> '%s' (temporary constraints)", c, name, value);
                        errno = EINVAL;
                        return -1;                      
                }
@@ -62,12 +71,13 @@ static int check_temporary_constraints(const struct wgt_desc *desc)
 {
        int result = check_valid_string(desc->id, "id");
        result |= check_valid_string(desc->version, "version");
+       result |= check_valid_string(desc->ver, "ver");
        result |= check_defined(desc->icons, "icon");
        result |= check_defined(desc->content_src, "content");
        if (result)
                return result;
        if (desc->icons->next) {
-               syslog(LOG_ERR, "widget has more than one icon defined (temporary constraints)");
+               ERROR("widget has more than one icon defined (temporary constraints)");
                errno = EINVAL;
                result = -1;
        }
@@ -78,13 +88,13 @@ static int check_permissions(const char *name, int required)
 {
        if (permission_exists(name)) {
                if (request_permission(name)) {
-                       debug("granted permission: %s", name);
+                       DEBUG("granted permission: %s", name);
                } else if (required) {
-                       syslog(LOG_ERR, "ungranted permission required: %s", name);
+                       ERROR("ungranted permission required: %s", name);
                        errno = EPERM;
                        return 0;
                } else {
-                       notice("ungranted permission optional: %s", name);
+                       INFO("ungranted permission optional: %s", name);
                }
        }
        return 1;
@@ -110,9 +120,9 @@ static int move_widget(const char *root, const struct wgt_desc *desc, int force)
        char newdir[PATH_MAX];
        int rc;
 
-       rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->version);
-       if (rc >= sizeof newdir) {
-               syslog(LOG_ERR, "path to long in move_widget");
+       rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->ver);
+       if (rc >= (int)sizeof newdir) {
+               ERROR("path to long in move_widget");
                errno = EINVAL;
                return -1;
        }
@@ -126,16 +136,17 @@ static int install_icon(const struct wgt_desc *desc)
        char target[PATH_MAX];
        int rc;
 
-       rc = snprintf(link, sizeof link, "%s/%s@%s", ICONDESTDIR, desc->id, desc->version);
-       if (rc >= sizeof link) {
-               syslog(LOG_ERR, "link to long in install_icon");
+       create_directory(FWK_ICON_DIR, 0755, 1);
+       rc = snprintf(link, sizeof link, "%s/%s", FWK_ICON_DIR, desc->idaver);
+       if (rc >= (int)sizeof link) {
+               ERROR("link to long in install_icon");
                errno = EINVAL;
                return -1;
        }
 
        rc = snprintf(target, sizeof target, "%s/%s", workdir, desc->icons->src);
-       if (rc >= sizeof target) {
-               syslog(LOG_ERR, "target to long in install_icon");
+       if (rc >= (int)sizeof target) {
+               ERROR("target to long in install_icon");
                errno = EINVAL;
                return -1;
        }
@@ -143,7 +154,7 @@ static int install_icon(const struct wgt_desc *desc)
        unlink(link);
        rc = symlink(target, link);
        if (rc)
-               syslog(LOG_ERR, "can't create link %s -> %s", link, target);
+               ERROR("can't create link %s -> %s", link, target);
        return rc;
 }
 
@@ -151,8 +162,8 @@ static int install_security(const struct wgt_desc *desc)
 {
        char path[PATH_MAX], *head;
        const char *icon, *perm;
-       int rc, len, lic, lf;
-       unsigned int i, n;
+       int rc;
+       unsigned int i, n, len, lic, lf;
        struct filedesc *f;
 
        rc = secmgr_init(desc->id);
@@ -165,24 +176,24 @@ static int install_security(const struct wgt_desc *desc)
 
        /* instal the files */
        head = stpcpy(path, workdir);
-       assert(sizeof path > (head - path));
-       len = (int)(sizeof path - (head - path));
+       assert(head < path + sizeof path);
+       len = (unsigned)((path + sizeof path) - head);
        if (!len) {
-               syslog(LOG_ERR, "root path too long in install_security");
+               ERROR("root path too long in install_security");
                errno = ENAMETOOLONG;
                goto error2;
        }
        len--;
        *head++ = '/';
        icon = desc->icons->src;
-       lic = (int)strlen(icon);
+       lic = (unsigned)strlen(icon);
        n = file_count();
        i = 0;
        while(i < n) {
                f = file_of_index(i++);
-               lf = (int)strlen(f->name);
+               lf = (unsigned)strlen(f->name);
                if (lf >= len) {
-                       syslog(LOG_ERR, "path too long in install_security");
+                       ERROR("path too long in install_security");
                        errno = ENAMETOOLONG;
                        goto error2;
                }
@@ -213,16 +224,17 @@ error:
 }
 
 /* install the widget of the file */
-void install_widget(const char *wgtfile, const char *root, int force)
+struct wgt_info *install_widget(const char *wgtfile, const char *root, int force)
 {
        struct wgt_info *ifo;
        const struct wgt_desc *desc;
 
-       notice("-- INSTALLING widget %s --", wgtfile);
+       NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root);
 
        /* workdir */
-       if (make_workdir_base(root, "TMP", 0)) {
-               syslog(LOG_ERR, "failed to create a working directory");
+       create_directory(root, 0755, 1);
+       if (make_workdir(root, "TMP", 0)) {
+               ERROR("failed to create a working directory");
                goto error1;
        }
 
@@ -249,7 +261,8 @@ void install_widget(const char *wgtfile, const char *root, int force)
        if (install_security(desc))
                goto error3;
        
-       return;
+       file_reset();
+       return ifo;
 
 error3:
        wgt_info_unref(ifo);
@@ -258,6 +271,7 @@ error2:
        remove_workdir();
 
 error1:
-       return;
+       file_reset();
+       return NULL;
 }