From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Thu, 15 Oct 2020 21:58:19 +0000 (-0600)
Subject: api.c: Replace hardcoded "/tasks" in delete functions
X-Git-Tag: v2.0.rc1~20^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0a7606c2f7292be3f245e56843edf762bb7cbf0;p=thirdparty%2Flibcgroup.git

api.c: Replace hardcoded "/tasks" in delete functions

Replace the hardcoded building of the tasks path in
cg_delete_cgroup_controller() and cgroup_delete_cgroup_ext()
with a call to cgroup_build_tasks_procs_path().  By calling
cgroup_build_tasks_procs_path(), both delete functions now
support cgroup v1 and v2.

cgdelete now supports cgroup v2.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/src/api.c b/src/api.c
index 13778989..c1ffdf57 100644
--- a/src/api.c
+++ b/src/api.c
@@ -2659,9 +2659,10 @@ static int cg_delete_cgroup_controller(char *cgroup_name, char *controller,
 		/*
 		 * Open tasks file of the group to delete.
 		 */
-		if (!cg_build_path(cgroup_name, path, controller))
+		ret = cgroup_build_tasks_procs_path(path, sizeof(path),
+						    cgroup_name, controller);
+		if (ret != 0)
 			return ECGROUPSUBSYSNOTMOUNTED;
-		strncat(path, "tasks", sizeof(path) - strlen(path));
 
 		delete_tasks = fopen(path, "re");
 		if (delete_tasks) {
@@ -2861,15 +2862,15 @@ int cgroup_delete_cgroup_ext(struct cgroup *cgroup, int flags)
 
 		if (parent_name) {
 			/* tasks need to be moved, pre-open target tasks file */
-			if (!cg_build_path(parent_name, parent_path,
-					cgroup->controller[i]->name)) {
+			ret = cgroup_build_tasks_procs_path(parent_path,
+					sizeof(parent_path), parent_name,
+					cgroup->controller[i]);
+			if (ret != 0) {
 				if (first_error == 0)
 					first_error = ECGFAIL;
 				free(parent_name);
 				continue;
 			}
-			strncat(parent_path, "/tasks", sizeof(parent_path)
-					- strlen(parent_path));
 
 			parent_tasks = fopen(parent_path, "we");
 			if (!parent_tasks) {