Page MenuHomeFreeBSD
Files F144471954

D41427.id125878.diff
No OneTemporary
Actions

D41427.id125878.diff
View Options

diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c
--- a/usr.bin/netstat/bpf.c
+++ b/usr.bin/netstat/bpf.c
@@ -42,7 +42,7 @@
#include <net/bpfdesc.h>
#include <arpa/inet.h>
-#include <err.h>
+
#include <errno.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/usr.bin/netstat/common.c b/usr.bin/netstat/common.c
--- a/usr.bin/netstat/common.c
+++ b/usr.bin/netstat/common.c
@@ -53,7 +53,7 @@
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
-#include <err.h>
+
#include <libxo/xo.h>
#include "netstat.h"
#include "common.h"
@@ -103,7 +103,7 @@
* since we need #ifindex -> if_xname match
*/
if (getifaddrs(&ifap) != 0)
- err(EX_OSERR, "getifaddrs");
+ xo_err(EX_OSERR, "getifaddrs");
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
@@ -117,7 +117,7 @@
size = roundup2(ifindex + 1, 32) *
sizeof(struct ifmap_entry);
if ((ifmap = realloc(ifmap, size)) == NULL)
- errx(2, "realloc(%d) failed", size);
+ xo_errx(2, "realloc(%d) failed", size);
memset(&ifmap[ifmap_size], 0,
size - ifmap_size *
sizeof(struct ifmap_entry));
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -57,7 +57,7 @@
#include <net/if_pfsync.h>
#endif
-#include <err.h>
+
#include <errno.h>
#include <ifaddrs.h>
#include <libutil.h>
@@ -378,9 +378,9 @@
return sidewaysintpr();
if (getifaddrs(&ifap) != 0)
- err(EX_OSERR, "getifaddrs");
+ xo_err(EX_OSERR, "getifaddrs");
if (aflag && getifmaddrs(&ifmap) != 0)
- err(EX_OSERR, "getifmaddrs");
+ xo_err(EX_OSERR, "getifmaddrs");
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (interface != NULL &&
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -72,7 +72,7 @@
#include <netinet/udp_var.h>
#include <arpa/inet.h>
-#include <err.h>
+
#include <errno.h>
#include <libutil.h>
#include <netdb.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -62,7 +62,7 @@
#include <arpa/inet.h>
#include <netdb.h>
-#include <err.h>
+
#include <stdint.h>
#include <stdio.h>
#include <stdbool.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -58,7 +58,7 @@
#endif
#include <ctype.h>
-#include <err.h>
+
#include <errno.h>
#include <kvm.h>
#include <limits.h>
@@ -455,8 +455,9 @@
if (!live)
usage();
bpf_stats(interface);
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
if (mflag) {
if (!live) {
@@ -464,8 +465,9 @@
mbpr(kvmd, nl[N_SFSTAT].n_value);
} else
mbpr(NULL, 0);
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
if (Qflag) {
if (!live) {
@@ -473,8 +475,9 @@
netisr_stats();
} else
netisr_stats();
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
#if 0
/*
@@ -494,8 +497,9 @@
xo_open_container("statistics");
intpr(NULL, af);
xo_close_container("statistics");
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
if (rflag) {
xo_open_container("statistics");
@@ -507,22 +511,25 @@
} else
routepr(fib, af);
xo_close_container("statistics");
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
if (oflag) {
xo_open_container("statistics");
nhops_print(fib, af);
xo_close_container("statistics");
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
if (Oflag) {
xo_open_container("statistics");
nhgrp_print(fib, af);
xo_close_container("statistics");
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
@@ -545,8 +552,9 @@
#endif
}
xo_close_container("statistics");
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
if (tp) {
@@ -555,8 +563,9 @@
if (!first)
xo_close_list("socket");
xo_close_container("statistics");
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
xo_open_container("statistics");
@@ -586,8 +595,9 @@
if (!first)
xo_close_list("socket");
xo_close_container("statistics");
- xo_finish();
- exit(0);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_SUCCESS);
}
static int
@@ -908,6 +918,7 @@
" netstat -g [-46W] [-f address_family] [-M core] [-N system]",
" netstat -gs [-46s] [-f address_family] [-M core] [-N system]",
" netstat -Q");
- xo_finish();
- exit(1);
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
+ exit(EXIT_FAILURE);
}
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -52,7 +52,7 @@
#include <sys/socketvar.h>
#include <sys/sysctl.h>
-#include <err.h>
+
#include <kvm.h>
#include <memstat.h>
#include <stdint.h>
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -66,7 +66,7 @@
#include <netinet/ip_mroute.h>
#undef _NETSTAT_
-#include <err.h>
+
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -85,7 +85,7 @@
#include <netinet/in.h>
-#include <err.h>
+
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -56,7 +56,7 @@
#include <stdbool.h>
#include <string.h>
#include <unistd.h>
-#include <err.h>
+
#include <libxo/xo.h>
#include "netstat.h"
diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c
--- a/usr.bin/netstat/netisr.c
+++ b/usr.bin/netstat/netisr.c
@@ -43,7 +43,7 @@
#include <net/netisr.h>
#include <net/netisr_internal.h>
-#include <err.h>
+
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -234,7 +234,7 @@
}
proto_array = calloc(protocount, sizeof(*proto_array));
if (proto_array == NULL)
- err(-1, "malloc");
+ xo_err(-1, "malloc");
protocount = 0;
for (i = 0; i < maxprot; i++) {
npp = &np_array[i];
diff --git a/usr.bin/netstat/nhgrp.c b/usr.bin/netstat/nhgrp.c
--- a/usr.bin/netstat/nhgrp.c
+++ b/usr.bin/netstat/nhgrp.c
@@ -47,7 +47,7 @@
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
-#include <err.h>
+
#include <libxo/xo.h>
#include "netstat.h"
#include "common.h"
@@ -211,12 +211,12 @@
mib[5] = 0;
mib[6] = fibnum;
if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0)
- err(EX_OSERR, "sysctl: net.route.0.%d.nhgrpdump.%d estimate",
+ xo_err(EX_OSERR, "sysctl: net.route.0.%d.nhgrpdump.%d estimate",
af, fibnum);
if ((buf = malloc(needed)) == NULL)
- errx(2, "malloc(%lu)", (unsigned long)needed);
+ xo_errx(2, "malloc(%lu)", (unsigned long)needed);
if (sysctl(mib, nitems(mib), buf, &needed, NULL, 0) < 0)
- err(1, "sysctl: net.route.0.%d.nhgrpdump.%d", af, fibnum);
+ xo_err(1, "sysctl: net.route.0.%d.nhgrpdump.%d", af, fibnum);
lim = buf + needed;
/*
@@ -339,7 +339,7 @@
if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1)
numfibs = 1;
if (fibnum < 0 || fibnum > numfibs - 1)
- errx(EX_USAGE, "%d: invalid fib", fibnum);
+ xo_errx(EX_USAGE, "%d: invalid fib", fibnum);
ifmap = prepare_ifmap(&ifmap_size);
prepare_nh_map(fibnum, af);
diff --git a/usr.bin/netstat/nhops.c b/usr.bin/netstat/nhops.c
--- a/usr.bin/netstat/nhops.c
+++ b/usr.bin/netstat/nhops.c
@@ -61,7 +61,7 @@
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
-#include <err.h>
+
#include <libxo/xo.h>
#include "netstat.h"
#include "common.h"
@@ -217,7 +217,7 @@
sz = new_size * (sizeof(struct nhop_entry));
if ((map->ptr = realloc(map->ptr, sz)) == NULL)
- errx(2, "realloc(%zu) failed", sz);
+ xo_errx(2, "realloc(%zu) failed", sz);
memset(&map->ptr[map->size], 0, (new_size - map->size) * sizeof(struct nhop_entry));
map->size = new_size;
@@ -356,12 +356,12 @@
mib[5] = 0;
mib[6] = fibnum;
if (sysctl(mib, nitems(mib), NULL, &needed, NULL, 0) < 0)
- err(EX_OSERR, "sysctl: net.route.0.%d.nhdump.%d estimate", af,
+ xo_err(EX_OSERR, "sysctl: net.route.0.%d.nhdump.%d estimate", af,
fibnum);
if ((buf = malloc(needed)) == NULL)
- errx(2, "malloc(%lu)", (unsigned long)needed);
+ xo_errx(2, "malloc(%lu)", (unsigned long)needed);
if (sysctl(mib, nitems(mib), buf, &needed, NULL, 0) < 0)
- err(1, "sysctl: net.route.0.%d.nhdump.%d", af, fibnum);
+ xo_err(1, "sysctl: net.route.0.%d.nhdump.%d", af, fibnum);
lim = buf + needed;
/*
@@ -467,7 +467,7 @@
if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1)
numfibs = 1;
if (fibnum < 0 || fibnum > numfibs - 1)
- errx(EX_USAGE, "%d: invalid fib", fibnum);
+ xo_errx(EX_USAGE, "%d: invalid fib", fibnum);
ifmap = prepare_ifmap(&ifmap_size);
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -66,7 +66,7 @@
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
-#include <err.h>
+
#include <libxo/xo.h>
#include "netstat.h"
#include "common.h"
@@ -133,14 +133,14 @@
if (sysctlbyname("net.fibs", &numfibs, &intsize, NULL, 0) == -1)
numfibs = 1;
if (fibnum < 0 || fibnum > numfibs - 1)
- errx(EX_USAGE, "%d: invalid fib", fibnum);
+ xo_errx(EX_USAGE, "%d: invalid fib", fibnum);
/*
* Since kernel & userland use different timebase
* (time_uptime vs time_second) and we are reading kernel memory
* directly we should do rt_expire --> expire_time conversion.
*/
if (clock_gettime(CLOCK_UPTIME, &uptime) < 0)
- err(EX_OSERR, "clock_gettime() failed");
+ xo_err(EX_OSERR, "clock_gettime() failed");
xo_open_container("route-information");
xo_emit("{T:Routing tables}");
diff --git a/usr.bin/netstat/route_netlink.c b/usr.bin/netstat/route_netlink.c
--- a/usr.bin/netstat/route_netlink.c
+++ b/usr.bin/netstat/route_netlink.c
@@ -65,7 +65,7 @@
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
-#include <err.h>
+
#include <libxo/xo.h>
#include "netstat.h"
#include "common.h"
@@ -107,7 +107,7 @@
if (link.ifi_index >= ifmap_size) {
size_t size = roundup2(link.ifi_index + 1, 32) * sizeof(struct ifmap_entry);
if ((ifmap = realloc(ifmap, size)) == NULL)
- errx(2, "realloc(%zu) failed", size);
+ xo_errx(2, "realloc(%zu) failed", size);
memset(&ifmap[ifmap_size], 0,
size - ifmap_size *
sizeof(struct ifmap_entry));
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -53,7 +53,7 @@
#include <netinet/sctp_constants.h>
#include <arpa/inet.h>
-#include <err.h>
+
#include <errno.h>
#include <libutil.h>
#include <netdb.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -56,7 +56,7 @@
#include <netinet/in.h>
#include <errno.h>
-#include <err.h>
+
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 3:11 PM (12 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28592341
Default Alt Text
D41427.id125878.diff (11 KB)

Event Timeline