diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-27 07:21:53 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-27 07:21:53 -0200 |
| commit | 0ae7a646d9336f5df6f1cdc6be849701027961e5 (patch) | |
| tree | 3487fb25637ec11cfa8bfe7ac2d9cea6420e338c /usr.bin | |
| parent | bf1649eb466516d7552e66f436d03048429334c2 (diff) | |
| parent | 11814c27fd3b1050198f173bafda29c66d0c79d3 (diff) | |
| download | FreeBSD-src-0ae7a646d9336f5df6f1cdc6be849701027961e5.zip FreeBSD-src-0ae7a646d9336f5df6f1cdc6be849701027961e5.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ldd/ldd.c | 12 | ||||
| -rw-r--r-- | usr.bin/netstat/route.c | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index bc4dbb6..f0e70b3 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -377,9 +377,19 @@ is_executable(const char *fname, int fd, int *is_shlib, int *type) return (0); } if (hdr.elf.e_type == ET_DYN) { - if (hdr.elf.e_ident[EI_OSABI] == ELFOSABI_FREEBSD) { + switch (hdr.elf.e_ident[EI_OSABI]) { + case ELFOSABI_FREEBSD: *is_shlib = 1; return (1); +#ifdef __ARM_EABI__ + case ELFOSABI_NONE: + if (hdr.elf.e_machine != EM_ARM) + break; + if (((hdr.elf.e_flags & 0xff000000) >> 24) < 4) + break; + *is_shlib = 1; + return (1); +#endif } warnx("%s: not a FreeBSD ELF shared object", fname); return (0); diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index efcab5b..9691ddf 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -664,7 +664,10 @@ p_rtentry_sysctl(struct rt_msghdr *rtm) strlcpy(prettyname, "---", sizeof(prettyname)); } - printf("%*.*s", wid_if, wid_if, prettyname); + if (Wflag) + printf("%*s", wid_if, prettyname); + else + printf("%*.*s", wid_if, wid_if, prettyname); if (rtm->rtm_rmx.rmx_expire) { time_t expire_time; |
