From 01e74307978e67b0cdecc23ffdbe92a7fd997ffe Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 20 Feb 2018 17:37:47 +0000
Subject: [PATCH] Remove the old optparse function; options must be specified
 with hyphens.

---
 nbase/nbase.h                     |   6 -
 nbase/nbase_misc.c                |  19 ---
 nmap.cc                           | 108 ++++++++--------
 nping/ArgParser.cc                | 196 +++++++++++++++---------------
 zenmap/zenmapCore/SearchResult.py |   5 -
 5 files changed, 150 insertions(+), 184 deletions(-)

diff --git a/nbase/nbase.h b/nbase/nbase.h
index cdd413440..3869b2d8a 100644
--- a/nbase/nbase.h
+++ b/nbase/nbase.h
@@ -501,12 +501,6 @@ long parse_long(const char *s, char **tail);
    in the supplied buffer. Eg: 0.122MB, 10.322Kb or 128B. */
 char *format_bytecount(unsigned long long bytes, char *buf, size_t buflen);
 
-/* Compare a canonical option name (e.g. "max-scan-delay") with a
-   user-generated option such as "max_scan_delay" and returns 0 if the
-   two values are considered equivalent (for example, - and _ are
-   considered to be the same), nonzero otherwise. */
-int optcmp(const char *a, const char *b);
-
 /* Convert non-printable characters to replchar in the string */
 void replacenonprintable(char *str, int strlength, char replchar);
 
diff --git a/nbase/nbase_misc.c b/nbase/nbase_misc.c
index 308859a7a..c7dd0dbc8 100644
--- a/nbase/nbase_misc.c
+++ b/nbase/nbase_misc.c
@@ -794,25 +794,6 @@ char *format_bytecount(unsigned long long bytes, char *buf, size_t buflen) {
   return buf;
 }
 
-/* Compare a canonical option name (e.g. "max-scan-delay") with a
-   user-generated option such as "max_scan_delay" and returns 0 if the
-   two values are considered equivalent (for example, - and _ are
-   considered to be the same), nonzero otherwise. */
-int optcmp(const char *a, const char *b) {
-  while(*a && *b) {
-    if (*a == '_' || *a == '-') {
-      if (*b != '_' && *b != '-')
-    return 1;
-    }
-    else if (*a != *b)
-      return 1;
-    a++; b++;
-  }
-  if (*a || *b)
-    return 1;
-  return 0;
-}
-
 /* Returns one if the file pathname given exists, is not a directory and
  * is readable by the executing process.  Returns two if it is readable
  * and is a directory.  Otherwise returns 0. */
