--show-ips is now -b

This matches the flag used in tracepath.  The undocumented
--bitpattern option has been moved to -B.

diff --git a/mtr.8 b/mtr.8
index 8c26210e22f9bf8de90e0a874e10a7df1c6a513d..04b03ba55949eb5591f02279c93aeb1980bb3422 100644 (file)
--- a/mtr.8
+++ b/mtr.8
@@ -192,7 +192,7 @@ to display numeric IP numbers and not try to resolve the
 host names. 
 
 .TP
-.B \-z
+.B \-b
 .TP
 .B \-\-show-ips
 .br

diff --git a/mtr.c b/mtr.c
index fc01fc7e67fbeb9499cf19c9ca3f4c12427e5453..93d8146ff9cf265daec138b9929522a9a4e389d3 100644 (file)
--- a/mtr.c
+++ b/mtr.c
@@ -142,11 +142,11 @@ void parse_arg (int argc, char **argv)
     { "report-cycles", 1, 0, 'c' },
     { "psize", 1, 0, 's' },    /* changed 'p' to 's' to match ping option
                                   overload psize<0, ->rand(min,max) */
-    { "bitpattern", 1, 0, 'b' },/* overload b>255, ->rand(0,255) */
+    { "bitpattern", 1, 0, 'B' },/* overload b>255, ->rand(0,255) */
     { "tos", 1, 0, 'Q' },      /* typeof service (0,255) */
     { "mpls", 0, 0, 'e' },
     { "no-dns", 0, 0, 'n' },
-    { "show-ips", 0, 0, 'z' },
+    { "show-ips", 0, 0, 'b' },
     { "address", 1, 0, 'a' },
     { "first-ttl", 1, 0, 'f' },        /* -f & -m are borrowed from traceroute */
     { "max-ttl", 1, 0, 'm' },
@@ -258,7 +258,7 @@ void parse_arg (int argc, char **argv)
       }
       strcpy ((char*)fld_active, optarg);
       break;
-    case 'b':
+    case 'B':
       bitpattern = atoi (optarg);
       if (bitpattern > 255)
        bitpattern = -1;
@@ -274,7 +274,7 @@ void parse_arg (int argc, char **argv)
     case 'u':
       mtrtype = IPPROTO_UDP;
       break;
-    case 'z':
+    case 'b':
       show_ips = 1;
       reportwide = 1;
       break;