#include "verbose.h"
#include "wgt.h"
#include "wgt-info.h"
+#include "wgt-strings.h"
#include "wgtpkg-files.h"
#include "wgtpkg-workdir.h"
#include "wgtpkg-zip.h"
#include "secmgr-wrap.h"
#include "utils-dir.h"
-static const char permission_required[] = "required";
-static const char permission_optional[] = "optional";
-static const char feature_required_permissions[] = FWK_PREFIX "required-permission";
static const char* exec_type_strings[] = {
"application/x-executable",
"application/vnd.agl.native"
static int check_temporary_constraints(const struct wgt_desc *desc)
{
- int result = check_valid_string(desc->id, "id");
+ int result;
+
+ 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) {
ERROR("widget has more than one icon defined (temporary constraints)");
errno = EINVAL;
while (params) {
/* check the value */
- if (!strcmp(params->value, permission_required))
+ if (!strcmp(params->value, string_required))
optional = !required;
- else if (!strcmp(params->value, permission_optional))
+ else if (!strcmp(params->value, string_optional))
optional = 1;
else {
ERROR("unexpected parameter value: %s found for %s", params->value, params->name);
result = check_temporary_constraints(desc);
feature = desc->features;
while(result >= 0 && feature) {
- if (!strcmp(feature->name, feature_required_permissions))
+ if (!strcmp(feature->name, feature_required_permission))
result = set_required_permissions(feature->params, feature->required);
feature = feature->next;
}
return result;
}
-static int move_widget(const char *root, const struct wgt_desc *desc, int force)
+static int get_target_directory(char target[PATH_MAX], const char *root, const struct wgt_desc *desc)
{
- char newdir[PATH_MAX];
int rc;
- rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->ver);
- if (rc >= (int)sizeof newdir) {
- ERROR("path too long in move_widget");
+ rc = snprintf(target, PATH_MAX, "%s/%s/%s", root, desc->id, desc->ver);
+ if (rc < PATH_MAX)
+ rc = 0;
+ else {
+ ERROR("path too long");
errno = EINVAL;
- return -1;
+ rc = -1;
}
+ return rc;
+}
- return move_workdir(newdir, 1, force);
+static int move_widget_to(const char *destdir, int force)
+{
+ return move_workdir(destdir, 1, force);
}
static int install_icon(const struct wgt_desc *desc)
{
struct wgt_info *ifo;
const struct wgt_desc *desc;
+ char installdir[PATH_MAX];
NOTICE("-- INSTALLING widget %s to %s --", wgtfile, root);
if (check_widget(desc))
goto error3;
- if (move_widget(root, desc, force))
+ if (get_target_directory(installdir, root, desc))
+ goto error3;
+
+ if (move_widget_to(installdir, force))
goto error3;
if (install_icon(desc))