From 290e63d5444c702d5d233bef571f94ee2d763e95 Mon Sep 17 00:00:00 2001 From: Young Ik Cho Date: Wed, 17 Jul 2013 10:11:39 +0900 Subject: [PATCH] refined loader log Change-Id: Ife062adebe088a1762923679c18638a496d6dfd0 Signed-off-by: Young Ik Cho --- LICENSE.APLv2 | 0 NOTICE | 0 osp-service-app-loader/serviceapp_loader.c | 4 +-- osp-system-service-loader/systemservice_loader.c | 4 +-- osp-ui-app-loader/uiapp_loader.c | 32 ++++++------------------ packaging/osp-loader.spec | 2 +- 6 files changed, 12 insertions(+), 30 deletions(-) mode change 100755 => 100644 LICENSE.APLv2 mode change 100755 => 100644 NOTICE diff --git a/LICENSE.APLv2 b/LICENSE.APLv2 old mode 100755 new mode 100644 diff --git a/NOTICE b/NOTICE old mode 100755 new mode 100644 diff --git a/osp-service-app-loader/serviceapp_loader.c b/osp-service-app-loader/serviceapp_loader.c index f391e83..0982441 100644 --- a/osp-service-app-loader/serviceapp_loader.c +++ b/osp-service-app-loader/serviceapp_loader.c @@ -180,7 +180,7 @@ osp_do_pre_exe(const char* bin_path) } static int -get_appid_executable_name_from_path(const char path[], char appid[], char executable_name[]) +get_packageid_executable_name_from_path(const char path[], char appid[], char executable_name[]) { // path is "/opt/apps/[appid]/bin/[executable_name]" @@ -238,7 +238,7 @@ main(int argc, char* argv[]) print_args(argc, argv); // convert package path to appId - get_appid_executable_name_from_path(argv[0], appid, executable_name); + get_packageid_executable_name_from_path(argv[0], appid, executable_name); LOGI("Osp appId %s.", appid); diff --git a/osp-system-service-loader/systemservice_loader.c b/osp-system-service-loader/systemservice_loader.c index eeb82f2..a64099e 100644 --- a/osp-system-service-loader/systemservice_loader.c +++ b/osp-system-service-loader/systemservice_loader.c @@ -90,7 +90,7 @@ osp_do_pre_exe(const char* bin_path) } static int -get_appid_executable_name_from_path(const char path[], char appid[], char executable_name[]) +get_packageid_executable_name_from_path(const char path[], char appid[], char executable_name[]) { // path is ".../[appid]/bin/[executable_name]" @@ -149,7 +149,7 @@ main(int argc, char* argv[]) print_args(argc, argv); // convert package path to appId - get_appid_executable_name_from_path(argv[0], appid, executable_name); + get_packageid_executable_name_from_path(argv[0], appid, executable_name); LOGI("Osp appId %s.", appid); diff --git a/osp-ui-app-loader/uiapp_loader.c b/osp-ui-app-loader/uiapp_loader.c index d3bb2e6..5111992 100644 --- a/osp-ui-app-loader/uiapp_loader.c +++ b/osp-ui-app-loader/uiapp_loader.c @@ -190,7 +190,7 @@ osp_do_pre_exe(const char* bin_path) } static int -get_appid_executable_name_from_path(const char path[], char appid[], char executable_name[]) +get_packageid_executable_name_from_path(const char path[], char appid[], char executable_name[]) { // path is ".../[appid]/bin/[executable_name]" @@ -229,45 +229,27 @@ get_appid_executable_name_from_path(const char path[], char appid[], char execut } -static int -get_package_name_from_appid_executable_name(const char appid[], const char executable_name[], char package_name[]) -{ - // package name is "[appid]" - - snprintf(package_name, MAX_PACKAGE_NAME, "%s", appid); -#ifdef _SECURE_LOG - LOGI("Package is %s", package_name); -#endif - - return 0; -} - - int main(int argc, char* argv[]) { void* handle = NULL; char* errormsg = 0; - char appid[MAX_APPID]; + char packageid[MAX_APPID]; char executable_name[MAX_APP_EXECUTABLE_NAME]; char package_name[MAX_PACKAGE_NAME]; void (*pAppInfoInit)(const char*, const char*, int, char* [], int) = NULL; int (*pRealMain)(int, char* []) = NULL; - memset(appid, 0, sizeof(appid)); + memset(packageid, 0, sizeof(packageid)); memset(executable_name, 0, sizeof(executable_name)); memset(package_name, 0, sizeof(package_name)); LOGI("Initializeing : argc %d, argv 0x%x.", argc, argv); - print_args(argc, argv); + //print_args(argc, argv); // convert package path to package name - get_appid_executable_name_from_path(argv[0], appid, executable_name); - get_package_name_from_appid_executable_name(appid, executable_name, package_name); -#ifdef _SECURE_LOG - LOGI("Osp package %s.", package_name); -#endif + get_packageid_executable_name_from_path(argv[0], packageid, executable_name); if (getuid() == 0) { @@ -275,7 +257,7 @@ main(int argc, char* argv[]) osp_do_pre_exe(argv[0]); // adjust privilege - adjust_privilege(package_name); + adjust_privilege(packageid); } @@ -323,7 +305,7 @@ main(int argc, char* argv[]) } // actual initialization - (*pAppInfoInit)(appid, executable_name, argc, argv, -1); + (*pAppInfoInit)(packageid, executable_name, argc, argv, -1); (*pRealMain)(argc, argv); LOGI("Osp application terminates."); diff --git a/packaging/osp-loader.spec b/packaging/osp-loader.spec index 2665d57..f3b2cb0 100755 --- a/packaging/osp-loader.spec +++ b/packaging/osp-loader.spec @@ -1,7 +1,7 @@ Name: osp-loader Summary: osp application loader Version: 1.2.2.0 -Release: 1 +Release: 2 Group: TO_BE/FILLED_IN License: Apache-2.0 Source0: %{name}-%{version}.tar.gz -- 2.7.4