From: Renato Westphal <renato@opensourcerouting.org>
Date: Mon, 19 Dec 2016 20:30:59 +0000 (-0200)
Subject: tools: teach xml2cli.pl the "[]" notation for optional arguments
X-Git-Tag: frr-3.0-branchpoint~94^2~2^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bdcf7abf820d36089feb3000d630227df744858e;p=matthieu%2Ffrr.git

tools: teach xml2cli.pl the "[]" notation for optional arguments

Requested by Daniel Walton.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/tools/xml2cli.pl b/tools/xml2cli.pl
index 1b45e7f726..e0980421bd 100755
--- a/tools/xml2cli.pl
+++ b/tools/xml2cli.pl
@@ -141,6 +141,8 @@ sub generate_arguments {
 		# argument is the name of the node
 		if ($node{'input'} or $node{'type'} eq "select") {
 			$arg_value = "argv[" . $argc . "]->arg";
+		} elsif ($node{'optional'}) {
+			$arg_value = "(argc > " . $argc . " ? argv[" . $argc. "]->arg : NULL)";
 		} else {
 			$arg_value = '"' . $node{'name'} . '"';
 		}
@@ -196,7 +198,11 @@ sub generate_code {
 			$helpstr .= $::options{$options_name}{'help'};
 		} else {
 			$funcname .= $node{'name'} . " ";
-			$cmdstr .= $node{'name'} . " ";
+			if ($node{'optional'}) {
+				$cmdstr .= "[" . $node{'name'} . "] ";
+			} else {
+				$cmdstr .= $node{'name'} . " ";
+			}
 			$helpstr .= "\n       \"" . $node{'help'} . "\\n\"";
 		}
 
@@ -279,6 +285,7 @@ sub parse_tree {
 	$node{'help'} = $xml_node->findvalue('./@help');
 	$node{'function'} = $xml_node->findvalue('./@function');
 	$node{'ifdef'} = $xml_node->findvalue('./@ifdef');
+	$node{'optional'} = $xml_node->findvalue('./@optional');
 
 	# push node to stack
 	push (@nodes, \%node);