diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/lib/crash_dump.cpp | 10 | ||||
| -rw-r--r-- | src/lib/create_crash_dump_dir.cpp | 57 | ||||
| -rw-r--r-- | src/lib/run_event.c | 10 |
4 files changed, 69 insertions, 10 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index ad2d2025..a17df28e 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -40,6 +40,7 @@ libabrt_la_SOURCES = \ make_descr.cpp \ run_event.c \ crash_dump.cpp \ + create_crash_dump_dir.cpp \ ABRTException.cpp \ hooklib.c hooklib.h \ parse_release.cpp \ @@ -50,6 +51,7 @@ libabrt_la_CPPFLAGS = \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ + -DLOCALSTATEDIR='"$(localstatedir)"' \ -DCONF_DIR=\"$(CONF_DIR)\" \ -DVAR_RUN=\"$(VAR_RUN)\" \ $(GLIB_CFLAGS) \ diff --git a/src/lib/crash_dump.cpp b/src/lib/crash_dump.cpp index 338724d5..cca28021 100644 --- a/src/lib/crash_dump.cpp +++ b/src/lib/crash_dump.cpp @@ -19,16 +19,6 @@ #include "abrtlib.h" #include "abrt_crash_dump.h" -const char *const must_have_files[] = { - FILENAME_ARCHITECTURE, - FILENAME_KERNEL , - FILENAME_PACKAGE , - FILENAME_COMPONENT , - FILENAME_RELEASE , - FILENAME_EXECUTABLE , - NULL -}; - static const char *const editable_files[] = { FILENAME_DESCRIPTION, FILENAME_COMMENT , diff --git a/src/lib/create_crash_dump_dir.cpp b/src/lib/create_crash_dump_dir.cpp new file mode 100644 index 00000000..0a74411b --- /dev/null +++ b/src/lib/create_crash_dump_dir.cpp @@ -0,0 +1,57 @@ +/* + Copyright (C) 2010 ABRT team + Copyright (C) 2010 RedHat inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "abrtlib.h" + +using namespace std; + +struct dump_dir *create_crash_dump_dir(const map_crash_data_t& crash_data) +{ + char *path = xasprintf(LOCALSTATEDIR"/run/abrt/tmp-%lu-%lu", (long)getpid(), (long)time(NULL)); + struct dump_dir *dd = dd_create(path, getuid()); + free(path); + if (!dd) + return NULL; + + map_crash_data_t::const_iterator its = crash_data.begin(); + while (its != crash_data.end()) + { + const char *name, *value; + name = its->first.c_str(); + + if (name[0] == '.' || strchr(name, '/')) + { + error_msg("Crash data field name contains disallowed chars: '%s'", name); + goto next; + } + +//FIXME: what to do with CD_BINs?? + /* Fields: CD_TYPE (is CD_SYS, CD_BIN or CD_TXT), + * CD_EDITABLE, CD_CONTENT */ + if (its->second[CD_TYPE] == CD_BIN) + goto next; + + value = its->second[CD_CONTENT].c_str(); + dd_save_text(dd, name, value); + next: + its++; + } + + return dd; +} diff --git a/src/lib/run_event.c b/src/lib/run_event.c index 4ff1070d..28fbfd5e 100644 --- a/src/lib/run_event.c +++ b/src/lib/run_event.c @@ -18,6 +18,16 @@ */ #include "abrtlib.h" +struct run_event_state *new_run_event_state() +{ + return (struct run_event_state*)xzalloc(sizeof(struct run_event_state)); +} + +void free_run_event_state(struct run_event_state *state) +{ + free(state); +} + int run_event(struct run_event_state *state, const char *dump_dir_name, const char *event |