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 721fdd3ad7227dc08fc79b27287783eb58fc1ee3..df518eb5ff08c794dc929a15c656698e2824cea7 100644 (file)
--- 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)) {