From: Michel Normand <normand@fr.ibm.com>
Date: Thu, 14 May 2009 13:23:30 +0000 (+0200)
Subject: change lxc-cgroup parameter checking
X-Git-Tag: lxc_0_6_3~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=487f4ee9f8a617ddcb6559d7870fca18d8342984;p=thirdparty%2Flxc.git

change lxc-cgroup parameter checking

required to support either:
lxc-cgroup -n foo subsystem value
lxc-cgroup -nfoo  subsystem value

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index 721fdd3ad..df518eb5f 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -51,13 +51,14 @@ int main(int argc, char *argv[])
 		nbargs++;
 	}
 
-	if (!name || argc < 4)
+	if (!name || (argc-optind) < 1)
 		usage(argv[0]);
 
-	if (argc >= 5)
-		value = argv[4];
+	if ((argc -optind) >= 1)
+		subsystem = argv[optind];
 
-	subsystem = argv[3];
+	if ((argc -optind) >= 2)
+		value = argv[optind+1];
 
 	if (value) {
 		if (lxc_cgroup_set(name, subsystem, value)) {