From 74ee94ca22c75fa79c9ec7be630d4b7fb22c02ab Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Thu, 22 Dec 2016 10:26:10 +0900 Subject: [PATCH] Change bin file to be executed - pkg_clearcache is replced by pkg_cleardata so change code to use it - new pkg_cleardata will handle clear data of pkg Related changes: [pkgmgr-tool] : https://review.tizen.org/gerrit/106485 [app-installers] : https://review.tizen.org/gerrit/105691 [tpk-backend] : https://review.tizen.org/gerrit/106603 [wgt-backend] : https://review.tizen.org/gerrit/106601 Change-Id: Ifa296ecdaf00596261c7e676bbebe6a5b344a386 Signed-off-by: Junghyun Yeon --- src/pkgmgr-server.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/pkgmgr-server.c b/src/pkgmgr-server.c index d69728f..dc8e153 100644 --- a/src/pkgmgr-server.c +++ b/src/pkgmgr-server.c @@ -1156,40 +1156,37 @@ error: static int __process_cleardata(struct backend_job *job) { - char *backend_cmd; + static const char *backend_cmd = "/usr/bin/pkg_cleardata"; char **argv; char args[MAX_PKG_ARGS_LEN]; int pid; - backend_cmd = job->backend_path; - if (backend_cmd == NULL) + if ((int)job->target_uid < REGULAR_USER) return -1; - /* TODO: set movetype */ - snprintf(args, sizeof(args), "%s -k %s -c %s -u %d", backend_cmd, - job->req_id, job->pkgid, (int)job->target_uid); + snprintf(args, sizeof(args), "%s -d %s", backend_cmd, job->pkgid); argv = __generate_argv(args); - - pid = __fork_and_exec_with_args(argv, APPFW_UID); + pid = __fork_and_exec_with_args(argv, job->target_uid); g_strfreev(argv); - return pid; } static int __process_clearcache(struct backend_job *job) { - static const char *backend_cmd = "/usr/bin/pkg_clearcache"; + static const char *backend_cmd = "/usr/bin/pkg_cleardata"; char **argv; char args[MAX_PKG_ARGS_LEN]; int pid; - snprintf(args, sizeof(args), "%s %s", backend_cmd, job->pkgid); + if ((int)job->target_uid < REGULAR_USER) + return -1; + + snprintf(args, sizeof(args), "%s -c %s", backend_cmd, job->pkgid); argv = __generate_argv(args); pid = __fork_and_exec_with_args(argv, job->target_uid); g_strfreev(argv); - return pid; } -- 2.7.4