<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12771">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: enable tab-completion for optional-multi-choice args<br><br>In cmd_complete_command_real(), detect and strip square braces from<br>multi-choice arguments, to enable tab-completion for commands like<br><br> > list<br> cmd [(alpha|beta)]<br> > cmd <TAB><br> alpha beta<br> > cmd be<TAB><br> > cmd beta<br><br>Change-Id: I8c304300b3633bb6e9b3457fcfa42121c8272ac0<br>---<br>M src/vty/command.c<br>1 file changed, 10 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/command.c b/src/vty/command.c</span><br><span>index 2242e76..de084ab 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -2010,9 +2010,18 @@</span><br><span>                           descvec = vector_slot(strvec, index);</span><br><span>                                for (j = 0; j < vector_active(descvec); j++)</span><br><span>                                      if ((desc = vector_slot(descvec, j))) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                         if ((string = cmd_entry_function(vector_slot(vline, index), desc->cmd)))</span><br><span style="color: hsl(120, 100%, 40%);">+                                           const char *cmd = desc->cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+                                               char *tmp = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+                                           if (CMD_OPTION(desc->cmd)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                                       tmp = cmd_deopt(tall_vty_cmd_ctx, desc->cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+                                                      cmd = tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+                                            }</span><br><span style="color: hsl(120, 100%, 40%);">+                                             if ((string = cmd_entry_function(vector_slot(vline, index), cmd)))</span><br><span>                                                   if (cmd_unique_string (matchvec, string))</span><br><span>                                                            vector_set (matchvec, talloc_strdup(tall_vty_cmd_ctx, string));</span><br><span style="color: hsl(120, 100%, 40%);">+                                               if (tmp)</span><br><span style="color: hsl(120, 100%, 40%);">+                                                      talloc_free(tmp);</span><br><span>                                    }</span><br><span>                    }</span><br><span>            }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12771">change 12771</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12771"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8c304300b3633bb6e9b3457fcfa42121c8272ac0 </div>
<div style="display:none"> Gerrit-Change-Number: 12771 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>