https://sourceware.org/bugzilla/show_bug.cgi?id=21002 --- a/lib/system.h +++ b/lib/system.h @@ -29,7 +29,18 @@ #ifndef LIB_SYSTEM_H #define LIB_SYSTEM_H 1 +#ifdef HAVE_ERROR_H +#include "error.h" +#else +#include "err.h" #include +#include +#define error(status, errno, ...) \ + fflush(stdout); \ + warn(__VA_ARGS__); \ + if (status) exit(status) +#endif + #include #include #include @@ -37,6 +48,10 @@ #include #include +#ifndef __GLIBC__ +#define canonicalize_file_name(name) realpath(name,NULL) +#endif + #if __BYTE_ORDER == __LITTLE_ENDIAN # define LE32(n) (n) # define LE64(n) (n) --- a/lib/color.c +++ b/lib/color.c @@ -32,13 +32,13 @@ #endif #include -#include #include #include #include #include #include "libeu.h" #include "color.h" +#include "system.h" /* Prototype for option handler. */ static error_t parse_opt (int key, char *arg, struct argp_state *state); --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -30,7 +30,6 @@ # include #endif -#include #include #include #include --- a/src/addr2line.c +++ b/src/addr2line.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include --- a/src/ar.c +++ b/src/ar.c @@ -22,7 +22,6 @@ #include #include -#include #include #include #include --- a/src/arlib2.c +++ b/src/arlib2.c @@ -20,7 +20,6 @@ # include #endif -#include #include #include #include --- a/src/arlib.c +++ b/src/arlib.c @@ -21,7 +21,6 @@ #endif #include -#include #include #include #include --- a/src/elfcmp.c +++ b/src/elfcmp.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include --- a/src/elflint.c +++ b/src/elflint.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include --- a/src/findtextrel.c +++ b/src/findtextrel.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include --- a/src/nm.c +++ b/src/nm.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include --- a/src/objdump.c +++ b/src/objdump.c @@ -21,7 +21,6 @@ #endif #include -#include #include #include #include --- a/src/ranlib.c +++ b/src/ranlib.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include --- a/src/readelf.c +++ b/src/readelf.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include --- a/src/size.c +++ b/src/size.c @@ -21,7 +21,6 @@ #endif #include -#include #include #include #include --- a/src/stack.c +++ b/src/stack.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include --- a/src/strings.c +++ b/src/strings.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include --- a/src/strip.c +++ b/src/strip.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include --- a/src/unstrip.c +++ b/src/unstrip.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include --- a/tests/addrscopes.c +++ b/tests/addrscopes.c @@ -25,7 +25,6 @@ #include #include #include -#include #include --- a/tests/allregs.c +++ b/tests/allregs.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include --- a/tests/backtrace.c +++ b/tests/backtrace.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #ifdef __linux__ --- a/tests/backtrace-data.c +++ b/tests/backtrace-data.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #if defined(__x86_64__) && defined(__linux__) --- a/tests/buildid.c +++ b/tests/buildid.c @@ -23,7 +23,6 @@ #include ELFUTILS_HEADER(elf) #include ELFUTILS_HEADER(dwelf) #include -#include #include #include #include --- a/tests/debugaltlink.c +++ b/tests/debugaltlink.c @@ -23,7 +23,6 @@ #include ELFUTILS_HEADER(dw) #include ELFUTILS_HEADER(dwelf) #include -#include #include #include #include --- a/tests/debuglink.c +++ b/tests/debuglink.c @@ -21,7 +21,6 @@ #include #include ELFUTILS_HEADER(dwelf) #include -#include #include #include #include --- a/tests/dwfl-addr-sect.c +++ b/tests/dwfl-addr-sect.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include ELFUTILS_HEADER(dwfl) --- a/tests/dwfl-bug-addr-overflow.c +++ b/tests/dwfl-bug-addr-overflow.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include ELFUTILS_HEADER(dwfl) --- a/tests/dwfl-bug-fd-leak.c +++ b/tests/dwfl-bug-fd-leak.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include --- a/tests/dwfl-bug-getmodules.c +++ b/tests/dwfl-bug-getmodules.c @@ -18,7 +18,6 @@ #include #include ELFUTILS_HEADER(dwfl) -#include static const Dwfl_Callbacks callbacks = { --- a/tests/dwfllines.c +++ b/tests/dwfllines.c @@ -27,7 +27,6 @@ #include #include #include -#include int main (int argc, char *argv[]) --- a/tests/dwflmodtest.c +++ b/tests/dwflmodtest.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include ELFUTILS_HEADER(dwfl) --- a/tests/dwfl-report-elf-align.c +++ b/tests/dwfl-report-elf-align.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include --- a/tests/dwflsyms.c +++ b/tests/dwflsyms.c @@ -25,7 +25,6 @@ #include #include #include -#include #include static const char * --- a/tests/early-offscn.c +++ b/tests/early-offscn.c @@ -19,7 +19,6 @@ #endif #include -#include #include #include #include --- a/tests/ecp.c +++ b/tests/ecp.c @@ -20,7 +20,6 @@ #endif #include -#include #include #include #include --- a/tests/find-prologues.c +++ b/tests/find-prologues.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include --- a/tests/funcretval.c +++ b/tests/funcretval.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include --- a/tests/funcscopes.c +++ b/tests/funcscopes.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include --- a/tests/line2addr.c +++ b/tests/line2addr.c @@ -26,7 +26,6 @@ #include #include #include -#include static void --- a/tests/low_high_pc.c +++ b/tests/low_high_pc.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include --- a/tests/rdwrmmap.c +++ b/tests/rdwrmmap.c @@ -19,7 +19,6 @@ #endif #include -#include #include #include #include --- a/tests/saridx.c +++ b/tests/saridx.c @@ -17,7 +17,6 @@ #include -#include #include #include #include --- a/tests/sectiondump.c +++ b/tests/sectiondump.c @@ -18,7 +18,6 @@ #include #include -#include #include #include #include --- a/tests/varlocs.c +++ b/tests/varlocs.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include --- a/libasm/asm_end.c +++ b/libasm/asm_end.c @@ -32,7 +32,6 @@ #endif #include -#include #include #include #include --- a/libasm/asm_newscn.c +++ b/libasm/asm_newscn.c @@ -32,7 +32,6 @@ #endif #include -#include #include #include #include --- a/libcpu/i386_gendis.c +++ b/libcpu/i386_gendis.c @@ -31,7 +31,6 @@ # include #endif -#include #include #include #include --- a/libcpu/i386_lex.c +++ b/libcpu/i386_lex.c @@ -808,7 +808,6 @@ char *yytext; #endif #include -#include #include #include --- a/libcpu/i386_lex.l +++ b/libcpu/i386_lex.l @@ -31,7 +31,6 @@ #endif #include -#include #include #include --- a/libcpu/i386_parse.c +++ b/libcpu/i386_parse.c @@ -107,7 +107,6 @@ #include #include #include -#include #include #include #include --- a/libdw/libdw_alloc.c +++ b/libdw/libdw_alloc.c @@ -31,7 +31,6 @@ # include #endif -#include #include #include #include "libdwP.h" @@ -74,5 +73,5 @@ __attribute ((noreturn)) attribute_hidde __libdw_oom (void) { while (1) - error (EXIT_FAILURE, ENOMEM, "libdw"); + error (EXIT_FAILURE, errno, gettext ("cannot allocate memory")); } --- a/libebl/eblopenbackend.c +++ b/libebl/eblopenbackend.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include --- a/libdwfl/dwfl_error.c +++ b/libdwfl/dwfl_error.c @@ -140,6 +140,7 @@ __libdwfl_seterrno (Dwfl_Error error) const char * dwfl_errmsg (int error) { + static __thread char s[64] = ""; if (error == 0 || error == -1) { int last_error = global_error; @@ -154,7 +155,8 @@ dwfl_errmsg (int error) switch (error &~ 0xffff) { case OTHER_ERROR (ERRNO): - return strerror_r (error & 0xffff, "bad", 0); + strerror_r (error & 0xffff, s, sizeof(s)); + return s; case OTHER_ERROR (LIBELF): return elf_errmsg (error & 0xffff); case OTHER_ERROR (LIBDW):