<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11435">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add long parameters (--help, --version, ...)<br><br>Makes osmo-trx-* more consistent with other Osmocom programs, and<br>allows an unified test for not having "UNKNOWN" in --version.<br><br>Related: OS#3578<br>Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526<br>---<br>M Transceiver52M/osmo-trx.cpp<br>1 file changed, 12 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/35/11435/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp</span><br><span>index d01a4cf..1caa225 100644</span><br><span>--- a/Transceiver52M/osmo-trx.cpp</span><br><span>+++ b/Transceiver52M/osmo-trx.cpp</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <signal.h></span><br><span> #include <stdlib.h></span><br><span> #include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <getopt.h></span><br><span> #include <sched.h></span><br><span> #include <vector></span><br><span> #include <string></span><br><span>@@ -211,9 +212,9 @@</span><br><span> static void print_help()</span><br><span> {</span><br><span>      fprintf(stdout, "Options:\n"</span><br><span style="color: hsl(0, 100%, 40%);">-          "  -h    This text\n"</span><br><span style="color: hsl(0, 100%, 40%);">-         "  -C    Filename The config file to use\n"</span><br><span style="color: hsl(0, 100%, 40%);">-           "  -V    Print the version of OsmoTRX\n"</span><br><span style="color: hsl(120, 100%, 40%);">+            "  -h, --help      This text\n"</span><br><span style="color: hsl(120, 100%, 40%);">+             "  -C, --config    Filename The config file to use\n"</span><br><span style="color: hsl(120, 100%, 40%);">+               "  -V, --version   Print the version of OsmoTRX\n"</span><br><span>                 );</span><br><span> }</span><br><span> </span><br><span>@@ -230,8 +231,15 @@</span><br><span>   unsigned int i;</span><br><span>      std::vector<std::string> rx_paths, tx_paths;</span><br><span>   bool rx_paths_set = false, tx_paths_set = false;</span><br><span style="color: hsl(120, 100%, 40%);">+      static struct option long_options[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+               {"help", 0, 0, 'h'},</span><br><span style="color: hsl(120, 100%, 40%);">+                {"config-file", 1, 0, 'C'},</span><br><span style="color: hsl(120, 100%, 40%);">+         {"version", 0, 0, 'V' },</span><br><span style="color: hsl(120, 100%, 40%);">+            {NULL, 0, 0, 0}</span><br><span style="color: hsl(120, 100%, 40%);">+       };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  while ((option = getopt(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:V")) != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+  while ((option = getopt_long(argc, argv, "ha:l:i:j:p:c:dmxgfo:s:b:r:A:R:Set:y:z:C:V", long_options,</span><br><span style="color: hsl(120, 100%, 40%);">+         NULL)) != -1) {</span><br><span>              switch (option) {</span><br><span>            case 'h':</span><br><span>                    print_help();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11435">change 11435</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/11435"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I90cf01d972aa10b48c59b67a1e7f82a4255ef526 </div>
<div style="display:none"> Gerrit-Change-Number: 11435 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>