diff --git a/nmap.cc b/nmap.cc
index 92a8879e6..34d67e83a 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -686,30 +686,30 @@ void parse_options(int argc, char **argv) {
       if (strcmp(long_options[option_index].name, "script") == 0) {
         o.script = true;
         o.chooseScripts(optarg);
-      } else if (optcmp(long_options[option_index].name, "script-args") == 0) {
+      } else if (strcmp(long_options[option_index].name, "script-args") == 0) {
         o.scriptargs = strdup(optarg);
-      } else if (optcmp(long_options[option_index].name, "script-args-file") == 0) {
+      } else if (strcmp(long_options[option_index].name, "script-args-file") == 0) {
         o.scriptargsfile = strdup(optarg);
-      } else if (optcmp(long_options[option_index].name, "script-trace") == 0) {
+      } else if (strcmp(long_options[option_index].name, "script-trace") == 0) {
         o.scripttrace = true;
-      } else if (optcmp(long_options[option_index].name, "script-updatedb") == 0) {
+      } else if (strcmp(long_options[option_index].name, "script-updatedb") == 0) {
         o.scriptupdatedb = true;
-      } else if (optcmp(long_options[option_index].name, "script-help") == 0) {
+      } else if (strcmp(long_options[option_index].name, "script-help") == 0) {
         o.scripthelp = true;
         o.chooseScripts(optarg);
-      } else if (optcmp(long_options[option_index].name, "script-timeout") == 0) {
+      } else if (strcmp(long_options[option_index].name, "script-timeout") == 0) {
         d = tval2secs(optarg);
         if (d < 0 || d > LONG_MAX)
           fatal("Bogus --script-timeout argument specified");
         delayed_options.pre_scripttimeout = d;
       } else
 #endif
-        if (optcmp(long_options[option_index].name, "max-os-tries") == 0) {
+        if (strcmp(long_options[option_index].name, "max-os-tries") == 0) {
           l = atoi(optarg);
           if (l < 1 || l > 50)
             fatal("Bogus --max-os-tries argument specified, must be between 1 and 50 (inclusive)");
           o.setMaxOSTries(l);
-        } else if (optcmp(long_options[option_index].name, "max-rtt-timeout") == 0) {
+        } else if (strcmp(long_options[option_index].name, "max-rtt-timeout") == 0) {
           l = tval2msecs(optarg);
           if (l < 5)
             fatal("Bogus --max-rtt-timeout argument specified, must be at least 5ms");
@@ -718,14 +718,14 @@ void parse_options(int argc, char **argv) {
           if (l < 20)
             error("WARNING: You specified a round-trip time timeout (%ld ms) that is EXTRAORDINARILY SMALL.  Accuracy may suffer.", l);
           delayed_options.pre_max_rtt_timeout = l;
-        } else if (optcmp(long_options[option_index].name, "min-rtt-timeout") == 0) {
+        } else if (strcmp(long_options[option_index].name, "min-rtt-timeout") == 0) {
           l = tval2msecs(optarg);
           if (l < 0)
             fatal("Bogus --min-rtt-timeout argument specified");
           if (l >= 50 * 1000 && tval_unit(optarg) == NULL)
             fatal("Since April 2010, the default unit for --min-rtt-timeout is seconds, so your time of \"%s\" is %g seconds. Use \"%sms\" for %g milliseconds.", optarg, l / 1000.0, optarg, l / 1000.0);
           delayed_options.pre_min_rtt_timeout = l;
-        } else if (optcmp(long_options[option_index].name, "initial-rtt-timeout") == 0) {
+        } else if (strcmp(long_options[option_index].name, "initial-rtt-timeout") == 0) {
           l = tval2msecs(optarg);
           if (l <= 0)
             fatal("Bogus --initial-rtt-timeout argument specified.  Must be positive");
@@ -736,9 +736,9 @@ void parse_options(int argc, char **argv) {
           delayed_options.exclude_file = strdup(optarg);
         } else if (strcmp(long_options[option_index].name, "exclude") == 0) {
           delayed_options.exclude_spec = strdup(optarg);
-        } else if (optcmp(long_options[option_index].name, "max-hostgroup") == 0) {
+        } else if (strcmp(long_options[option_index].name, "max-hostgroup") == 0) {
           o.setMaxHostGroupSz(atoi(optarg));
-        } else if (optcmp(long_options[option_index].name, "min-hostgroup") == 0) {
+        } else if (strcmp(long_options[option_index].name, "min-hostgroup") == 0) {
           o.setMinHostGroupSz(atoi(optarg));
           if (atoi(optarg) > 100)
             error("Warning: You specified a highly aggressive --min-hostgroup.");
@@ -755,16 +755,16 @@ void parse_options(int argc, char **argv) {
           delayed_options.iflist = true;
         } else if (strcmp(long_options[option_index].name, "nogcc") == 0) {
           o.nogcc = true;
-        } else if (optcmp(long_options[option_index].name, "release-memory") == 0) {
+        } else if (strcmp(long_options[option_index].name, "release-memory") == 0) {
           o.release_memory = true;
-        } else if (optcmp(long_options[option_index].name, "min-parallelism") == 0) {
+        } else if (strcmp(long_options[option_index].name, "min-parallelism") == 0) {
           o.min_parallelism = atoi(optarg);
           if (o.min_parallelism < 1)
             fatal("Argument to --min-parallelism must be at least 1!");
           if (o.min_parallelism > 100) {
             error("Warning: Your --min-parallelism option is pretty high!  This can hurt reliability.");
           }
-        } else if (optcmp(long_options[option_index].name, "host-timeout") == 0) {
+        } else if (strcmp(long_options[option_index].name, "host-timeout") == 0) {
           l = tval2msecs(optarg);
           if (l <= 0)
             fatal("Bogus --host-timeout argument specified");
@@ -783,70 +783,70 @@ void parse_options(int argc, char **argv) {
           o.fastscan = true;
         } else if (strcmp(long_options[option_index].name, "versiondb") == 0) {
           o.requested_data_files["nmap-service-probes"] = optarg;
-        } else if (optcmp(long_options[option_index].name, "append-output") == 0) {
+        } else if (strcmp(long_options[option_index].name, "append-output") == 0) {
           o.append_output = true;
         } else if (strcmp(long_options[option_index].name, "noninteractive") == 0) {
           o.noninteractive = true;
-        } else if (optcmp(long_options[option_index].name, "spoof-mac") == 0) {
+        } else if (strcmp(long_options[option_index].name, "spoof-mac") == 0) {
           /* I need to deal with this later, once I'm sure that I have output
              files set up, --datadir, etc. */
           delayed_options.spoofmac = optarg;
         } else if (strcmp(long_options[option_index].name, "allports") == 0) {
           o.override_excludeports = true;
-        } else if (optcmp(long_options[option_index].name, "version-intensity") == 0) {
+        } else if (strcmp(long_options[option_index].name, "version-intensity") == 0) {
           o.version_intensity = atoi(optarg);
           if (o.version_intensity < 0 || o.version_intensity > 9)
             fatal("version-intensity must be between 0 and 9");
-        } else if (optcmp(long_options[option_index].name, "version-light") == 0) {
+        } else if (strcmp(long_options[option_index].name, "version-light") == 0) {
           o.version_intensity = 2;
-        } else if (optcmp(long_options[option_index].name, "version-all") == 0) {
+        } else if (strcmp(long_options[option_index].name, "version-all") == 0) {
           o.version_intensity = 9;
-        } else if (optcmp(long_options[option_index].name, "scan-delay") == 0) {
+        } else if (strcmp(long_options[option_index].name, "scan-delay") == 0) {
           l = tval2msecs(optarg);
           if (l < 0)
             fatal("Bogus --scan-delay argument specified.");
           if (l >= 100 * 1000 && tval_unit(optarg) == NULL)
             fatal("Since April 2010, the default unit for --scan-delay is seconds, so your time of \"%s\" is %.1f minutes. Use \"%sms\" for %g milliseconds.", optarg, l / 1000.0 / 60, optarg, l / 1000.0);
           delayed_options.pre_scan_delay = l;
-        } else if (optcmp(long_options[option_index].name, "defeat-rst-ratelimit") == 0) {
+        } else if (strcmp(long_options[option_index].name, "defeat-rst-ratelimit") == 0) {
           o.defeat_rst_ratelimit = true;
-        } else if (optcmp(long_options[option_index].name, "defeat-icmp-ratelimit") == 0) {
+        } else if (strcmp(long_options[option_index].name, "defeat-icmp-ratelimit") == 0) {
           o.defeat_icmp_ratelimit = true;
-        } else if (optcmp(long_options[option_index].name, "max-scan-delay") == 0) {
+        } else if (strcmp(long_options[option_index].name, "max-scan-delay") == 0) {
           l = tval2msecs(optarg);
           if (l < 0)
             fatal("Bogus --max-scan-delay argument specified.");
           if (l >= 100 * 1000 && tval_unit(optarg) == NULL)
             fatal("Since April 2010, the default unit for --max-scan-delay is seconds, so your time of \"%s\" is %.1f minutes. If this is what you want, use \"%ss\".", optarg, l / 1000.0 / 60, optarg);
           delayed_options.pre_max_scan_delay = l;
-        } else if (optcmp(long_options[option_index].name, "max-retries") == 0) {
+        } else if (strcmp(long_options[option_index].name, "max-retries") == 0) {
           delayed_options.pre_max_retries = atoi(optarg);
           if (delayed_options.pre_max_retries < 0)
             fatal("max-retries must be positive");
-        } else if (optcmp(long_options[option_index].name, "randomize-hosts") == 0
+        } else if (strcmp(long_options[option_index].name, "randomize-hosts") == 0
                    || strcmp(long_options[option_index].name, "rH") == 0) {
           o.randomize_hosts = true;
           o.ping_group_sz = PING_GROUP_SZ * 4;
-        } else if (optcmp(long_options[option_index].name, "nsock-engine") == 0) {
+        } else if (strcmp(long_options[option_index].name, "nsock-engine") == 0) {
           if (nsock_set_default_engine(optarg) < 0)
             fatal("Unknown or non-available engine: %s", optarg);
-        } else if ((optcmp(long_options[option_index].name, "proxies") == 0) || (optcmp(long_options[option_index].name, "proxy") == 0)) {
+        } else if ((strcmp(long_options[option_index].name, "proxies") == 0) || (strcmp(long_options[option_index].name, "proxy") == 0)) {
           if (nsock_proxychain_new(optarg, &o.proxy_chain, NULL) < 0)
             fatal("Invalid proxy chain specification");
-        } else if (optcmp(long_options[option_index].name, "osscan-limit")  == 0) {
+        } else if (strcmp(long_options[option_index].name, "osscan-limit")  == 0) {
           o.osscan_limit = true;
-        } else if (optcmp(long_options[option_index].name, "osscan-guess")  == 0
+        } else if (strcmp(long_options[option_index].name, "osscan-guess")  == 0
                    || strcmp(long_options[option_index].name, "fuzzy") == 0) {
           o.osscan_guess = true;
-        } else if (optcmp(long_options[option_index].name, "packet-trace") == 0) {
+        } else if (strcmp(long_options[option_index].name, "packet-trace") == 0) {
           o.setPacketTrace(true);
 #ifndef NOLUA
           o.scripttrace = true;
 #endif
-        } else if (optcmp(long_options[option_index].name, "version-trace") == 0) {
+        } else if (strcmp(long_options[option_index].name, "version-trace") == 0) {
           o.setVersionTrace(true);
           o.debugging++;
-        } else if (optcmp(long_options[option_index].name, "data") == 0) {
+        } else if (strcmp(long_options[option_index].name, "data") == 0) {
           if (o.extra_payload)
             fatal("Can't use the --data option(s) multiple times, or together.");
           u8 *tempbuff=NULL;
@@ -860,7 +860,7 @@ void parse_options(int argc, char **argv) {
           }
           if (o.extra_payload_length > 1400) /* 1500 - IP with opts - TCP with opts. */
             error("WARNING: Payloads bigger than 1400 bytes may not be sent successfully.");
-        } else if (optcmp(long_options[option_index].name, "data-string") == 0) {
+        } else if (strcmp(long_options[option_index].name, "data-string") == 0) {
           if (o.extra_payload)
             fatal("Can't use the --data option(s) multiple times, or together.");
           o.extra_payload_length = strlen(optarg);
@@ -869,7 +869,7 @@ void parse_options(int argc, char **argv) {
           if (o.extra_payload_length > 1400) /* 1500 - IP with opts - TCP with opts. */
             error("WARNING: Payloads bigger than 1400 bytes may not be sent successfully.");
           o.extra_payload = strdup(optarg);
-        } else if (optcmp(long_options[option_index].name, "data-length") == 0) {
+        } else if (strcmp(long_options[option_index].name, "data-length") == 0) {
           if (o.extra_payload)
             fatal("Can't use the --data option(s) multiple times, or together.");
           o.extra_payload_length = (int)strtol(optarg, NULL, 10);
@@ -879,25 +879,25 @@ void parse_options(int argc, char **argv) {
             error("WARNING: Payloads bigger than 1400 bytes may not be sent successfully.");
           o.extra_payload = (char *) safe_malloc(MAX(o.extra_payload_length, 1));
           get_random_bytes(o.extra_payload, o.extra_payload_length);
-        } else if (optcmp(long_options[option_index].name, "send-eth") == 0) {
+        } else if (strcmp(long_options[option_index].name, "send-eth") == 0) {
           o.sendpref = PACKET_SEND_ETH_STRONG;
-        } else if (optcmp(long_options[option_index].name, "send-ip") == 0) {
+        } else if (strcmp(long_options[option_index].name, "send-ip") == 0) {
           o.sendpref = PACKET_SEND_IP_STRONG;
         } else if (strcmp(long_options[option_index].name, "stylesheet") == 0) {
           o.setXSLStyleSheet(optarg);
-        } else if (optcmp(long_options[option_index].name, "no-stylesheet") == 0) {
+        } else if (strcmp(long_options[option_index].name, "no-stylesheet") == 0) {
           o.setXSLStyleSheet(NULL);
-        } else if (optcmp(long_options[option_index].name, "system-dns") == 0) {
+        } else if (strcmp(long_options[option_index].name, "system-dns") == 0) {
           o.mass_dns = false;
-        } else if (optcmp(long_options[option_index].name, "dns-servers") == 0) {
+        } else if (strcmp(long_options[option_index].name, "dns-servers") == 0) {
           o.dns_servers = strdup(optarg);
-        } else if (optcmp(long_options[option_index].name, "resolve-all") == 0) {
+        } else if (strcmp(long_options[option_index].name, "resolve-all") == 0) {
           o.resolve_all = true;
-        } else if (optcmp(long_options[option_index].name, "log-errors") == 0) {
+        } else if (strcmp(long_options[option_index].name, "log-errors") == 0) {
           /*Nmap Log errors is deprecated and is now always enabled by default.
           This option is left in so as to not break anybody's scanning scripts.
           However it does nothing*/
-        } else if (optcmp(long_options[option_index].name, "deprecated-xml-osclass") == 0) {
+        } else if (strcmp(long_options[option_index].name, "deprecated-xml-osclass") == 0) {
           o.deprecated_xml_osclass = true;
         } else if (strcmp(long_options[option_index].name, "webxml") == 0) {
           o.setXSLStyleSheet("https://svn.nmap.org/nmap/docs/nmap.xsl");
@@ -969,21 +969,21 @@ void parse_options(int argc, char **argv) {
           o.fragscan = atoi(optarg);
           if (o.fragscan <= 0 || o.fragscan % 8 != 0)
             fatal("Data payload MTU must be >0 and multiple of 8");
-        } else if (optcmp(long_options[option_index].name, "port-ratio") == 0) {
+        } else if (strcmp(long_options[option_index].name, "port-ratio") == 0) {
           char *ptr;
           o.topportlevel = strtod(optarg, &ptr);
           if (!ptr || o.topportlevel < 0 || o.topportlevel >= 1)
             fatal("--port-ratio should be between [0 and 1)");
-        } else if (optcmp(long_options[option_index].name, "exclude-ports") == 0) {
+        } else if (strcmp(long_options[option_index].name, "exclude-ports") == 0) {
           if (o.exclude_portlist)
             fatal("Only 1 --exclude-ports option allowed, separate multiple ranges with commas.");
           o.exclude_portlist = strdup(optarg);
-        } else if (optcmp(long_options[option_index].name, "top-ports") == 0) {
+        } else if (strcmp(long_options[option_index].name, "top-ports") == 0) {
           char *ptr;
           o.topportlevel = strtod(optarg, &ptr);
           if (!ptr || o.topportlevel < 1 || ((double)((int)o.topportlevel)) != o.topportlevel)
             fatal("--top-ports should be an integer 1 or greater");
-        } else if (optcmp(long_options[option_index].name, "ip-options") == 0) {
+        } else if (strcmp(long_options[option_index].name, "ip-options") == 0) {
           o.ipoptions    = (u8*) safe_malloc(4 * 10 + 1);
           if ((o.ipoptionslen = parse_ip_options(optarg, o.ipoptions, 4 * 10 + 1, &o.ipopt_firsthop, &o.ipopt_lasthop, errstr, sizeof(errstr))) == OP_FAILURE)
             fatal("%s", errstr);
@@ -995,26 +995,26 @@ void parse_options(int argc, char **argv) {
           o.traceroute = true;
         } else if (strcmp(long_options[option_index].name, "reason") == 0) {
           o.reason = true;
-        } else if (optcmp(long_options[option_index].name, "min-rate") == 0) {
+        } else if (strcmp(long_options[option_index].name, "min-rate") == 0) {
           if (sscanf(optarg, "%f", &o.min_packet_send_rate) != 1 || o.min_packet_send_rate <= 0.0)
             fatal("Argument to --min-rate must be a positive floating-point number");
-        } else if (optcmp(long_options[option_index].name, "max-rate") == 0) {
+        } else if (strcmp(long_options[option_index].name, "max-rate") == 0) {
           if (sscanf(optarg, "%f", &o.max_packet_send_rate) != 1 || o.max_packet_send_rate <= 0.0)
             fatal("Argument to --max-rate must be a positive floating-point number");
-        } else if (optcmp(long_options[option_index].name, "adler32") == 0) {
+        } else if (strcmp(long_options[option_index].name, "adler32") == 0) {
           o.adler32 = true;
-        } else if (optcmp(long_options[option_index].name, "stats-every") == 0) {
+        } else if (strcmp(long_options[option_index].name, "stats-every") == 0) {
           d = tval2secs(optarg);
           if (d < 0 || d > LONG_MAX)
             fatal("Bogus --stats-every argument specified");
           o.stats_interval = d;
-        } else if (optcmp(long_options[option_index].name, "disable-arp-ping") == 0) {
+        } else if (strcmp(long_options[option_index].name, "disable-arp-ping") == 0) {
           o.implicitARPPing = false;
-        } else if (optcmp(long_options[option_index].name, "route-dst") == 0) {
+        } else if (strcmp(long_options[option_index].name, "route-dst") == 0) {
           /* The --route-dst debugging option: push these on a list to be
              resolved later after options like -6 and -S have been parsed. */
           route_dst_hosts.push_back(optarg);
-        } else if (optcmp(long_options[option_index].name, "resume") == 0) {
+        } else if (strcmp(long_options[option_index].name, "resume") == 0) {
           fatal("Cannot use --resume with other options. Usage: nmap --resume <filename>");
         } else {
           fatal("Unknown long option (%s) given@#!$#$", long_options[option_index].name);
diff --git a/nping/ArgParser.cc b/nping/ArgParser.cc
index 67da95196..1120dc3ef 100644
--- a/nping/ArgParser.cc
+++ b/nping/ArgParser.cc
@@ -330,85 +330,85 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
    case 0:
 
 /* PROBE MODES ***************************************************************/
-    if (optcmp(long_options[option_index].name, "tcp-connect") == 0) {
+    if (strcmp(long_options[option_index].name, "tcp-connect") == 0) {
         if( o.issetMode() && o.getMode()!=TCP_CONNECT)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(TCP_CONNECT) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(TCP_CONNECT);              	
-    } else if (optcmp(long_options[option_index].name, "tcp") == 0) {
+    } else if (strcmp(long_options[option_index].name, "tcp") == 0) {
         if( o.issetMode() && o.getMode()!=TCP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(TCP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(TCP);              	
-    } else if (optcmp(long_options[option_index].name, "udp") == 0) {
+    } else if (strcmp(long_options[option_index].name, "udp") == 0) {
         if( o.issetMode() && o.getMode()!=UDP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(UDP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(UDP);
-    } else if (optcmp(long_options[option_index].name, "icmp") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp") == 0) {
         if( o.issetMode() && o.getMode()!=ICMP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(ICMP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(ICMP);
-    } else if (optcmp(long_options[option_index].name, "arp") == 0) {
+    } else if (strcmp(long_options[option_index].name, "arp") == 0) {
         if( o.issetMode() && o.getMode()!=ARP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(ARP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(ARP);
-    } else if (optcmp(long_options[option_index].name, "traceroute") == 0 ||
-               optcmp(long_options[option_index].name, "tr") == 0) {
+    } else if (strcmp(long_options[option_index].name, "traceroute") == 0 ||
+               strcmp(long_options[option_index].name, "tr") == 0) {
         o.enableTraceroute();
 
     /* Now shortcuts that we support but that are not actual modes */
-    } else if (optcmp(long_options[option_index].name, "arp-request") == 0) {
+    } else if (strcmp(long_options[option_index].name, "arp-request") == 0) {
         if( o.issetMode() && o.getMode()!=ARP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(ARP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(ARP);
         o.setARPOpCode(OP_ARP_REQUEST);
-    } else if (optcmp(long_options[option_index].name, "arp-reply") == 0) {
+    } else if (strcmp(long_options[option_index].name, "arp-reply") == 0) {
         if( o.issetMode() && o.getMode()!=ARP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(ARP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(ARP);
         o.setARPOpCode(OP_ARP_REPLY);
-    } else if (optcmp(long_options[option_index].name, "rarp-request") == 0) {
+    } else if (strcmp(long_options[option_index].name, "rarp-request") == 0) {
         if( o.issetMode() && o.getMode()!=ARP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(ARP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(ARP);
         o.setARPOpCode(OP_RARP_REQUEST);
-    } else if (optcmp(long_options[option_index].name, "rarp-reply") == 0) {
+    } else if (strcmp(long_options[option_index].name, "rarp-reply") == 0) {
         if( o.issetMode() && o.getMode()!=ARP)
             nping_fatal(QT_3,"Cannot specify more than one probe mode. Choose either %s or %s.",
                    strdup( o.mode2Ascii(ARP) ),  strdup( o.mode2Ascii(o.getMode()) ) );
         o.setMode(ARP);
         o.setARPOpCode(OP_RARP_REPLY);
-    } else if (optcmp(long_options[option_index].name, "destination-unreachable") == 0 ||
-               optcmp(long_options[option_index].name, "dest-unr") == 0) {
+    } else if (strcmp(long_options[option_index].name, "destination-unreachable") == 0 ||
+               strcmp(long_options[option_index].name, "dest-unr") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP Destination unreachable messages.", o.mode2Ascii(o.getMode()));
         o.setMode(ICMP);
         o.setICMPType( ICMP_UNREACH );
-    } else if( optcmp(long_options[option_index].name, "echo-request") == 0) {
+    } else if( strcmp(long_options[option_index].name, "echo-request") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP Echo request messages.", o.mode2Ascii(o.getMode()));
         o.setMode(ICMP);
         o.setICMPType( ICMP_ECHO );
-    } else if (optcmp(long_options[option_index].name, "timestamp") == 0 ||
-               optcmp(long_options[option_index].name, "timestamp-request") == 0) {
+    } else if (strcmp(long_options[option_index].name, "timestamp") == 0 ||
+               strcmp(long_options[option_index].name, "timestamp-request") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP Timestamp request messages.", o.mode2Ascii(o.getMode()));
         o.setMode(ICMP);
         o.setICMPType( ICMP_TSTAMP );
-    } else if (optcmp(long_options[option_index].name, "information") == 0 ||
-               optcmp(long_options[option_index].name, "information-request") == 0 ) {
+    } else if (strcmp(long_options[option_index].name, "information") == 0 ||
+               strcmp(long_options[option_index].name, "information-request") == 0 ) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP Information request messages.", o.mode2Ascii(o.getMode()));
         o.setMode(ICMP);
         o.setICMPType( ICMP_TSTAMP );
-    } else if (optcmp(long_options[option_index].name, "netmask") == 0 ||
-               optcmp(long_options[option_index].name, "netmask-request") == 0) {
+    } else if (strcmp(long_options[option_index].name, "netmask") == 0 ||
+               strcmp(long_options[option_index].name, "netmask-request") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP Information request messages.", o.mode2Ascii(o.getMode()));
         o.setMode(ICMP);
@@ -417,13 +417,13 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
 
 /* TCP/UDP OPTIONS ***********************************************************/
     /* TCP Sequence number */
-    } else if (optcmp(long_options[option_index].name, "seq") == 0) {
+    } else if (strcmp(long_options[option_index].name, "seq") == 0) {
         if ( parse_u32(optarg, &aux32) != OP_SUCCESS )
             nping_fatal(QT_3, "Invalid TCP Sequence number. Value must be 0<=N<2^32.");
         else
             o.setTCPSequence( aux32 );
     /* TCP Flags */
-    } else if (optcmp(long_options[option_index].name, "flags") == 0) {
+    } else if (strcmp(long_options[option_index].name, "flags") == 0) {
         /* CASE 1: User is a freak and supplied a numeric value directly */
         /* We initially parse it as an u32 so we give the proper error 
          * for values like 0x100. */
@@ -529,24 +529,24 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
             }
         }
     /* TCP Acknowledgement number */
-    } else if (optcmp(long_options[option_index].name, "ack") == 0) {
+    } else if (strcmp(long_options[option_index].name, "ack") == 0) {
         if ( parse_u32(optarg, &aux32) != OP_SUCCESS )
             nping_fatal(QT_3, "Invalid TCP ACK number. Value must be 0<=N<2^32.");
         else
            o.setTCPAck( aux32 );
     /* TCP Window size */
-    } else if (optcmp(long_options[option_index].name, "win") == 0) {
+    } else if (strcmp(long_options[option_index].name, "win") == 0) {
         if ( parse_u16(optarg, &aux16) != OP_SUCCESS )
              nping_fatal(QT_3, "Invalid TCP Window size. Value must be 0<=N<65535.");
         else
            o.setTCPWindow( aux16 );
     /* Set a bad TCP checksum */
-    } else if (optcmp(long_options[option_index].name, "badsum") == 0) {
+    } else if (strcmp(long_options[option_index].name, "badsum") == 0) {
         o.enableBadsum();
 
 /* ICMP OPTIONS **************************************************************/
     /* ICMP Type */
-    } else if (optcmp(long_options[option_index].name, "icmp-type") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-type") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         /* User may have supplied type as a number */
@@ -562,7 +562,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         if( !isICMPType(aux8) )
             nping_warning(QT_1, "Warning: Specified ICMP type (%d) is not RFC compliant.", aux8); 
     /* ICMP Code */
-    } else if (optcmp(long_options[option_index].name, "icmp-code") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-code") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         /* User may have supplied code as a number */
@@ -575,7 +575,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         else
            nping_fatal(QT_3, "Invalid ICMP Code. Value must be 0<=N<=255.");
     /* ICMP Identification field */
-    } else if (optcmp(long_options[option_index].name, "icmp-id") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-id") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         if ( parse_u16(optarg, &aux16) == OP_SUCCESS )
@@ -583,7 +583,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         else
             nping_fatal(QT_3, "Invalid ICMP Identifier. Value must be 0<=N<2^16.");
     /* ICMP Sequence number */
-    } else if (optcmp(long_options[option_index].name, "icmp-seq") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-seq") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         if ( parse_u16(optarg, &aux16) == OP_SUCCESS )
@@ -591,7 +591,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         else
             nping_fatal(QT_3, "Invalid ICMP Sequence number. Value must be 0<=N<2^16.");
     /* ICMP Redirect Address */
-    } else if (optcmp(long_options[option_index].name, "icmp-redirect-addr") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-redirect-addr") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         if( meansRandom(optarg) ){
@@ -604,7 +604,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
                 o.setICMPRedirectAddress( aux_ip4 );
         }
     /* ICMP Parameter problem pointer */
-    } else if (optcmp(long_options[option_index].name, "icmp-param-pointer") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-param-pointer") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         if ( parse_u8(optarg, &aux8) == OP_SUCCESS )
@@ -612,7 +612,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         else
             nping_fatal(QT_3, "Invalid ICMP Parameter problem pointer. Value must be 0<=N<=255..");
     /* ICMP Router Advertisement lifetime */
-    } else if (optcmp(long_options[option_index].name, "icmp-advert-lifetime") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-advert-lifetime") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         if ( parse_u16(optarg, &aux16) == OP_SUCCESS )
@@ -620,7 +620,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         else
             nping_fatal(QT_3, "Invalid ICMP Router advertisement lifetime. Value must be 0<=N<2^16..");
     /* ICMP Router Advertisement entry */
-    } else if (optcmp(long_options[option_index].name, "icmp-advert-entry") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-advert-entry") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         /* Format should be "IPADDR,PREF":  "192.168.10.99,31337" */
@@ -634,19 +634,19 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
             o.addICMPAdvertEntry(aux_addr, aux_pref);
         }
     /* ICMP Timestamp originate timestamp */
-    } else if (optcmp(long_options[option_index].name, "icmp-orig-time") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-orig-time") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         this->parseICMPTimestamp(optarg, &aux32);
         o.setICMPOriginateTimestamp(aux32);
     /* ICMP Timestamp receive timestamp */
-    } else if (optcmp(long_options[option_index].name, "icmp-recv-time") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-recv-time") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         this->parseICMPTimestamp(optarg, &aux32);
         o.setICMPReceiveTimestamp(aux32);
     /* ICMP Timestamp transmit timestamp */
-    } else if (optcmp(long_options[option_index].name, "icmp-trans-time") == 0) {
+    } else if (strcmp(long_options[option_index].name, "icmp-trans-time") == 0) {
         if ( o.issetMode() && o.getMode() != ICMP )
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ICMP messages.", o.mode2Ascii(o.getMode()));
         this->parseICMPTimestamp(optarg, &aux32);
@@ -656,14 +656,14 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
 
 /* ARP/RARP OPTIONS **********************************************************/
     /* Operation code */
-    } else if (optcmp(long_options[option_index].name, "arp-type") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-type") == 0 ||
-               optcmp(long_options[option_index].name, "arp-code") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-code") == 0 ||
-               optcmp(long_options[option_index].name, "arp-operation") == 0 ||
-               optcmp(long_options[option_index].name, "arp-op") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-operation") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-op") == 0 ){            
+    } else if (strcmp(long_options[option_index].name, "arp-type") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-type") == 0 ||
+               strcmp(long_options[option_index].name, "arp-code") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-code") == 0 ||
+               strcmp(long_options[option_index].name, "arp-operation") == 0 ||
+               strcmp(long_options[option_index].name, "arp-op") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-operation") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-op") == 0 ){
         if ( o.issetMode() && o.getMode() != ARP ){
             nping_fatal(QT_3,"You cannot specify mode %s if you want to send ARP messages.", o.mode2Ascii(o.getMode()));
         }else if( !o.issetMode() ){
@@ -675,32 +675,32 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
             o.setARPOpCode(aux16);
         }
     /* ARP Sender MAC Address */
-    } else if (optcmp(long_options[option_index].name, "arp-sender-mac") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-sender-mac") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "arp-sender-mac") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-sender-mac") == 0 ){
         if ( parseMAC(optarg, auxmac) != OP_SUCCESS ){
             nping_fatal(QT_3, "Invalid ARP Sender MAC address.");
         }else{
             o.setARPSenderHwAddr(auxmac);
         }
     /* ARP Sender IP Address */
-    } else if (optcmp(long_options[option_index].name, "arp-sender-ip") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-sender-ip") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "arp-sender-ip") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-sender-ip") == 0 ){
         if ( atoIP(optarg, &aux_ip4)!=OP_SUCCESS ){
             nping_fatal(QT_3, "Invalid ARP Sender IP address.");
         }else{
             o.setARPSenderProtoAddr(aux_ip4);
         }
     /* ARP Target MAC Address */
-    } else if (optcmp(long_options[option_index].name, "arp-target-mac") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-target-mac") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "arp-target-mac") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-target-mac") == 0 ){
         if ( parseMAC(optarg, auxmac) != OP_SUCCESS ){
             nping_fatal(QT_3, "Invalid ARP Target MAC address.");
         }else{
             o.setARPTargetHwAddr(auxmac);
         }
     /* ARP Target IP Address */
-    } else if (optcmp(long_options[option_index].name, "arp-target-ip") == 0 ||
-               optcmp(long_options[option_index].name, "rarp-target-ip") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "arp-target-ip") == 0 ||
+               strcmp(long_options[option_index].name, "rarp-target-ip") == 0 ){
         if ( atoIP(optarg, &aux_ip4)!=OP_SUCCESS ){
             nping_fatal(QT_3, "Invalid ARP Target IP address.");
         }else{
@@ -710,7 +710,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
 
 /* ETHERNET OPTIONS **********************************************************/
     /* Destination MAC address */
-    } else if (optcmp(long_options[option_index].name, "dest-mac") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "dest-mac") == 0 ){
         if ( parseMAC(optarg, auxmac) != OP_SUCCESS ){
             nping_fatal(QT_3, "Invalid Ethernet Destination MAC address.");
         }else{
@@ -719,8 +719,8 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         if( !o.issetSendPreference() )
             o.setSendPreference(PACKET_SEND_ETH_STRONG);
     /* Source MAC address */
-    } else if (optcmp(long_options[option_index].name, "source-mac") == 0 ||
-               optcmp(long_options[option_index].name, "spoof-mac") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "source-mac") == 0 ||
+               strcmp(long_options[option_index].name, "spoof-mac") == 0 ){
         if ( parseMAC(optarg, auxmac) != OP_SUCCESS ){
             nping_fatal(QT_3, "Invalid Ethernet Source MAC address.");
         }else{
@@ -729,9 +729,9 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         if( !o.issetSendPreference() )
             o.setSendPreference(PACKET_SEND_ETH_STRONG);
     /* Ethernet type field */       
-    } else if (optcmp(long_options[option_index].name, "ethertype") == 0 ||
-               optcmp(long_options[option_index].name, "ethtype") == 0 ||
-               optcmp(long_options[option_index].name, "ether-type") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "ethertype") == 0 ||
+               strcmp(long_options[option_index].name, "ethtype") == 0 ||
+               strcmp(long_options[option_index].name, "ether-type") == 0 ){
         if ( parse_u16(optarg, &aux16) == OP_SUCCESS ){
             o.setEtherType(aux16);
         }else if ( atoEtherType(optarg, &aux16) == OP_SUCCESS ){
@@ -746,31 +746,31 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
 /* IPv4 OPTIONS **************************************************************/
     /* Destination IP address. This is just another way to specify targets,
      * provided for consistency with the rest of the parameters. */
-    } else if (optcmp(long_options[option_index].name, "dest-ip") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "dest-ip") == 0 ){
         o.targets.addSpec( strdup(optarg) );
     /* IP Type of service*/
-    } else if (optcmp(long_options[option_index].name, "tos") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "tos") == 0 ){
         if ( parse_u8(optarg, &aux8) == OP_SUCCESS ){
             o.setTOS(aux8);
         }else{
             nping_fatal(QT_3,"TOS option must be a number between 0 and 255 (inclusive)");
         }
     /* IP Identification field */
-    } else if (optcmp(long_options[option_index].name, "id") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "id") == 0 ){
         if ( parse_u16(optarg, &aux16) == OP_SUCCESS ){
             o.setIdentification(aux16);
         }else{
             nping_fatal(QT_3,"Identification must be a number between 0 and 65535 (inclusive)");
         }
     /* Don't fragment bit */
-    } else if (optcmp(long_options[option_index].name, "df") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "df") == 0 ){
         o.setDF();
     /* More fragments bit */
-    } else if (optcmp(long_options[option_index].name, "mf") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "mf") == 0 ){
         o.setMF();
     /* Time to live (hop-limit in IPv6) */
-    } else if (optcmp(long_options[option_index].name, "ttl") == 0  ||
-               optcmp(long_options[option_index].name, "hop-limit") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "ttl") == 0  ||
+               strcmp(long_options[option_index].name, "hop-limit") == 0 ){
                /* IPv6 TTL field is named "hop limit" but has exactly the same
                 * function as in IPv4 so handling of that option should be the
                 * same in both versions. */
@@ -778,7 +778,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
             o.setTTL(aux8);
         }else{
             nping_fatal(QT_3,"%s option must be a number between 0 and 255 (inclusive)",
-             optcmp(long_options[option_index].name, "ttl")==0 ? "TTL" : "Hop Limit"
+             strcmp(long_options[option_index].name, "ttl")==0 ? "TTL" : "Hop Limit"
             );
         }
         /* TODO: At some point we may want to let users specify TTLs like "linux",
@@ -786,10 +786,10 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
          * http://members.cox.net/~ndav1/self_published/TTL_values.html
          * for more information */
     /* Set up a bad IP checksum */
-    } else if (optcmp(long_options[option_index].name, "badsum-ip") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "badsum-ip") == 0 ){
         o.enableBadsumIP();
     /* IP Options */
-    } else if (optcmp(long_options[option_index].name, "ip-options") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "ip-options") == 0 ){
         /* We need to know if options specification is correct so we perform
          * a little test here, instead of waiting until the IPv4Header
          * complains and fatal()s we just call parse_ip_options() ourselves.
@@ -801,7 +801,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
          /* If we get here it's safe to store the options */
          o.setIPOptions( optarg );
     /* Maximum Transmission Unit */
-    } else if (optcmp(long_options[option_index].name, "mtu") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "mtu") == 0 ){
         /* Special treatment for random here since the generated number must be n%8==0 */
         if(!strcasecmp("rand", optarg) || !strcasecmp("random", optarg)){
             aux16=get_random_u16(); /* We limit the random mtu to a max of 65535 */
@@ -820,14 +820,14 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
 
 /* IPv6 OPTIONS **************************************************************/
     /* IPv6 Traffic class */
-    } else if (optcmp(long_options[option_index].name, "traffic-class") == 0 ||
-               optcmp(long_options[option_index].name, "tc") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "traffic-class") == 0 ||
+               strcmp(long_options[option_index].name, "tc") == 0 ){
         if ( parse_u8(optarg, &aux8) == OP_SUCCESS )
            o.setTrafficClass(aux8);
         else
             nping_fatal(QT_3,"IPv6 Traffic Class must be a number between 0 and 255 (inclusive)");
     /* IPv6 Flow label */
-    } else if (optcmp(long_options[option_index].name, "flow") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "flow") == 0 ){
 		if( meansRandom(optarg) ){
             o.setFlowLabel( get_random_u32()%1048575 ); /* Mod 2^20 so it doesn't exceed 20bits */
         }else if ( parse_u32(optarg, &aux32) == OP_SUCCESS ){
@@ -842,7 +842,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
 
 /* PACKET PAYLOAD OPTIONS  ***************************************************/
     /* Hexadecimal payload specification */
-    } else if (optcmp(long_options[option_index].name, "data") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "data") == 0 ){
         u8 *tempbuff=NULL;
         size_t len=0;
         if( (tempbuff=parseBufferSpec(optarg, &len))==NULL) 
@@ -854,7 +854,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
             o.setPayloadType(PL_HEX);
         }
     /* Random payload */
-    } else if (optcmp(long_options[option_index].name, "data-length") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "data-length") == 0 ){
         if( o.issetPayloadType() != false )
             nping_fatal(QT_3,"Only one type of payload may be selected.");
         if( meansRandom(optarg) ){
@@ -875,7 +875,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         get_random_bytes(auxbuff, aux32);
         o.setPayloadBuffer(auxbuff, aux32);
     /* ASCII string payload */
-    } else if (optcmp(long_options[option_index].name, "data-string") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "data-string") == 0 ){
         o.setPayloadType(PL_STRING);
         int plen=strlen(optarg);  
         if ( plen>MAX_PAYLOAD_ALLOWED )
@@ -893,16 +893,16 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
 
 
 /* ECHO C/S MODE OPTIONS *****************************************************/
-    } else if (optcmp(long_options[option_index].name, "echo-client")==0 ||
-               optcmp(long_options[option_index].name, "ec")==0 ){
+    } else if (strcmp(long_options[option_index].name, "echo-client")==0 ||
+               strcmp(long_options[option_index].name, "ec")==0 ){
         o.setRoleClient();
         o.setEchoPassphrase(optarg);
-    } else if (optcmp(long_options[option_index].name, "echo-server")==0 ||
-               optcmp(long_options[option_index].name, "es")==0 ){
+    } else if (strcmp(long_options[option_index].name, "echo-server")==0 ||
+               strcmp(long_options[option_index].name, "es")==0 ){
         o.setRoleServer();
         o.setEchoPassphrase(optarg);
-    } else if (optcmp(long_options[option_index].name, "echo-port")==0 ||
-               optcmp(long_options[option_index].name, "ep")==0 ){
+    } else if (strcmp(long_options[option_index].name, "echo-port")==0 ||
+               strcmp(long_options[option_index].name, "ep")==0 ){
         if ( parse_u16(optarg, &aux16) == OP_SUCCESS ){
             if(aux16==0)
                 nping_fatal(QT_3, "Invalid echo port. Port can't be zero.");
@@ -911,20 +911,20 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         }else{
             nping_fatal(QT_3, "Invalid echo port. Value must be 0<N<2^16.");
         }
-    } else if (optcmp(long_options[option_index].name, "once")==0 ){
+    } else if (strcmp(long_options[option_index].name, "once")==0 ){
         o.setOnce(true);
-    } else if (optcmp(long_options[option_index].name, "no-crypto")==0 ||
-               optcmp(long_options[option_index].name, "nc")==0 ){
+    } else if (strcmp(long_options[option_index].name, "no-crypto")==0 ||
+               strcmp(long_options[option_index].name, "nc")==0 ){
         o.doCrypto(false);
-    } else if (optcmp(long_options[option_index].name, "safe-payloads")==0 ){
+    } else if (strcmp(long_options[option_index].name, "safe-payloads")==0 ){
         o.echoPayload(false);
-    } else if (optcmp(long_options[option_index].name, "include-payloads")==0 ){
+    } else if (strcmp(long_options[option_index].name, "include-payloads")==0 ){
         o.echoPayload(true);
 
 
 /* TIMING AND PERFORMANCE OPTIONS ********************************************/
     /* Inter-packet delay */
-    } else if (optcmp(long_options[option_index].name, "delay") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "delay") == 0 ){
         if ( (l= tval2msecs(optarg)) == -1)
             nping_fatal(QT_3,"Invalid delay supplied. Delay must be a valid, positive integer or floating point number.");
         else if(l<0)
@@ -933,7 +933,7 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
             nping_fatal(QT_3,"Since April 2010, the default unit for --delay is seconds, so your time of \"%s\" is %g seconds. Use \"%sms\" for %g milliseconds.", optarg, l / 1000.0, optarg, l / 1000.0);
         o.setDelay(l);
     /* Tx rate */
-    } else if (optcmp(long_options[option_index].name, "rate") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "rate") == 0 ){
         if (parse_u32(optarg, &aux32)==OP_SUCCESS){
             if(aux32==0){
                 nping_fatal(QT_3,"Invalid rate supplied. Rate can never be zero.");
@@ -947,34 +947,30 @@ int ArgParser::parseArguments(int argc, char *argv[]) {
         }
 
 /* MISC OPTIONS **************************************************************/
-    } else if (optcmp(long_options[option_index].name, "privileged") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "privileged") == 0 ){
         o.setIsRoot();
-    } else if (optcmp(long_options[option_index].name, "unprivileged") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "unprivileged") == 0 ){
         o.setIsRoot(0);
-    } else if (optcmp(long_options[option_index].name, "send-eth") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "send-eth") == 0 ){
         o.setSendPreference(PACKET_SEND_ETH_STRONG);
-    } else if (optcmp(long_options[option_index].name, "send-ip") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "send-ip") == 0 ){
         o.setSendPreference(PACKET_SEND_IP_STRONG);
-    } else if (optcmp(long_options[option_index].name, "bpf-filter") == 0 || optcmp(long_options[option_index].name, "filter") == 0){
+    } else if (strcmp(long_options[option_index].name, "bpf-filter") == 0 || strcmp(long_options[option_index].name, "filter") == 0){
         o.setBPFFilterSpec( optarg );
         if( o.issetDisablePacketCapture() && o.disablePacketCapture()==true )
             nping_warning(QT_2, "Warning: There is no point on specifying a BPF filter if you disable packet capture. BPF filter will be ignored.");
-    } else if (optcmp(long_options[option_index].name, "nsock-engine") == 0){
+    } else if (strcmp(long_options[option_index].name, "nsock-engine") == 0){
         if (nsock_set_default_engine(optarg) < 0)
           nping_fatal(QT_3, "Unknown or non-available engine: %s", optarg);
     /* Output Options */
-    } else if (optcmp(long_options[option_index].name, "quiet") == 0 ){
+    } else if (strcmp(long_options[option_index].name, "quiet") == 0 ){
             o.setVerbosity(-4);
             o.setDebugging(0);
-    }else if (optcmp(long_options[option_index].name, "debug") == 0 ){
+    }else if (strcmp(long_options[option_index].name, "debug") == 0 ){
             o.setVerbosity(4);
             o.setDebugging(9);
     }
 
-    /* Copy and paste these to add more options. */
-    //}else if (optcmp(long_options[option_index].name, "") == 0 ){
-    //} else if (optcmp(long_options[option_index].name, "") == 0 ){
-
     break; /* case 0 */
 
 
diff --git a/zenmap/zenmapCore/SearchResult.py b/zenmap/zenmapCore/SearchResult.py
index 55e9d791c..7cc50b144 100644
--- a/zenmap/zenmapCore/SearchResult.py
+++ b/zenmap/zenmapCore/SearchResult.py
@@ -294,11 +294,6 @@ class SearchResult(object):
         if option == "*" or option == "":
             return True
 
-        # NOTE: Option matching treats "_" and "-" the same, just like the
-        # optcmp function in utils.cc . Also, option matching is
-        # case-sensitive.
-        option = option.replace("_", "-")
-
         ops = NmapOptions()
         ops.parse_string(self.parsed_scan.get_nmap_command())