[lxc-devel] [lxc/master] tools: make "-n" optional

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 462 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180127/d8575abf/attachment.bin>
-------------- next part --------------
From 1a584ecb057a163002194a6db121b73a18426f5c Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Sat, 27 Jan 2018 14:43:14 +0100
Subject: [PATCH] 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 at ubuntu.com>
---
 src/lxc/tools/arguments.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c
index 30fb714fd..e047cea35 100644
--- a/src/lxc/tools/arguments.c
+++ b/src/lxc/tools/arguments.c
@@ -256,11 +256,13 @@ 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->name && strcmp(args->progname, "lxc-autostart") != 0)
+		if (args->argv) {
+			args->name = argv[optind];
+			optind++;
+			args->argv = &argv[optind];
+			args->argc = argc - optind;
+		}
 
 	if (args->checker)
 		ret = args->checker(args);