From: Ken'ichi Ohmichi Date: Thu, 25 Jun 2009 00:12:00 +0000 (+0900) Subject: Cleanup: Clarify the number meanings of string length. X-Git-Tag: v0.34~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e9741892aeffc3ec7974af259c258821b073e8a;p=thirdparty%2Flibcgroup.git Cleanup: Clarify the number meanings of string length. Hi, This patch clarifies the number meanings of string length in the function cgroup_get_uid_gid_from_procfs(). This is recreated based on Igawa-san's patch for the latest code. * Reference Igawa-san's patch http://sourceforge.net/mailarchive/message.php?msg_name=20090515.085922.109268324.igawa%40mxs.nes.nec.co.jp Signed-off-by: Masayuki Igawa Signed-off-by: Ken'ichi Ohmichi Signed-off-by: Dhaval Giani --- diff --git a/src/api.c b/src/api.c index 353b6dce..ee299c69 100644 --- a/src/api.c +++ b/src/api.c @@ -2720,15 +2720,15 @@ int cgroup_get_uid_gid_from_procfs(pid_t pid, uid_t *euid, gid_t *egid) while (fgets(buf, sizeof(buf), f)) { if (!strncmp(buf, "Uid:", 4)) { - if (sscanf((buf + 5), "%d%d%d%d", &ruid, euid, - &suid, &fsuid) != 4) + if (sscanf((buf + strlen("Uid:") + 1), "%d%d%d%d", + &ruid, euid, &suid, &fsuid) != 4) break; cgroup_dbg("Scanned proc values are %d %d %d %d\n", ruid, *euid, suid, fsuid); found_euid = true; } else if (!strncmp(buf, "Gid:", 4)) { - if (sscanf((buf + 5), "%d%d%d%d", &rgid, egid, - &sgid, &fsgid) != 4) + if (sscanf((buf + strlen("Gid:") + 1), "%d%d%d%d", + &rgid, egid, &sgid, &fsgid) != 4) break; cgroup_dbg("Scanned proc values are %d %d %d %d\n", rgid, *egid, sgid, fsgid);