diff options
| -rw-r--r-- | .gitignore | 22 | ||||
| -rw-r--r-- | Makefile | 33 | ||||
| -rw-r--r-- | Makefile.am | 93 | ||||
| -rwxr-xr-x | autogen.sh | 41 | ||||
| -rw-r--r-- | configure.ac | 91 | ||||
| -rw-r--r-- | coredump-util.c | 4 | ||||
| -rw-r--r-- | libminidump.sym | 21 | ||||
| -rw-r--r-- | m4/.gitignore | 5 | ||||
| -rw-r--r-- | m4/attributes.m4 | 288 | ||||
| -rw-r--r-- | minidump.c | 5 | ||||
| -rw-r--r-- | mkminidump.c | 6 | ||||
| -rw-r--r-- | write-minicore.c | 4 | ||||
| -rw-r--r-- | write-minidump.c | 1 |
13 files changed, 572 insertions, 42 deletions
@@ -1,7 +1,25 @@ +/build-aux/ +.deps/ +.libs/ core core.* *.core *.dmp *.o -segfault -mkminidump +*.lo +*.la +*.cache +*.log +*~ +stamp-* +/segfault +/mkminidump +Makefile.in +Makefile +/aclocal.m4 +/config.h +/config.h.in +/config.status +/configure +/libtool +/libminidump-*.tar.xz diff --git a/Makefile b/Makefile deleted file mode 100644 index a1a50e3..0000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -CFLAGS=-Wextra -Wall -O0 -g -D_GNU_SOURCE -pthread - -all: segfault mkminidump core - -mkminidump: mkminidump.o \ - minidump.o \ - minidump.h \ - context.h \ - read-coredump.o \ - read-coredump.h \ - read-minidump.o \ - read-minidump.h \ - format.h \ - read-process.o \ - read-process.h \ - write-minicore.o \ - write-minicore.h \ - write-minidump.o \ - write-minidump.h \ - coredump-util.h \ - coredump-util.o \ - util.c \ - util.h - $(CC) $(CFLAGS) $(LIBS) $^ -o $@ - -segfault: segfault.c - $(CC) $(CFLAGS) $(LIBS) $^ -o $@ - -core: segfault - ( ./segfault ||: ) > /dev/null 2>&1 - -clean: - rm -f core.* core segfault mkminidump *.o diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..1220635 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,93 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of libminidump. +# +# Copyright 2012 Lennart Poettering +# +# libminidump is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# libminidump is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with libminidump; If not, see <http://www.gnu.org/licenses/>. + +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +LIBMINIDUMP_CURRENT=0 +LIBMINIDUMP_REVISION=0 +LIBMINIDUMP_AGE=0 + +AM_CPPFLAGS = \ + -include $(top_builddir)/config.h + +AM_CFLAGS = $(WARNINGFLAGS) + +lib_LTLIBRARIES = \ + libminidump.la + +libminidump_la_SOURCES = \ + minidump.h \ + minidump.c \ + read-coredump.h \ + read-coredump.c \ + read-minidump.h \ + read-minidump.c \ + read-process.h \ + read-process.c \ + write-minicore.h \ + write-minicore.c \ + write-minidump.h \ + write-minidump.c \ + coredump-util.h \ + coredump-util.c \ + util.h \ + util.c \ + context.h \ + format.h + +libminidump_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden + +libminidump_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -shared \ + -version-info $(LIBMINIDUMP_CURRENT):$(LIBMINIDUMP_REVISION):$(LIBMINIDUMP_AGE) \ + -Wl,--version-script=$(top_srcdir)/libminidump.sym + +bin_PROGRAMS = \ + mkminidump + +mkminidump_SOURCES = \ + mkminidump.c + +mkminidump_LDADD = \ + libminidump.la + +noinst_PROGRAMS = \ + segfault + +segfault_SOURCES = \ + segfault.c + +segfault_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + +noinst_DATE = core + +core: segfault + $( ./segfault ||:) > /dev/null 2>&1 + +EXTRA_DIST = \ + libminidump.sym + +CLEAN_FILES = \ + core.* \ + core diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..ee9205d --- /dev/null +++ b/autogen.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +# This file is part of libminidump. +# +# Copyright 2012 Lennart Poettering +# +# libminidump is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# libminidump is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with libminidump; If not, see +# <http://www.gnu.org/licenses/>. + +if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then + cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ + chmod +x .git/hooks/pre-commit && \ + echo "Activated pre-commit hook." +fi + +autoreconf --force --install --symlink + +if [ "x$1" != "xc" ]; then + echo + echo "----------------------------------------------------------------" + echo "Initialized build system. For a common configuration please run:" + echo "----------------------------------------------------------------" + echo + echo "./configure CFLAGS='-g -O0' $args" + echo +else + echo ./configure CFLAGS='-g -O0' $args + ./configure CFLAGS='-g -O0' $args + make clean +fi diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..2b3142c --- /dev/null +++ b/configure.ac @@ -0,0 +1,91 @@ +# This file is part of libminidump. +# +# Copyright 2012 Lennart Poettering +# +# libminidump is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# libminidump is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with libminidump; If not, see <http://www.gnu.org/licenses/>. + +AC_PREREQ([2.64]) + +AC_INIT([libminidump], + [1], + [http://bugs.freedesktop.org/enter_bug.cgi?product=libminidump], + [libminidump], + [http://www.freedesktop.org/wiki/Software/libminidump]) + +AC_CONFIG_SRCDIR([minidump.c]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_AUX_DIR([build-aux]) + +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE +AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects]) +AM_SILENT_RULES([yes]) + +LT_PREREQ(2.2) +LT_INIT + +AC_PROG_CC +AC_PROG_CC_C99 +AM_PROG_CC_C_O +AC_PROG_GCC_TRADITIONAL + +CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ + -pipe \ + -Wall \ + -W \ + -Wextra \ + -Wno-inline \ + -Wvla \ + -Wundef \ + -Wformat=2 \ + -Wlogical-op \ + -Wsign-compare \ + -Wformat-security \ + -Wmissing-include-dirs \ + -Wformat-nonliteral \ + -Wold-style-definition \ + -Wpointer-arith \ + -Winit-self \ + -Wdeclaration-after-statement \ + -Wfloat-equal \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wredundant-decls \ + -Wmissing-declarations \ + -Wmissing-noreturn \ + -Wshadow \ + -Wendif-labels \ + -Wcast-align \ + -Wstrict-aliasing=2 \ + -Wwrite-strings \ + -Wno-long-long \ + -Wno-overlength-strings \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -Wno-unused-result \ + -Werror=overflow \ + -Wp,-D_FORTIFY_SOURCE=2 \ + -ffast-math \ + -fno-common \ + -fdiagnostics-show-option \ + -fno-strict-aliasing \ + -fvisibility=hidden \ + -ffunction-sections \ + -fdata-sections]) +AC_SUBST([WARNINGFLAGS], $with_cflags) + +AC_CONFIG_FILES([Makefile]) + +AC_OUTPUT diff --git a/coredump-util.c b/coredump-util.c index 83bf829..468d54a 100644 --- a/coredump-util.c +++ b/coredump-util.c @@ -74,10 +74,10 @@ int coredump_read_header(int fd, ElfW(Ehdr) *header) { #error "Unknown endianess." #endif -#if __i386 +#if defined(__i386) if (header->e_machine != EM_386) return -EINVAL; -#elif __x86_64 +#elif defined(__x86_64) if (header->e_machine != EM_X86_64) return -EINVAL; #else diff --git a/libminidump.sym b/libminidump.sym new file mode 100644 index 0000000..076da5a --- /dev/null +++ b/libminidump.sym @@ -0,0 +1,21 @@ +/*** + This file is part of libminidump. + + libminidump is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. +***/ + +/* Original symbols from libminidump v1 */ + +LIBMINIDUMP_1 { +global: + minidump_make; + minicore_make; + minidump_show; + coredump_show; + minidump_to_minicore; +local: + *; +}; diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..464ba5c --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,5 @@ +libtool.m4 +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 diff --git a/m4/attributes.m4 b/m4/attributes.m4 new file mode 100644 index 0000000..e354375 --- /dev/null +++ b/m4/attributes.m4 @@ -0,0 +1,288 @@ +dnl Macros to check the presence of generic (non-typed) symbols. +dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com> +dnl Copyright (c) 2006-2008 xine project +dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@gmail.com> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2, or (at your option) +dnl any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +dnl 02110-1301, USA. +dnl +dnl As a special exception, the copyright owners of the +dnl macro gives unlimited permission to copy, distribute and modify the +dnl configure scripts that are the output of Autoconf when processing the +dnl Macro. You need not follow the terms of the GNU General Public +dnl License when using or distributing such scripts, even though portions +dnl of the text of the Macro appear in them. The GNU General Public +dnl License (GPL) does govern all other use of the material that +dnl constitutes the Autoconf Macro. +dnl +dnl This special exception to the GPL applies to versions of the +dnl Autoconf Macro released by this project. When you make and +dnl distribute a modified version of the Autoconf Macro, you may extend +dnl this special exception to the GPL to apply to your modified version as +dnl well. + +dnl Check if FLAG in ENV-VAR is supported by compiler and append it +dnl to WHERE-TO-APPEND variable +dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG]) + +AC_DEFUN([CC_CHECK_FLAG_APPEND], [ + AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2], + AS_TR_SH([cc_cv_$2_$3]), + [eval "AS_TR_SH([cc_save_$2])='${$2}'" + eval "AS_TR_SH([$2])='$3'" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a = 0; int main(void) { return a; } ])], + [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"], + [eval "AS_TR_SH([cc_cv_$2_$3])='no'"]) + eval "AS_TR_SH([$2])='$cc_save_$2'"]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes], + [eval "$1='${$1} $3'"]) +]) + +dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2]) +AC_DEFUN([CC_CHECK_FLAGS_APPEND], [ + for flag in $3; do + CC_CHECK_FLAG_APPEND($1, $2, $flag) + done +]) + +dnl Check if the flag is supported by linker (cacheable) +dnl CC_CHECK_LDFLAGS([FLAG], [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) + +AC_DEFUN([CC_CHECK_LDFLAGS], [ + AC_CACHE_CHECK([if $CC supports $1 flag], + AS_TR_SH([cc_cv_ldflags_$1]), + [ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $1" + AC_LINK_IFELSE([int main() { return 1; }], + [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) + LDFLAGS="$ac_save_LDFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], + [$2], [$3]) +]) + +dnl define the LDFLAGS_NOUNDEFINED variable with the correct value for +dnl the current linker to avoid undefined references in a shared object. +AC_DEFUN([CC_NOUNDEFINED], [ + dnl We check $host for which systems to enable this for. + AC_REQUIRE([AC_CANONICAL_HOST]) + + case $host in + dnl FreeBSD (et al.) does not complete linking for shared objects when pthreads + dnl are requested, as different implementations are present; to avoid problems + dnl use -Wl,-z,defs only for those platform not behaving this way. + *-freebsd* | *-openbsd*) ;; + *) + dnl First of all check for the --no-undefined variant of GNU ld. This allows + dnl for a much more readable commandline, so that people can understand what + dnl it does without going to look for what the heck -z defs does. + for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do + CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"]) + break + done + ;; + esac + + AC_SUBST([LDFLAGS_NOUNDEFINED]) +]) + +dnl Check for a -Werror flag or equivalent. -Werror is the GCC +dnl and ICC flag that tells the compiler to treat all the warnings +dnl as fatal. We usually need this option to make sure that some +dnl constructs (like attributes) are not simply ignored. +dnl +dnl Other compilers don't support -Werror per se, but they support +dnl an equivalent flag: +dnl - Sun Studio compiler supports -errwarn=%all +AC_DEFUN([CC_CHECK_WERROR], [ + AC_CACHE_CHECK( + [for $CC way to treat warnings as errors], + [cc_cv_werror], + [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror], + [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])]) + ]) +]) + +AC_DEFUN([CC_CHECK_ATTRIBUTE], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))], + AS_TR_SH([cc_cv_attribute_$1]), + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([$3])], + [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"], + [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], + [AC_DEFINE( + AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, + [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] + ) + $4], + [$5]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ + CC_CHECK_ATTRIBUTE( + [constructor],, + [void __attribute__((constructor)) ctor() { int a; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT], [ + CC_CHECK_ATTRIBUTE( + [format], [format(printf, n, n)], + [void __attribute__((format(printf, 1, 2))) printflike(const char *fmt, ...) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ + CC_CHECK_ATTRIBUTE( + [format_arg], [format_arg(printf)], + [char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ + CC_CHECK_ATTRIBUTE( + [visibility_$1], [visibility("$1")], + [void __attribute__((visibility("$1"))) $1_function() { }], + [$2], [$3]) +]) + +AC_DEFUN([CC_ATTRIBUTE_NONNULL], [ + CC_CHECK_ATTRIBUTE( + [nonnull], [nonnull()], + [void __attribute__((nonnull())) some_function(void *foo, void *bar) { foo = (void*)0; bar = (void*)0; }], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_UNUSED], [ + CC_CHECK_ATTRIBUTE( + [unused], , + [void some_function(void *foo, __attribute__((unused)) void *bar);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [ + CC_CHECK_ATTRIBUTE( + [sentinel], , + [void some_function(void *foo, ...) __attribute__((sentinel));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [ + CC_CHECK_ATTRIBUTE( + [deprecated], , + [void some_function(void *foo, ...) __attribute__((deprecated));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIAS], [ + CC_CHECK_ATTRIBUTE( + [alias], [weak, alias], + [void other_function(void *foo) { } + void some_function(void *foo) __attribute__((weak, alias("other_function")));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_MALLOC], [ + CC_CHECK_ATTRIBUTE( + [malloc], , + [void * __attribute__((malloc)) my_alloc(int n);], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_PACKED], [ + CC_CHECK_ATTRIBUTE( + [packed], , + [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));], + [$1], [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_CONST], [ + CC_CHECK_ATTRIBUTE( + [const], , + [int __attribute__((const)) twopow(int n) { return 1 << n; } ], + [$1], [$2]) +]) + +AC_DEFUN([CC_FLAG_VISIBILITY], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if $CC supports -fvisibility=hidden], + [cc_cv_flag_visibility], + [cc_flag_visibility_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + CC_CHECK_CFLAGS_SILENT([-fvisibility=hidden], + cc_cv_flag_visibility='yes', + cc_cv_flag_visibility='no') + CFLAGS="$cc_flag_visibility_save_CFLAGS"]) + + AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], + [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, + [Define this if the compiler supports the -fvisibility flag]) + $1], + [$2]) +]) + +AC_DEFUN([CC_FUNC_EXPECT], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([if compiler has __builtin_expect function], + [cc_cv_func_expect], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [int some_function() { + int a = 3; + return (int)__builtin_expect(a, 3); + }])], + [cc_cv_func_expect=yes], + [cc_cv_func_expect=no]) + CFLAGS="$ac_save_CFLAGS" + ]) + + AS_IF([test "x$cc_cv_func_expect" = "xyes"], + [AC_DEFINE([SUPPORT__BUILTIN_EXPECT], 1, + [Define this if the compiler supports __builtin_expect() function]) + $1], + [$2]) +]) + +AC_DEFUN([CC_ATTRIBUTE_ALIGNED], [ + AC_REQUIRE([CC_CHECK_WERROR]) + AC_CACHE_CHECK([highest __attribute__ ((aligned ())) supported], + [cc_cv_attribute_aligned], + [ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $cc_cv_werror" + for cc_attribute_align_try in 64 32 16 8 4 2; do + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ + int main() { + static char c __attribute__ ((aligned($cc_attribute_align_try))) = 0; + return c; + }])], [cc_cv_attribute_aligned=$cc_attribute_align_try; break]) + done + CFLAGS="$ac_save_CFLAGS" + ]) + + if test "x$cc_cv_attribute_aligned" != "x"; then + AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], [$cc_cv_attribute_aligned], + [Define the highest alignment supported]) + fi +]) @@ -685,10 +685,12 @@ finish: return r; } +__attribute__ ((visibility("default"))) int minidump_make(pid_t pid, int fd, void **minidump, size_t *size) { return make(pid, fd, minidump, size, minidump_write); } +__attribute__ ((visibility("default"))) int minicore_make(pid_t pid, int fd, void **minicore, size_t *size) { return make(pid, fd, minicore, size, minicore_write); } @@ -720,14 +722,17 @@ finish: return r; } +__attribute__ ((visibility("default"))) int minidump_show(FILE *f, int minidump_fd) { return show(f, 0, -1, minidump_fd); } +__attribute__ ((visibility("default"))) int coredump_show(FILE *f, pid_t pid, int coredump_fd) { return show(f, pid, coredump_fd, -1); } +__attribute__ ((visibility("default"))) int minidump_to_minicore(int minidump_fd, void **output, size_t *output_size) { struct context c; int r; diff --git a/mkminidump.c b/mkminidump.c index f2cbfd3..2fd1000 100644 --- a/mkminidump.c +++ b/mkminidump.c @@ -31,10 +31,10 @@ #include "minidump.h" -static char *arg_source = NULL; +static const char *arg_source = NULL; static pid_t arg_pid = 0; -static char *arg_minidump = NULL; -static char *arg_minicore = NULL; +static const char *arg_minidump = NULL; +static const char *arg_minicore = NULL; static int help(void) { diff --git a/write-minicore.c b/write-minicore.c index 73b1d0e..a42b264 100644 --- a/write-minicore.c +++ b/write-minicore.c @@ -339,9 +339,9 @@ int minicore_write(struct context *c) { h.e_ident[EI_VERSION] = EV_CURRENT; h.e_ident[EI_OSABI] = ELFOSABI_NONE; -#if __i386 +#if defined(__i386) h.e_machine = EM_386; -#elif __x86_64 +#elif defined(__x86_64) h.e_machine = EM_X86_64; #else #error "Unknown machine." diff --git a/write-minidump.c b/write-minidump.c index ad0f75e..7b76f3b 100644 --- a/write-minidump.c +++ b/write-minidump.c @@ -30,6 +30,7 @@ #include <time.h> #include "context.h" +#include "write-minidump.h" static int minidump_write_string(struct context *c, const char *s, size_t *offset) { size_t n, l; |