hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-25 12:02:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add -t option which prints output in tabular format.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1995-12-19 08:12:07 +00:00
parent c44b3fc409
commit 9e535a67c1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=12921
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/nm/nm.1
View File

@ -39,7 +39,7 @@
.Nd display name list (symbol table)
.Sh SYNOPSIS
.Nm nm
.Op Fl agnopruw
.Op Fl agnoprtuw
.Ar
.Sh DESCRIPTION
The symbol table (name list) of each object in
@ -71,6 +71,8 @@ Display full path or library name of object on every line.
Do not sort at all.
.It Fl r
Reverse order sort.
.It Fl t
Output in tabular format more suitable for other programs digestive system.
.It Fl u
Display undefined symbols only.
.It Fl w

4
usr.bin/nm/nm.1aout
View File

@ -39,7 +39,7 @@
.Nd display name list (symbol table)
.Sh SYNOPSIS
.Nm nm
.Op Fl agnopruw
.Op Fl agnoprtuw
.Ar
.Sh DESCRIPTION
The symbol table (name list) of each object in
@ -71,6 +71,8 @@ Display full path or library name of object on every line.
Do not sort at all.
.It Fl r
Reverse order sort.
.It Fl t
Output in tabular format more suitable for other programs digestive system.
.It Fl u
Display undefined symbols only.
.It Fl w

28
usr.bin/nm/nm.c
View File

@ -64,7 +64,7 @@ int print_all_symbols;
int print_file_each_line;
int fcount;
int rev;
int rev, table;
int fname(), rname(), value();
int (*sfunc)() = fname;
@ -87,7 +87,7 @@ main(argc, argv)
extern int optind;
int ch, errors;
while ((ch = getopt(argc, argv, "agnopruw")) != EOF) {
while ((ch = getopt(argc, argv, "agnoprtuw")) != EOF) {
switch (ch) {
case 'a':
print_all_symbols = 1;
@ -107,6 +107,9 @@ main(argc, argv)
case 'r':
rev = 1;
break;
case 't':
table = 1;
break;
case 'u':
print_only_undefined_symbols = 1;
break;
@ -153,7 +156,7 @@ process_file(fname)
return(1);
}
if (fcount > 1)
if (fcount > 1 && !table)
(void)printf("\n%s:\n", fname);
/*
@ -270,7 +273,7 @@ show_archive(fname, fp)
*/
p = name;
*p = 0;
if (print_file_each_line)
if (print_file_each_line && !table)
{
p = scat(p, fname);
p = scat(p, ":");
@ -293,7 +296,7 @@ show_archive(fname, fp)
} else {
(void)fseek(fp, (long)-sizeof(exec_head),
SEEK_CUR);
if (!print_file_each_line)
if (!print_file_each_line && !table)
(void)printf("\n%s:\n", name);
rval |= show_objfile(name, fp);
}
@ -460,6 +463,21 @@ print_symbol(objname, sym)
{
char *typestring(), typeletter();
if (table) {
printf("%s|", objname);
if (SYMBOL_TYPE(sym->n_type) != N_UNDF)
(void)printf("%08lx", sym->n_value);
(void)printf("|");
if (IS_DEBUGGER_SYMBOL(sym->n_type))
(void)printf("-|%02x %04x %5s|", sym->n_other,
sym->n_desc&0xffff, typestring(sym->n_type));
else
(void)printf("%c|", typeletter(sym->n_type));
/* print the symbol's name */
(void)printf("%s\n",sym->n_un.n_name);
return;
}
if (print_file_each_line)
(void)printf("%s:", objname);