diff options
| author | bde <bde@FreeBSD.org> | 1998-07-06 21:45:12 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-06 21:45:12 +0000 |
| commit | 067f8c8dc926fe603627b3942b43d82910de2a5f (patch) | |
| tree | d38da32b0ee98fb6d463b9c2f3464dbd31b289d0 /usr.bin | |
| parent | 0609531ab6b945c4918206f095bc1f6640408654 (diff) | |
| download | FreeBSD-src-067f8c8dc926fe603627b3942b43d82910de2a5f.zip FreeBSD-src-067f8c8dc926fe603627b3942b43d82910de2a5f.tar.gz | |
Fixed classic sign extension bug `-(long)sizeof(foo)'.
Fixed the type of the string table size variable to match its use
(assuming that int32_t is 4 bytes and other unportable things).
bfd uses `unsigned char string_chars[BYTES_IN_WORD]', where
BYTES_IN_WORD can be 4, 8, or perhaps even 2 or 3, but it is
assumed to be precisely 4 bytes here.
Fixed printf format errors (don't assume that n_value in struct
n_list has type u_long, since it should have size BYTES_IN_WORD
and longs may be longer than words).
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/nm/nm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c index 19b1d1a..1e6cbc5 100644 --- a/usr.bin/nm/nm.c +++ b/usr.bin/nm/nm.c @@ -45,7 +45,7 @@ static const char copyright[] = static char sccsid[] = "@(#)nm.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: nm.c,v 1.11 1997/07/31 06:53:36 charnier Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -309,7 +309,7 @@ show_archive(fname, fp) rval = 1; } } else { - (void)fseek(fp, (long)-sizeof(exec_head), + (void)fseek(fp, -(long)sizeof(exec_head), SEEK_CUR); if (!print_file_each_line && !table) (void)printf("\n%s:\n", name); @@ -346,7 +346,7 @@ show_objfile(objname, fp) register struct nlist *names, *np; register int i, nnames, nrawnames; struct exec head; - long stabsize; + int32_t stabsize; char *stab; /* read a.out header */ @@ -359,7 +359,7 @@ show_objfile(objname, fp) * skip back to the header - the N_-macros return values relative * to the beginning of the a.out header */ - if (fseek(fp, (long)-sizeof(head), SEEK_CUR)) { + if (fseek(fp, -(long)sizeof(head), SEEK_CUR)) { warn("%s", objname); return(1); } @@ -474,7 +474,7 @@ print_symbol(objname, sym) if (table) { printf("%s|", objname); if (SYMBOL_TYPE(sym->n_type) != N_UNDF) - (void)printf("%08lx", sym->n_value); + (void)printf("%08lx", (u_long)sym->n_value); (void)printf("|"); if (IS_DEBUGGER_SYMBOL(sym->n_type)) (void)printf("-|%02x %04x %5s|", sym->n_other, @@ -506,7 +506,7 @@ print_symbol(objname, sym) if (SYMBOL_TYPE(sym->n_type) == N_UNDF) (void)printf(" "); else - (void)printf("%08lx", sym->n_value); + (void)printf("%08lx", (u_long)sym->n_value); /* print type information */ if (IS_DEBUGGER_SYMBOL(sym->n_type)) |
