From 09c7331d6e56057b557472ece2fa377c82b35c88 Mon Sep 17 00:00:00 2001 From: Young Ik Cho Date: Wed, 26 Jun 2013 13:06:19 +0900 Subject: [PATCH] remove redundant file open Change-Id: I8ad3a8e59e5700219509cac8624f9d5513bbd532 Signed-off-by: Young Ik Cho --- osp-service-app-loader/serviceapp_loader.c | 47 +----------------------- osp-system-service-loader/systemservice_loader.c | 47 +----------------------- osp-ui-app-loader/uiapp_loader.c | 46 +---------------------- 3 files changed, 3 insertions(+), 137 deletions(-) diff --git a/osp-service-app-loader/serviceapp_loader.c b/osp-service-app-loader/serviceapp_loader.c index b120c8c..f391e83 100644 --- a/osp-service-app-loader/serviceapp_loader.c +++ b/osp-service-app-loader/serviceapp_loader.c @@ -218,42 +218,6 @@ get_appid_executable_name_from_path(const char path[], char appid[], char execut return 1; } -static int -get_dir_fd_from_path(const char* path) -{ - int i = 0; - int count = 0; - const int len = strlen(path); - char dname[PATH_MAX]; - memset(dname, 0, PATH_MAX); - - const char* p = path + len; - for (i = 0; i < len; i++, p--) - { - if (*p == '/') - { - count++; - - if (count == 2) - { - goto OUT; - } - } - } - - LOGI("Wrong path format : %s.", path); - - return -1; - -OUT: - strncpy(dname, path, p - path); - - const int fd = open(dname, O_RDONLY | O_CLOEXEC | O_DIRECTORY); - - LOGI("Directory path : %s, fd : %d.", dname, fd); - return fd; -} - int main(int argc, char* argv[]) @@ -313,15 +277,6 @@ main(int argc, char* argv[]) return -1; } - int fd = get_dir_fd_from_path(argv[0]); - if (fd == -1) - { - LOGE("Failed to open path."); - fprintf(stderr, "Failed to open %s.\n", argv[0]); - dlclose(real_handle); - return -1; - } - pRealMain = (int (*)(int, char*[])) dlsym(real_handle, "OspMain"); errormsg = dlerror(); if (errormsg != NULL) @@ -332,7 +287,7 @@ main(int argc, char* argv[]) } // actual initialization - (*pAppInfoInit)(appid, executable_name, argc, argv, fd); + (*pAppInfoInit)(appid, executable_name, argc, argv, -1); (*pRealMain)(argc, argv); LOGI("Osp application terminates."); diff --git a/osp-system-service-loader/systemservice_loader.c b/osp-system-service-loader/systemservice_loader.c index e4f75f9..eeb82f2 100644 --- a/osp-system-service-loader/systemservice_loader.c +++ b/osp-system-service-loader/systemservice_loader.c @@ -129,42 +129,6 @@ get_appid_executable_name_from_path(const char path[], char appid[], char execut return 1; } -static int -get_dir_fd_from_path(const char* path) -{ - int i = 0; - int count = 0; - const int len = strlen(path); - char dname[PATH_MAX]; - memset(dname, 0, PATH_MAX); - - const char* p = path + len; - for (i = 0; i < len; i++, p--) - { - if (*p == '/') - { - count++; - - if (count == 2) - { - goto OUT; - } - } - } - - LOGI("Wrong path format : %s.", path); - - return -1; - -OUT: - strncpy(dname, path, p - path); - - const int fd = open(dname, O_RDONLY | O_CLOEXEC | O_DIRECTORY); - - LOGI("Directory path : %s, fd : %d.", dname, fd); - return fd; -} - int main(int argc, char* argv[]) @@ -221,15 +185,6 @@ main(int argc, char* argv[]) return -1; } - int fd = get_dir_fd_from_path(argv[0]); - if (fd == -1) - { - LOGE("Failed to open path."); - fprintf(stderr, "Failed to open %s.\n", argv[0]); - dlclose(real_handle); - return -1; - } - pRealMain = (int (*)(int, char*[])) dlsym(real_handle, "OspMain"); errormsg = dlerror(); if (errormsg != NULL) @@ -240,7 +195,7 @@ main(int argc, char* argv[]) } // actual initialization - (*pAppInfoInit)(appid, executable_name, argc, argv, fd); + (*pAppInfoInit)(appid, executable_name, argc, argv, -1); (*pRealMain)(argc, argv); LOGI("Osp application terminates."); diff --git a/osp-ui-app-loader/uiapp_loader.c b/osp-ui-app-loader/uiapp_loader.c index cc4bf3f..d3bb2e6 100644 --- a/osp-ui-app-loader/uiapp_loader.c +++ b/osp-ui-app-loader/uiapp_loader.c @@ -242,41 +242,6 @@ get_package_name_from_appid_executable_name(const char appid[], const char execu return 0; } -static int -get_dir_fd_from_path(const char* path) -{ - int i = 0; - int count = 0; - const int len = strlen(path); - char dname[PATH_MAX]; - memset(dname, 0, PATH_MAX); - - const char* p = path + len; - for (i = 0; i < len; i++, p--) - { - if (*p == '/') - { - count++; - - if (count == 2) - { - goto OUT; - } - } - } - - LOGI("Wrong path format : %s.", path); - - return -1; - -OUT: - strncpy(dname, path, p - path); - - const int fd = open(dname, O_RDONLY | O_CLOEXEC | O_DIRECTORY); - - LOGI("Directory path : %s, fd : %d.", dname, fd); - return fd; -} int main(int argc, char* argv[]) @@ -339,15 +304,6 @@ main(int argc, char* argv[]) return -1; } - int fd = get_dir_fd_from_path(argv[0]); - if (fd == -1) - { - LOGE("Failed to open path."); - fprintf(stderr, "Failed to open %s.\n", argv[0]); - dlclose(so_handle); - return -1; - } - handle = dlopen(buffer, RTLD_LAZY | RTLD_GLOBAL); if (!handle) { @@ -367,7 +323,7 @@ main(int argc, char* argv[]) } // actual initialization - (*pAppInfoInit)(appid, executable_name, argc, argv, fd); + (*pAppInfoInit)(appid, executable_name, argc, argv, -1); (*pRealMain)(argc, argv); LOGI("Osp application terminates."); -- 2.7.4