Attachment 584420 Details for Bug 819137 – patch to underlying problem

[patch] patch to underlying problem

libcgroup.patch (text/plain), 1.26 KB, created by Ben Woodard on 2012-05-14 17:44:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woodard

Created: 2012-05-14 17:44:26 UTC

Size: 1.26 KB

patch

obsolete

>diff -pru libcgroup-0.37/src/api.c libcgroup-0.37.new/src/api.c
>--- libcgroup-0.37/src/api.c	2012-05-03 16:08:33.219570382 -0700
>+++ libcgroup-0.37.new/src/api.c	2012-05-03 16:03:35.001960470 -0700
>@@ -970,7 +970,8 @@ static char *cg_build_path_locked(const
> 
> 				/* FIXME: missing OOM check here! */
> 
>-				sprintf(path, "%s%s/", tmp, name);
>+				sprintf(path, "%s%s/", tmp, 
>+					name+((name[0]=='/')?1:0));
> 				free(tmp);
> 			}
> 			return path;
>diff -pru libcgroup-0.37/src/tools/lscgroup.c libcgroup-0.37.new/src/tools/lscgroup.c
>--- libcgroup-0.37/src/tools/lscgroup.c	2010-10-20 06:59:13.000000000 -0700
>+++ libcgroup-0.37.new/src/tools/lscgroup.c	2012-05-03 16:01:54.684418912 -0700
>@@ -98,10 +98,10 @@ static int display_controller_data(char
> 	trim_filepath(cgroup_dir_path);
> 
> 	strncpy(input_dir_path, input_path, FILENAME_MAX);
>-	/* remove problematic  '/' characters from input path*/
>-	trim_filepath(cgroup_dir_path);
>+	/* remove problematic  '/' characters from input directory path*/
>+	trim_filepath(input_dir_path);
> 
>-	len  = strlen(cgroup_dir_path) - strlen(input_dir_path) + 1;
>+	len  = strlen(cgroup_dir_path) - strlen(input_dir_path);
> 	print_info(&info, name, len);
> 	while ((ret = cgroup_walk_tree_next(0, &handle, &info, lvl)) == 0)
> 		print_info(&info, name, len);

Actions: View | Diff

Attachments on bug 819137: 584420