d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nm: Adjust argc and argv in get_opt().

Browse Source 
This refactoring makes it slightly easier to capsicumize nm(1).

Discussed with:	emaste
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2019-09-30 17:26:42 +00:00
parent 65bc027257
commit 8d3d724796
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=352908
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/elftoolchain/nm/nm.c
View File

@ -179,7 +179,7 @@ static int cmp_size(const void *, const void *);
static int cmp_value(const void *, const void *);
static void filter_dest(void);
static int filter_insert(fn_filter);
static void get_opt(int, char **);
static void get_opt(int *, char ***);
static int get_sym(Elf *, struct sym_head *, int, size_t, size_t,
const char *, const char **, int);
static const char * get_sym_name(Elf *, const GElf_Sym *, size_t,
@ -441,18 +441,18 @@ parse_demangle_option(const char *opt)
}
static void
get_opt(int argc, char **argv)
get_opt(int *argc, char ***argv)
{
int ch;
bool is_posix, oflag;
if (argc <= 0 || argv == NULL)
if (*argc <= 0 || *argv == NULL)
return;
oflag = is_posix = false;
nm_opts.t = RADIX_HEX;
while ((ch = getopt_long(argc, argv, "ABCDF:PSVaefghlnoprst:uvx",
nm_longopts, NULL)) != -1) {
while ((ch = getopt_long(*argc, *argv, "ABCDF:PSVaefghlnoprst:uvx",
nm_longopts, NULL)) != -1) {
switch (ch) {
case 'A':
nm_opts.print_name = PRINT_NAME_FULL;
@ -573,6 +573,8 @@ get_opt(int argc, char **argv)
usage(1);
}
}
*argc -= optind;
*argv += optind;
/*
* In POSIX mode, the '-o' option controls the output radix.
@ -2115,8 +2117,8 @@ main(int argc, char **argv)
int rtn;
global_init();
get_opt(argc, argv);
rtn = read_files(argc - optind, argv + optind);
get_opt(&argc, &argv);
rtn = read_files(argc, argv);
global_dest();
exit(rtn);