/*
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 _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)
{
{
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)
char newdir[PATH_MAX];
int rc;
- rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->version);
- if (rc >= sizeof newdir) {
+ 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;
char target[PATH_MAX];
int rc;
- rc = snprintf(link, sizeof link, "%s/%s@%s", ICONDESTDIR, desc->id, desc->version);
- if (rc >= sizeof link) {
+ 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) {
+ if (rc >= (int)sizeof target) {
ERROR("target to long in install_icon");
errno = EINVAL;
return -1;
{
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);
/* 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) {
ERROR("root path too long in install_security");
errno = ENAMETOOLONG;
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) {
ERROR("path too long in install_security");
errno = ENAMETOOLONG;
}
/* 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)) {
+ create_directory(root, 0755, 1);
+ if (make_workdir(root, "TMP", 0)) {
ERROR("failed to create a working directory");
goto error1;
}
if (install_security(desc))
goto error3;
- return;
+ file_reset();
+ return ifo;
error3:
wgt_info_unref(ifo);
remove_workdir();
error1:
- return;
+ file_reset();
+ return NULL;
}