[BusyBox-cvs] busybox/include usage.h, 1.193, 1.194 inet_common.h, 1.3, 1.4

Manuel Novoa III mjn3 at busybox.net
Wed Mar 10 07:42:40 UTC 2004


Update of /var/cvs/busybox/include
In directory nail:/tmp/cvs-serv14034/include

Modified Files:
	usage.h inet_common.h 
Log Message:
In spite of the feature freeze, check in a complete rework of route which
fixes some bugs, adds some error checking, and removes _lots_ of bloat.
Text size on i386...
              old     new
   ipv6      5425    3523
   no ipv6   3143    2193


Index: inet_common.h
===================================================================
RCS file: /var/cvs/busybox/include/inet_common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/inet_common.h	14 Jul 2003 21:20:52 -0000	1.3
+++ b/inet_common.h	10 Mar 2004 07:42:37 -0000	1.4
@@ -29,5 +29,5 @@
 extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
 			 int numeric, unsigned int netmask);
 
-extern int INET6_resolve(char *name, struct sockaddr_in6 *sin6);
+extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6);
 extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric);

Index: usage.h
===================================================================
RCS file: /var/cvs/busybox/include/usage.h,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- a/usage.h	9 Mar 2004 21:32:57 -0000	1.193
+++ b/usage.h	10 Mar 2004 07:42:37 -0000	1.194
@@ -2039,13 +2039,21 @@
 #define rmmod_example_usage \
 	"$ rmmod tulip\n"
 
+#ifdef CONFIG_FEATURE_IPV6
+  #define USAGE_ROUTE_IPV6(a) a
+#else
+  #define USAGE_ROUTE_IPV6(a) "\t"
+#endif
+
+
 #define route_trivial_usage \
-	"[{add|del|flush}]"
+	"[{add|del|delete}]"
 #define route_full_usage \
 	"Edit the kernel's routing tables.\n\n" \
 	"Options:\n" \
-	"\t-n\tDont resolve names.\n" \
-	"\t-e\tDisplay other/more information"
+	"\t-n\t\tDont resolve names.\n" \
+	"\t-e\t\tDisplay other/more information.\n" \
+	"\t-A inet" USAGE_ROUTE_IPV6("{6}") "\tSelect address family."
 
 #define rpm_trivial_usage \
 	"-i -q[ildc]p package.rpm"




More information about the busybox-cvs mailing list