Modify closing all open fds

Change-Id: I5bfc97b07e6d444860da66cadadf38f8729530e7
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/include/common.h b/include/common.h
index 9210790..6488292 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -70,6 +70,7 @@ char **_create_argc_argv(bundle *kb, int *margc, const char *app_path);
 int _proc_check_cmdline_bypid(int pid);
 void _prepare_listen_sock(void);
 int _delete_sock_path(int pid, uid_t uid);
+int _close_all_fds(void);
 
 #endif /* __COMMON_H__ */
 

diff --git a/src/common.c b/src/common.c
index 0f14356..0df007d 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -870,3 +870,39 @@ int _delete_sock_path(int pid, uid_t uid)
        return 0;
 }
 
+int _close_all_fds(void)
+{
+       DIR *dp;
+       struct dirent dentry;
+       struct dirent *result = NULL;
+       int fd;
+       int max_fd;
+
+       dp = opendir("/proc/self/fd");
+       if (dp == NULL) {
+               /* fallback */
+               max_fd = sysconf(_SC_OPEN_MAX);
+               for (fd = 3; fd < max_fd; fd++)
+                       close(fd);
+
+               return 0;
+       }
+
+       while (readdir_r(dp, &dentry, &result) == 0 && result) {
+               if (!isdigit(dentry.d_name[0]))
+                       continue;
+
+               fd = atoi(dentry.d_name);
+               if (fd < 3)
+                       continue;
+
+               if (fd == dirfd(dp))
+                       continue;
+
+               close(fd);
+       }
+       closedir(dp);
+
+       return 0;
+}
+

diff --git a/src/debug-launchpad.c b/src/debug-launchpad.c
index 7e706f2..9c58d1b 100644 (file)
--- a/src/debug-launchpad.c
+++ b/src/debug-launchpad.c
@@ -200,8 +200,6 @@ static int __start_process(const char *appid, const char *app_path,
 {
        char sock_path[PATH_MAX];
        int pid;
-       int max_fd;
-       int iter_fd;
 
        if (__prepare_fork(kb, appinfo->debug_appid) < 0)
                return -1;
@@ -214,13 +212,8 @@ static int __start_process(const char *appid, const char *app_path,
                _signal_unblock_sigchld();
                _signal_fini();
 
-               max_fd = sysconf(_SC_OPEN_MAX);
-               for (iter_fd = 3; iter_fd <= max_fd; iter_fd++)
-                       close(iter_fd);
-
-               snprintf(sock_path, sizeof(sock_path), "%s/apps/%d/%d",
-                               SOCKET_PATH, getuid(), getpid());
-               unlink(sock_path);
+               _close_all_fds();
+               _delete_sock_path(getpid(), getuid());
 
                PERF("prepare exec - fisrt done");
                _D("lock up test log(no error): prepare exec - first done");