generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-08 11:02:24 +01:00
Code Issues Projects Releases Wiki Activity

Re-allow direct use of nlist.n_name in <nlist.h>

Browse Source 
Commit e8d340de ("Remove a.out support from nlist()") introduced a copy
of the definition of nlist from a.out.h. However, as well as having
n_name inside n_un, on the various BSDs n_name could also be accessed
as a direct member of nlist, and this is made use of by FreeBSD's
usr.bin/netstat/main.c. Thus we should also add the same enclosing
anonymous union.

[guillem@hadrons.org:
 - Add a minimal unit test. ]

Closes: !4
Signed-off-by: Guillem Jover <guillem@hadrons.org>
This commit is contained in:
James Clarke 2019-02-03 00:11:15 +00:00 committed by Guillem Jover
parent 9d917aad37
commit 61d378f5e9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/bsd/nlist.h
View File

@ -36,9 +36,12 @@
struct nlist {
union {
char *n_name;
struct n_list *n_next;
long n_strx;
} n_un;
union {
char *n_name;
struct n_list *n_next;
long n_strx;
} n_un;
};
unsigned char n_type;
char n_other;
short n_desc;

2
test/nlist.c
View File

@ -66,6 +66,8 @@ main(int argc, char **argv)
assert(*data_pub_ptr == 50);
assert(nl[0].n_name == nl[0].n_un.n_name);
rc = nlist(argv[0], nl);
assert(rc == 0);