utils: move recursive_destroy() from cfgsng to utils.

Signed-off-by: 2xsec <dh48.jeong@samsung.com>

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index b514a7bb6f7b087b7465a2eec799ffffb309eb82..3cc9f9f628889192926448d640337804f4fd693f 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1040,62 +1040,6 @@ static void lxc_cgfsng_print_basecg_debuginfo(char *basecginfo, char **klist,
                TRACE("named subsystem %d: %s", k, *it);
 }
 
-static int recursive_destroy(char *dirname)
-{
-       int ret;
-       struct dirent *direntp;
-       DIR *dir;
-       int r = 0;
-
-       dir = opendir(dirname);
-       if (!dir)
-               return -1;
-
-       while ((direntp = readdir(dir))) {
-               char *pathname;
-               struct stat mystat;
-
-               if (!strcmp(direntp->d_name, ".") ||
-                   !strcmp(direntp->d_name, ".."))
-                       continue;
-
-               pathname = must_make_path(dirname, direntp->d_name, NULL);
-
-               ret = lstat(pathname, &mystat);
-               if (ret < 0) {
-                       if (!r)
-                               WARN("Failed to stat \"%s\"", pathname);
-                       r = -1;
-                       goto next;
-               }
-
-               if (!S_ISDIR(mystat.st_mode))
-                       goto next;
-
-               ret = recursive_destroy(pathname);
-               if (ret < 0)
-                       r = -1;
-       next:
-               free(pathname);
-       }
-
-       ret = rmdir(dirname);
-       if (ret < 0) {
-               if (!r)
-                       SYSWARN("Failed to delete \"%s\"", dirname);
-               r = -1;
-       }
-
-       ret = closedir(dir);
-       if (ret < 0) {
-               if (!r)
-                       SYSWARN("Failed to delete \"%s\"", dirname);
-               r = -1;
-       }
-
-       return r;
-}
-
 static int cgroup_rmdir(struct hierarchy **hierarchies,
                        const char *container_cgroup)
 {

diff --git a/src/lxc/tools/lxc_ls.c b/src/lxc/tools/lxc_ls.c
index 475dcfdfe37ec62a348ae7446812579b58ba0692..bba72e8d507194a8039b7a65ac949e568ee4c035 100644 (file)
--- a/src/lxc/tools/lxc_ls.c
+++ b/src/lxc/tools/lxc_ls.c
@@ -160,8 +160,6 @@ static int ls_remove_lock(const char *path, const char *name,
 static int ls_serialize(int wpipefd, struct ls *n);
 static int my_parser(struct lxc_arguments *args, int c, char *arg);
 
-static int rm_r(char *dirname);
-
 static const struct option my_longopts[] = {
        {"line", no_argument, 0, '1'},
        {"fancy", no_argument, 0, 'f'},
@@ -1088,7 +1086,10 @@ static int ls_remove_lock(const char *path, const char *name,
        if (check < 0 || (size_t)check >= *len_lockpath)
                goto out;
 
-       (void)rm_r(*lockpath);
+       ret = recursive_destroy(*lockpath);
+       if (ret < 0)
+               WARN("Failed to destroy \"%s\"", *lockpath);
+
        ret = 0;
 
 out:
@@ -1323,51 +1324,3 @@ static void ls_field_width(const struct ls *l, const size_t size,
                }
        }
 }
-
-static int rm_r(char *dirname)
-{
-       int ret;
-       struct dirent *direntp;
-       DIR *dir;
-       int r = 0;
-
-       dir = opendir(dirname);
-       if (!dir)
-               return -1;
-
-       while ((direntp = readdir(dir))) {
-               char *pathname;
-               struct stat mystat;
-
-               if (!strcmp(direntp->d_name, ".") ||
-                   !strcmp(direntp->d_name, ".."))
-                       continue;
-
-               pathname = must_make_path(dirname, direntp->d_name, NULL);
-
-               ret = lstat(pathname, &mystat);
-               if (ret < 0) {
-                       r = -1;
-                       goto next;
-               }
-
-               if (!S_ISDIR(mystat.st_mode))
-                       goto next;
-
-               ret = rm_r(pathname);
-               if (ret < 0)
-                       r = -1;
-       next:
-               free(pathname);
-       }
-
-       ret = rmdir(dirname);
-       if (ret < 0)
-               r = -1;
-
-       ret = closedir(dir);
-       if (ret < 0)
-               r = -1;
-
-       return r;
-}

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index fb7ae20236557c7a8f5ce8eed385495b9da3ed6c..e2ee8229d55a5b52698d358f11b9a1f37179c5cf 100644 (file)
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -2708,3 +2708,63 @@ int fd_cloexec(int fd, bool cloexec)
 
        return 0;
 }
+
+int recursive_destroy(char *dirname)
+{
+       int ret;
+       struct dirent *direntp;
+       DIR *dir;
+       int r = 0;
+
+       dir = opendir(dirname);
+       if (!dir)
+               return -1;
+
+       while ((direntp = readdir(dir))) {
+               char *pathname;
+               struct stat mystat;
+
+               if (!strcmp(direntp->d_name, ".") ||
+                   !strcmp(direntp->d_name, ".."))
+                       continue;
+
+               pathname = must_make_path(dirname, direntp->d_name, NULL);
+
+               ret = lstat(pathname, &mystat);
+               if (ret < 0) {
+                       if (!r)
+                               WARN("Failed to stat \"%s\"", pathname);
+
+                       r = -1;
+                       goto next;
+               }
+
+               if (!S_ISDIR(mystat.st_mode))
+                       goto next;
+
+               ret = recursive_destroy(pathname);
+               if (ret < 0)
+                       r = -1;
+
+       next:
+               free(pathname);
+       }
+
+       ret = rmdir(dirname);
+       if (ret < 0) {
+               if (!r)
+                       SYSWARN("Failed to delete \"%s\"", dirname);
+
+               r = -1;
+       }
+
+       ret = closedir(dir);
+       if (ret < 0) {
+               if (!r)
+                       SYSWARN("Failed to delete \"%s\"", dirname);
+
+               r = -1;
+       }
+
+       return r;
+}

diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index 4a748cd1b93546d00537d8f7d51057f8dcc401bf..295e7862ccf9e5880136dab63c3c941ce056133a 100644 (file)
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -616,5 +616,6 @@ static inline pid_t lxc_raw_gettid(void)
 /* Set a signal the child process will receive after the parent has died. */
 extern int lxc_set_death_signal(int signal);
 extern int fd_cloexec(int fd, bool cloexec);
+extern int recursive_destroy(char *dirname);
 
 #endif /* __LXC_UTILS_H */