tools: make "-n" optional

This lets users use the tools with "lxc-* -n <container-name>" or "lxc-* <container-name>". Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

tools: make "-n" optional
817a0e46 · Christian Brauner · b28e2826 · 817a0e46
Unverified Commit 817a0e46 authored Jan 27, 2018 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

arguments.c src/lxc/tools/arguments.c +11 -3

No files found.
--- a/src/lxc/tools/arguments.c
+++ b/src/lxc/tools/arguments.c
@@ -256,10 +256,18 @@ extern int lxc_arguments_parse(struct lxc_arguments *args, int argc,
 	}

 	/* Check the command options */
-
 	if (!args->name && strcmp(args->progname, "lxc-autostart") != 0) {
-		lxc_error(args, "missing container name, use --name option");
-		return -1;
+		if (args->argv) {
+			args->name = argv[optind];
+			optind++;
+			args->argv = &argv[optind];
+			args->argc = argc - optind;
+		}
+
+		if (!args->name) {
+			lxc_error(args, "No container name specified");
+			return -1;
+		}
 	}

 	if (args->checker)