@ -25,7 +25,7 @@
sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
--- a/ip/ip.c
--- a/ip/ip.c
+++ b/ip/ip.c
+++ b/ip/ip.c
@@ -48,10 +48 ,16 @@ static void usage(void)
@@ -47,10 +47 ,16 @@ static void usage(void)
fprintf(stderr,
fprintf(stderr,
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
" ip [ -force ] -batch filename\n"
" ip [ -force ] -batch filename\n"
@ -42,7 +42,7 @@
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
" -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
" -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n"
" -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n"
@@ -73,32 +79 ,44 @@ static const struct cmd {
@@ -72,32 +78 ,44 @@ static const struct cmd {
int (*func)(int argc, char **argv);
int (*func)(int argc, char **argv);
} cmds[] = {
} cmds[] = {
{ "address", do_ipaddr },
{ "address", do_ipaddr },
@ -89,7 +89,7 @@
{ "help", do_help },
{ "help", do_help },
--- a/lib/utils.c
--- a/lib/utils.c
+++ b/lib/utils.c
+++ b/lib/utils.c
@@ -1010,6 +1010 ,7 @@ const char *rt_addr_n2a_r(int af, int le
@@ -1012,6 +1012 ,7 @@ const char *rt_addr_n2a_r(int af, int le
return inet_ntop(af, addr, buf, buflen);
return inet_ntop(af, addr, buf, buflen);
case AF_MPLS:
case AF_MPLS:
return mpls_ntop(af, addr, buf, buflen);
return mpls_ntop(af, addr, buf, buflen);
@ -97,7 +97,7 @@
case AF_IPX:
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
case AF_DECnet:
@@ -1019,6 +1020 ,7 @@ const char *rt_addr_n2a_r(int af, int le
@@ -1021,6 +1022 ,7 @@ const char *rt_addr_n2a_r(int af, int le
memcpy(dna.a_addr, addr, 2);
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
return dnet_ntop(af, &dna, buf, buflen);
}
}