X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Ftraceroute.c;h=d9c62f7f966dab909189030162333bae7a4d4a53;hb=95f7953f2c46c7b9c799250aa8dc6eb10cc5c726;hp=58a9b692a6826163ae3949fb80e478847e8dadc5;hpb=47367e1d50b81501e8a6ce215f8be4eeacdda693;p=oweals%2Fbusybox.git

diff --git a/networking/traceroute.c b/networking/traceroute.c
index 58a9b692a..d9c62f7f9 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -12,12 +12,12 @@
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
+ * ''This product includes software developed by the University of California,
  * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
  * the University nor the names of its contributors may be used to endorse
  * or promote products derived from this software without specific prior
  * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * THIS SOFTWARE IS PROVIDED ''AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
@@ -210,39 +210,38 @@
  *     Tue Dec 20 03:50:13 PST 1988
  */
 //config:config TRACEROUTE
-//config:	bool "traceroute"
+//config:	bool "traceroute (11 kb)"
 //config:	default y
 //config:	select PLATFORM_LINUX
 //config:	help
-//config:	  Utility to trace the route of IP packets.
+//config:	Utility to trace the route of IP packets.
 //config:
 //config:config TRACEROUTE6
-//config:	bool "traceroute6"
+//config:	bool "traceroute6 (12 kb)"
 //config:	default y
-//config:	depends on FEATURE_IPV6 && TRACEROUTE
+//config:	depends on FEATURE_IPV6
 //config:	help
-//config:	  Utility to trace the route of IPv6 packets.
+//config:	Utility to trace the route of IPv6 packets.
 //config:
 //config:config FEATURE_TRACEROUTE_VERBOSE
 //config:	bool "Enable verbose output"
 //config:	default y
-//config:	depends on TRACEROUTE
+//config:	depends on TRACEROUTE || TRACEROUTE6
 //config:	help
-//config:	  Add some verbosity to traceroute. This includes among other things
-//config:	  hostnames and ICMP response types.
+//config:	Add some verbosity to traceroute. This includes among other things
+//config:	hostnames and ICMP response types.
 //config:
 //config:config FEATURE_TRACEROUTE_USE_ICMP
 //config:	bool "Enable -I option (use ICMP instead of UDP)"
 //config:	default y
-//config:	depends on TRACEROUTE
-//config:	help
-//config:	  Add option -I to use ICMP ECHO instead of UDP datagrams.
+//config:	depends on TRACEROUTE || TRACEROUTE6
 
 /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
 //applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))
 //applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE))
 
 //kbuild:lib-$(CONFIG_TRACEROUTE) += traceroute.o
+//kbuild:lib-$(CONFIG_TRACEROUTE6) += traceroute.o
 
 //usage:#define traceroute_trivial_usage
 //usage:       "[-"IF_TRACEROUTE6("46")"FIlnrv] [-f 1ST_TTL] [-m MAXTTL] [-q PROBES] [-p PORT]\n"
@@ -1204,11 +1203,13 @@ common_traceroute_main(int op, char **argv)
 	return 0;
 }
 
+#if ENABLE_TRACEROUTE
 int traceroute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int traceroute_main(int argc UNUSED_PARAM, char **argv)
 {
 	return common_traceroute_main(0, argv);
 }
+#endif
 
 #if ENABLE_TRACEROUTE6
 int traceroute6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;