From 1a6d4286c0eb7e6c1fb65a9c187790c3a83d7f7a Mon Sep 17 00:00:00 2001
From: angelos <angelos@openbsd.org>
Date: Thu, 20 Apr 2000 17:43:46 +0000
Subject: [PATCH] Change -b to -f, similar to Solaris.

---
 usr.sbin/traceroute6/traceroute6.8 |  6 +++---
 usr.sbin/traceroute6/traceroute6.c | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/usr.sbin/traceroute6/traceroute6.8 b/usr.sbin/traceroute6/traceroute6.8
index 55170c8e6b6..fe3387ee493 100644
--- a/usr.sbin/traceroute6/traceroute6.8
+++ b/usr.sbin/traceroute6/traceroute6.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: traceroute6.8,v 1.4 2000/04/20 07:49:47 angelos Exp $
+.\"	$OpenBSD: traceroute6.8,v 1.5 2000/04/20 17:43:46 angelos Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -40,7 +40,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dlnrv
-.Op Fl b Ar minhops
+.Op Fl f Ar firsthop
 .Op Fl m Ar hoplimit
 .Op Fl p Ar port
 .Op Fl q Ar probes
@@ -53,7 +53,7 @@
 .Bl -tag -width Ds
 .It Fl d
 Debug mode.
-.It Fl b Ar minhops
+.It Fl f Ar firsthop
 Specify how many hops to skip in trace.
 .It Fl m Ar hoplimit
 Specify maximum hoplimit.
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 0faa605c6cd..76a1d1bfcd7 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute6.c,v 1.7 2000/04/20 07:57:41 angelos Exp $	*/
+/*	$OpenBSD: traceroute6.c,v 1.8 2000/04/20 17:43:46 angelos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -348,7 +348,7 @@ char *source = 0;
 char *hostname;
 
 int nprobes = 3;
-int min_hops = 1;
+int first_hop = 1;
 int max_hops = 30;
 u_short ident;
 u_short port = 32768+666;	/* start udp dest port # for probe packets */
@@ -381,7 +381,7 @@ main(argc, argv)
 	on = 1;
 	seq = 0;
 	
-	while ((ch = getopt(argc, argv, "b:dlm:np:q:rs:w:vg:")) != EOF)
+	while ((ch = getopt(argc, argv, "f:dlm:np:q:rs:w:vg:")) != EOF)
 		switch(ch) {
 		case 'd':
 			options |= SO_DEBUG;
@@ -430,8 +430,8 @@ main(argc, argv)
 			freehostent(hp);
 			break;
 		case 'b':
-			min_hops = atoi(optarg);
-			if (min_hops > max_hops) {
+			first_hop = atoi(optarg);
+			if (first_hop > max_hops) {
 				Fprintf(stderr,
 				    "traceroute6: min hoplimit must be <= %d.\n", max_hops);
 				exit(1);
@@ -439,9 +439,9 @@ main(argc, argv)
 			break;
 		case 'm':
 			max_hops = atoi(optarg);
-			if (max_hops < min_hops) {
+			if (max_hops < first_hop) {
 				Fprintf(stderr,
-				    "traceroute6: max hoplimit must be >= %d.\n", min_hops);
+				    "traceroute6: max hoplimit must be >= %d.\n", first_hop);
 				exit(1);
 			}
 			break;
@@ -777,13 +777,13 @@ main(argc, argv)
 	Fprintf(stderr, ", %d hops max, %d byte packets\n", max_hops, datalen);
 	(void) fflush(stderr);
 
-	if (min_hops > 1)
-		Printf("Skipping %d intermediate hops\n", min_hops - 1);
+	if (first_hop > 1)
+		Printf("Skipping %d intermediate hops\n", first_hop - 1);
 
 	/*
 	 * Main loop
 	 */
-	for (hops = min_hops; hops <= max_hops; ++hops) {
+	for (hops = first_hop; hops <= max_hops; ++hops) {
 		struct in6_addr lastaddr;
 		int got_there = 0;
 		int unreachable = 0;
@@ -1264,6 +1264,6 @@ usage()
 {
 	(void)fprintf(stderr,
 "usage: traceroute6 [-dlnrv] [-m max_hops] [-p port#] [-q nqueries]\n\t\
-[-s src_addr] [-g gateway] [-w wait] [-b min_hops] host [data size]\n");
+[-s src_addr] [-g gateway] [-w wait] [-f first_hop] host [data size]\n");
 	exit(1);
 }
-- 
2.20.1