Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
improves documentation formatting
[src/app-framework-main.git]
/
src
/
wgtpkg-install.c
diff --git
a/src/wgtpkg-install.c
b/src/wgtpkg-install.c
index
b3e4603
..
264606a
100644
(file)
--- a/
src/wgtpkg-install.c
+++ b/
src/wgtpkg-install.c
@@
-18,16
+18,23
@@
#define _GNU_SOURCE
#define _GNU_SOURCE
+#include <limits.h>
#include <errno.h>
#include <string.h>
#include <ctype.h>
#include <assert.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <ctype.h>
#include <assert.h>
#include <unistd.h>
+#include <stdio.h>
#include "verbose.h"
#include "verbose.h"
-#include "wgtpkg.h"
#include "wgt.h"
#include "wgt-info.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"
#include "secmgr-wrap.h"
#include "utils-dir.h"
@@
-64,6
+71,7
@@
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");
{
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)
result |= check_defined(desc->icons, "icon");
result |= check_defined(desc->content_src, "content");
if (result)
@@
-112,8
+120,8
@@
static int move_widget(const char *root, const struct wgt_desc *desc, int force)
char newdir[PATH_MAX];
int rc;
char newdir[PATH_MAX];
int rc;
- rc = snprintf(newdir, sizeof newdir, "%s/%s/%s", root, desc->id, desc->ver
sion
);
- 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;
ERROR("path to long in move_widget");
errno = EINVAL;
return -1;
@@
-129,15
+137,15
@@
static int install_icon(const struct wgt_desc *desc)
int rc;
create_directory(FWK_ICON_DIR, 0755, 1);
int rc;
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) {
+ 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);
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;
ERROR("target to long in install_icon");
errno = EINVAL;
return -1;
@@
-154,8
+162,8
@@
static int install_security(const struct wgt_desc *desc)
{
char path[PATH_MAX], *head;
const char *icon, *perm;
{
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);
struct filedesc *f;
rc = secmgr_init(desc->id);
@@
-168,8
+176,8
@@
static int install_security(const struct wgt_desc *desc)
/* instal the files */
head = stpcpy(path, workdir);
/* 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;
if (!len) {
ERROR("root path too long in install_security");
errno = ENAMETOOLONG;
@@
-178,12
+186,12
@@
static int install_security(const struct wgt_desc *desc)
len--;
*head++ = '/';
icon = desc->icons->src;
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++);
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;
if (lf >= len) {
ERROR("path too long in install_security");
errno = ENAMETOOLONG;
@@
-216,16
+224,16
@@
error:
}
/* install the widget of the file */
}
/* 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;
{
struct wgt_info *ifo;
const struct wgt_desc *desc;
- NOTICE("-- INSTALLING widget %s
--", wgtfile
);
+ NOTICE("-- INSTALLING widget %s
to %s --", wgtfile, root
);
/* workdir */
create_directory(root, 0755, 1);
/* workdir */
create_directory(root, 0755, 1);
- if (make_workdir
_base
(root, "TMP", 0)) {
+ if (make_workdir(root, "TMP", 0)) {
ERROR("failed to create a working directory");
goto error1;
}
ERROR("failed to create a working directory");
goto error1;
}
@@
-253,7
+261,8
@@
void install_widget(const char *wgtfile, const char *root, int force)
if (install_security(desc))
goto error3;
if (install_security(desc))
goto error3;
- return;
+ file_reset();
+ return ifo;
error3:
wgt_info_unref(ifo);
error3:
wgt_info_unref(ifo);
@@
-262,6
+271,7
@@
error2:
remove_workdir();
error1:
remove_workdir();
error1:
- return;
+ file_reset();
+ return NULL;
}
}