<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20411">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: check for duplicate flags in application specific attributes<br><br>This would facilitate detecting duplicates on early development stages.<br><br>Change-Id: I4e27d6e89d3f851b5ea4f00da01e7093afa537b2<br>Related: SYS#4937<br>---<br>M src/vty/vty.c<br>M tests/vty/vty_test.c<br>M tests/vty/vty_test.err<br>3 files changed, 36 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/20411/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/vty.c b/src/vty/vty.c</span><br><span>index 6e7bdcb..4d51165 100644</span><br><span>--- a/src/vty/vty.c</span><br><span>+++ b/src/vty/vty.c</span><br><span>@@ -66,6 +66,7 @@</span><br><span> #include <osmocom/vty/command.h></span><br><span> #include <osmocom/vty/buffer.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span> </span><br><span> #ifndef MAXPATHLEN</span><br><span> #define MAXPATHLEN 4096</span><br><span>@@ -1794,6 +1795,8 @@</span><br><span> /* Install vty's own commands like `who' command. */</span><br><span> void vty_init(struct vty_app_info *app_info)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i, j;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> tall_vty_ctx = talloc_named_const(NULL, 0, "vty");</span><br><span> tall_vty_vec_ctx = talloc_named_const(tall_vty_ctx, 0, "vty_vector");</span><br><span> tall_vty_cmd_ctx = talloc_named_const(tall_vty_ctx, 0, "vty_command");</span><br><span>@@ -1802,6 +1805,19 @@</span><br><span> </span><br><span> host.app_info = app_info;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check for duplicate flags in application specific attributes (if any) */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(app_info->usr_attr_letters); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (app_info->usr_attr_letters[i] == '\0')</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (j = i + 1; j < ARRAY_SIZE(app_info->usr_attr_letters); j++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (app_info->usr_attr_letters[j] != app_info->usr_attr_letters[i])</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Found duplicate flag letter '%c' in application "</span><br><span style="color: hsl(120, 100%, 40%);">+ "specific attributes (index %u vs %u)! Please fix.\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ app_info->usr_attr_letters[i], i, j);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* For further configuration read, preserve current directory. */</span><br><span> vty_save_cwd();</span><br><span> </span><br><span>diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c</span><br><span>index b2d34ad..1608b83 100644</span><br><span>--- a/tests/vty/vty_test.c</span><br><span>+++ b/tests/vty/vty_test.c</span><br><span>@@ -513,11 +513,29 @@</span><br><span> destroy_test_vty(&test, vty);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Application specific attributes */</span><br><span style="color: hsl(120, 100%, 40%);">+enum vty_test_attr {</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_TEST_ATTR_FOO = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_TEST_ATTR_BAR,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_TEST_ATTR_ZOO,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_TEST_ATTR_FOO_DUP,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_TEST_ATTR_ZOO_DUP,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> struct vty_app_info vty_info = {</span><br><span> .name = "VtyTest",</span><br><span> .version = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .usr_attr_letters = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [VTY_TEST_ATTR_FOO] = 'f',</span><br><span style="color: hsl(120, 100%, 40%);">+ [VTY_TEST_ATTR_BAR] = 'b',</span><br><span style="color: hsl(120, 100%, 40%);">+ [VTY_TEST_ATTR_ZOO] = 'z',</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Duplicate detection check */</span><br><span style="color: hsl(120, 100%, 40%);">+ [VTY_TEST_ATTR_FOO_DUP] = 'f',</span><br><span style="color: hsl(120, 100%, 40%);">+ [VTY_TEST_ATTR_ZOO_DUP] = 'z',</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> const struct log_info_cat default_categories[] = {};</span><br><span>diff --git a/tests/vty/vty_test.err b/tests/vty/vty_test.err</span><br><span>index 8ad4fd9..25c94e6 100644</span><br><span>--- a/tests/vty/vty_test.err</span><br><span>+++ b/tests/vty/vty_test.err</span><br><span>@@ -1,3 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Found duplicate flag letter 'f' in application specific attributes (index 0 vs 3)! Please fix.</span><br><span style="color: hsl(120, 100%, 40%);">+Found duplicate flag letter 'z' in application specific attributes (index 2 vs 4)! Please fix.</span><br><span> Got VTY event: 2</span><br><span> Got VTY event: 2</span><br><span> Got VTY event: 2</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20411">change 20411</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/c/libosmocore/+/20411"/><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-Change-Id: I4e27d6e89d3f851b5ea4f00da01e7093afa537b2 </div>
<div style="display:none"> Gerrit-Change-Number: 20411 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>