diff options
Diffstat (limited to 'src/readelf.c')
| -rw-r--r-- | src/readelf.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/readelf.c b/src/readelf.c index 7c55b8b0..97d14513 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -27,7 +27,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: readelf.c,v 1.186 2022/09/24 20:30:13 christos Exp $") +FILE_RCSID("@(#)$File: readelf.c,v 1.187 2022/12/26 17:31:14 christos Exp $") #endif #ifdef BUILTIN_ELF @@ -42,30 +42,30 @@ FILE_RCSID("@(#)$File: readelf.c,v 1.186 2022/09/24 20:30:13 christos Exp $") #include "magic.h" #ifdef ELFCORE -private int dophn_core(struct magic_set *, int, int, int, off_t, int, size_t, +file_private int dophn_core(struct magic_set *, int, int, int, off_t, int, size_t, off_t, int *, uint16_t *); #endif -private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t, +file_private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t, off_t, int, int *, uint16_t *); -private int doshn(struct magic_set *, int, int, int, off_t, int, size_t, +file_private int doshn(struct magic_set *, int, int, int, off_t, int, size_t, off_t, int, int, int *, uint16_t *); -private size_t donote(struct magic_set *, void *, size_t, size_t, int, +file_private size_t donote(struct magic_set *, void *, size_t, size_t, int, int, size_t, int *, uint16_t *, int, off_t, int, off_t); #define ELF_ALIGN(a) ((((a) + align - 1) / align) * align) #define isquote(c) (strchr("'\"`", (c)) != NULL) -private uint16_t getu16(int, uint16_t); -private uint32_t getu32(int, uint32_t); -private uint64_t getu64(int, uint64_t); +file_private uint16_t getu16(int, uint16_t); +file_private uint32_t getu32(int, uint32_t); +file_private uint64_t getu64(int, uint64_t); #define MAX_PHNUM 128 #define MAX_SHNUM 32768 #define MAX_SHSIZE (64 * 1024 * 1024) #define SIZE_UNKNOWN CAST(off_t, -1) -private int +file_private int toomany(struct magic_set *ms, const char *name, uint16_t num) { if (ms->flags & MAGIC_MIME) @@ -75,7 +75,7 @@ toomany(struct magic_set *ms, const char *name, uint16_t num) return 1; } -private uint16_t +file_private uint16_t getu16(int swap, uint16_t value) { union { @@ -94,7 +94,7 @@ getu16(int swap, uint16_t value) return value; } -private uint32_t +file_private uint32_t getu32(int swap, uint32_t value) { union { @@ -115,7 +115,7 @@ getu32(int swap, uint32_t value) return value; } -private uint64_t +file_private uint64_t getu64(int swap, uint64_t value) { union { @@ -326,7 +326,7 @@ static const size_t prpsoffsets64[] = { #define OS_STYLE_FREEBSD 1 #define OS_STYLE_NETBSD 2 -private const char os_style_names[][8] = { +file_private const char os_style_names[][8] = { "SVR4", "FreeBSD", "NetBSD", @@ -346,7 +346,7 @@ private const char os_style_names[][8] = { #define FLAGS_IS_CORE 0x0800 #define FLAGS_DID_AUXV 0x1000 -private int +file_private int dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, size_t size, off_t fsize, int *flags, uint16_t *notecount) { @@ -547,7 +547,7 @@ do_note_freebsd_version(struct magic_set *ms, int swap, void *v) return 0; } -private int +file_private int /*ARGSUSED*/ do_bid_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, int swap __attribute__((__unused__)), uint32_t namesz, uint32_t descsz, @@ -593,7 +593,7 @@ do_bid_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, return 0; } -private int +file_private int do_os_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, int swap, uint32_t namesz, uint32_t descsz, size_t noff, size_t doff, int *flags) @@ -692,7 +692,7 @@ do_os_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, return 0; } -private int +file_private int do_pax_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, int swap, uint32_t namesz, uint32_t descsz, size_t noff, size_t doff, int *flags) @@ -732,7 +732,7 @@ do_pax_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, return 0; } -private int +file_private int do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, int swap, uint32_t namesz, uint32_t descsz, size_t noff, size_t doff, int *flags, size_t size, int clazz) @@ -944,7 +944,7 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, return 0; } -private off_t +file_private off_t get_offset_from_virtaddr(struct magic_set *ms, int swap, int clazz, int fd, off_t off, int num, off_t fsize, uint64_t virtaddr) { @@ -978,7 +978,7 @@ get_offset_from_virtaddr(struct magic_set *ms, int swap, int clazz, int fd, return 0; } -private size_t +file_private size_t get_string_on_virtaddr(struct magic_set *ms, int swap, int clazz, int fd, off_t ph_off, int ph_num, off_t fsize, uint64_t virtaddr, char *buf, ssize_t buflen) @@ -1012,7 +1012,7 @@ get_string_on_virtaddr(struct magic_set *ms, /*ARGSUSED*/ -private int +file_private int do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, int swap, uint32_t namesz __attribute__((__unused__)), uint32_t descsz __attribute__((__unused__)), @@ -1119,7 +1119,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, #endif } -private size_t +file_private size_t dodynamic(struct magic_set *ms, void *vbuf, size_t offset, size_t size, int clazz, int swap, int *pie, size_t *need) { @@ -1155,7 +1155,7 @@ dodynamic(struct magic_set *ms, void *vbuf, size_t offset, size_t size, } -private size_t +file_private size_t donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size, int clazz, int swap, size_t align, int *flags, uint16_t *notecount, int fd, off_t ph_off, int ph_num, off_t fsize) @@ -1348,7 +1348,7 @@ static const cap_desc_t cap_desc_386[] = { { 0, NULL } }; -private int +file_private int doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, size_t size, off_t fsize, int mach, int strtab, int *flags, uint16_t *notecount) @@ -1654,7 +1654,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, * it is pie, and does not have an interpreter or needed libraries, we * call it static pie. */ -private int +file_private int dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, size_t size, off_t fsize, int sh_num, int *flags, uint16_t *notecount) @@ -1813,7 +1813,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off, } -protected int +file_protected int file_tryelf(struct magic_set *ms, const struct buffer *b) { int fd = b->fd; |