#include "wgt.h"
#include "wgt-info.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;
}
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;
}
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;
}
{
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;
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");
+ 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);
+ create_directory(FWK_ICON_DIR, 0755, 1);
+ rc = snprintf(link, sizeof link, "%s/%s@%s", FWK_ICON_DIR, desc->id, desc->version);
if (rc >= sizeof link) {
- syslog(LOG_ERR, "link to long in install_icon");
+ 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");
+ ERROR("target to long in install_icon");
errno = EINVAL;
return -1;
}
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;
}
assert(sizeof path > (head - path));
len = (int)(sizeof path - (head - path));
if (!len) {
- syslog(LOG_ERR, "root path too long in install_security");
+ ERROR("root path too long in install_security");
errno = ENAMETOOLONG;
goto error2;
}
f = file_of_index(i++);
lf = (int)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;
}
struct wgt_info *ifo;
const struct wgt_desc *desc;
- notice("-- INSTALLING widget %s --", wgtfile);
+ NOTICE("-- INSTALLING widget %s --", wgtfile);
/* workdir */
+ create_directory(root, 0755, 1);
if (make_workdir_base(root, "TMP", 0)) {
- syslog(LOG_ERR, "failed to create a working directory");
+ ERROR("failed to create a working directory");
goto error1;
}