diff options
| author | Karel Klic <kklic@redhat.com> | 2010-01-20 18:51:28 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-01-20 18:51:28 +0100 |
| commit | bbb210c836aaa6487e643176548b8b3feb11c347 (patch) | |
| tree | 4a12b2a9672c639ddf9042a8d6bb06b14821d983 | |
| parent | d8ea20ec8a17f387ea75f4a19cadfbd33699d1d9 (diff) | |
| parent | 932c4d77abddb62ca4df1aca6d6c7d4e634a9e8d (diff) | |
| download | abrt-bbb210c836aaa6487e643176548b8b3feb11c347.tar.gz abrt-bbb210c836aaa6487e643176548b8b3feb11c347.tar.xz abrt-bbb210c836aaa6487e643176548b8b3feb11c347.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
55 files changed, 770 insertions, 559 deletions
@@ -3,7 +3,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Summary: Automatic bug detection and reporting tool Name: abrt -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} License: GPLv2+ Group: Applications/System @@ -402,6 +402,34 @@ fi %defattr(-,root,root,-) %changelog +* Wed Jan 20 2010 Jiri Moskovcak <jmoskovc@redhat.com> 1.0.4-1 +- GUI: redesign of reporter dialog (jmoskovc@redhat.com) +- Set the prgname to "Automatic Bug Reporting Tool" fixes rhbz#550357 (jmoskovc@redhat.com) +- CCpp analyzer: display __abort_msg in backtrace. closes rhbz#549735 (vda.linux@googlemail.com) +- s/os.exit/sys.exit - closes rhbz#556313 (vda.linux@googlemail.com) +- use repr() to print variable values in python hook rhbz#545070 (jmoskovc@redhat.com) +- gui: add logging infrastructure (vda.linux@googlemail.com) +- Added "Enabled = yes" to all plugin's config files (jmoskovc@redhat.com) +- *: disable plugin loading/unloading through GUI. Document keyring a bit (vda.linux@googlemail.com) +- fix memory leaks in catcut plugin (npajkovs@redhat.com) +- fix memory leaks in bugzilla (npajkovs@redhat.com) +- abrt-hook-python: sanitize input more; log to syslog (vda.linux@googlemail.com) +- Fixed /var/cache/abrt/ permissions (kklic@redhat.com) +- Kerneloops: we require commandline for every crash, save dummy one for oopses (vda.linux@googlemail.com) +- *: remove nss dependencies (vda.linux@googlemail.com) +- CCpp: use our own sha1 implementation (less pain with nss libs) (vda.linux@googlemail.com) +- DebugDump: more consistent logic in setting mode and uid:gid on dump dir (vda.linux@googlemail.com) +- fixes based on security review (vda.linux@googlemail.com) +- SOSreport/TicketUploader: use more restrictive file modes (vda.linux@googlemail.com) +- abrt-hook-python: add input sanitization and directory size guard (vda.linux@googlemail.com) +- RunApp: safer chdir. Overhauled "sparn a child and get its output" in general (vda.linux@googlemail.com) +- DebugDump: use more restrictive modes (vda.linux@googlemail.com) +- SQLite3: check for SQL injection (vda.linux@googlemail.com) +- replace plugin enabling via EnabledPlugins by par-plugin Enabled = yes/no (vda.linux@googlemail.com) +- abrt.spec: move "requires: gdb" to abrt-desktop (vda.linux@googlemail.com) +- ccpp: add a possibility to disable backtrace generation (vda.linux@googlemail.com) +- abrtd: limit the number of frames in backtrace to 3000 (vda.linux@googlemail.com) + * Tue Jan 5 2010 Jiri Moskovcak <jmoskovc@redhat.com> 1.0.3-1 - speed optimalization of abrt-debuginfo-install (jmoskovc@redhat.com) - updated credits (jmoskovc@redhat.com) diff --git a/configure.ac b/configure.ac index 4f73d07a..6cc65a8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([abrt], [1.0.3], [crash-catcher@fedorahosted.org]) +AC_INIT([abrt], [1.0.4], [crash-catcher@fedorahosted.org]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) @@ -84,7 +84,7 @@ if no new dbus calls are arriving to it. The key dbus calls served by abrt-process are: -- GetCrashInfos(): returns a vector_crash_infos_t (vector_map_vector_string_t) +- GetCrashInfos(): returns a vector_map_crash_data_t (vector_map_vector_string_t) of crashes for given uid v[N]["executable"/"uid"/"kernel"/"backtrace"][N] = "contents" [see above the problem with producing this list] @@ -97,8 +97,8 @@ The key dbus calls served by abrt-process are: abrt should be run by root anyway - debuginfo gets installed using pk-debuginfo-install, which cares about privileges itself, so no problem here -- GetJobResult(UUID): returns map_crash_report_t (map_vector_string_t) -- Report(map_crash_report_t (map_vector_string_t)): +- GetJobResult(UUID): returns map_crash_data_t (map_vector_string_t) +- Report(map_crash_data_t (map_vector_string_t)): "Please report this crash": calls Report() of all registered reporter plugins Returns report_status_t (map_vector_string_t) - the status of each call - DeleteDebugDump(UUID): delete corresponding /var/cache/abrt/DIR. Returns bool diff --git a/doc/PLUGINS-HOWTO b/doc/PLUGINS-HOWTO index d8467801..a7c08088 100644 --- a/doc/PLUGINS-HOWTO +++ b/doc/PLUGINS-HOWTO @@ -74,8 +74,8 @@ it on some web tool...) You have to override this method: -virtual void Report(const crash_report_t& pCrashReport, - const std::string& pArgs); +virtual void Report(const map_crash_data_t& pCrashData, + const char *pArgs); -It is self-explanatory, that this method takes the report and presents it somewhere to the world. The second argument is a string with arguments specified for the reporter. diff --git a/inc/CrashTypes.h b/inc/CrashTypes.h index ccbdd929..9daefa93 100644 --- a/inc/CrashTypes.h +++ b/inc/CrashTypes.h @@ -1,24 +1,49 @@ -#ifndef CRASHTYPES_H_ -#define CRASHTYPES_H_ +/* + Copyright (C) 2009 Abrt team. + Copyright (C) 2009 RedHat inc. -#include "abrt_types.h" + 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. -// SYS - system value, should not be displayed -// BIN - binary data -// TXT - text data, can be displayed -#define CD_SYS "s" -#define CD_BIN "b" -#define CD_TXT "t" + 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. -/* Text bigger than this usually is attached, not added inline */ -#define CD_TEXT_ATT_SIZE (2*1024) + 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. +*/ +#ifndef CRASHTYPES_H_ +#define CRASHTYPES_H_ -#define CD_ISEDITABLE "y" -#define CD_ISNOTEDITABLE "n" +#include "abrt_types.h" -#define CD_TYPE (0) -#define CD_EDITABLE (1) -#define CD_CONTENT (2) +// Filenames in dump directory +#define FILENAME_ARCHITECTURE "architecture" +#define FILENAME_KERNEL "kernel" +#define FILENAME_TIME "time" +#define FILENAME_UID "uid" +// uuid _file_ exists for Python analyzer only - remove, follow ccpp's example? +// (ccpp keeps uuid in DB) +#define FILENAME_UUID "uuid" +#define FILENAME_PACKAGE "package" +#define FILENAME_COMPONENT "component" +#define FILENAME_DESCRIPTION "description" +#define FILENAME_ANALYZER "analyzer" +#define FILENAME_RELEASE "release" +#define FILENAME_EXECUTABLE "executable" +#define FILENAME_REASON "reason" +#define FILENAME_COMMENT "comment" +#define FILENAME_REPRODUCE "reproduce" +#define FILENAME_RATING "rating" +#define FILENAME_CMDLINE "cmdline" +#define FILENAME_COREDUMP "coredump" +#define FILENAME_BACKTRACE "backtrace" +#define FILENAME_MEMORYMAP "memorymap" +#define FILENAME_KERNELOOPS "kerneloops" #define CD_UUID "UUID" #define CD_UID "UID" @@ -36,33 +61,40 @@ #define CD_MWUUID "_MWUUID" #define CD_MWDDD "_MWDDD" +// SYS - system value, should not be displayed +// BIN - binary data +// TXT - text data, can be displayed +#define CD_SYS "s" +#define CD_BIN "b" +#define CD_TXT "t" + +/* Text bigger than this usually is attached, not added inline */ +#define CD_TEXT_ATT_SIZE (2*1024) + +#define CD_ISEDITABLE "y" +#define CD_ISNOTEDITABLE "n" + +#define CD_TYPE (0) +#define CD_EDITABLE (1) +#define CD_CONTENT (2) + // currently, vector always has exactly 3 elements -> <type, editable, content> // <key, data> typedef map_vector_string_t map_crash_data_t; -typedef map_crash_data_t map_crash_info_t; -typedef map_crash_data_t map_crash_report_t; -typedef std::vector<map_crash_info_t> vector_crash_infos_t; - -inline void add_crash_data_to_crash_info(map_crash_info_t& pCrashInfo, - const std::string& pItem, - const std::string& pContent) -{ - pCrashInfo[pItem].push_back(CD_TXT); - pCrashInfo[pItem].push_back(CD_ISNOTEDITABLE); - pCrashInfo[pItem].push_back(pContent); -} - -inline void add_crash_data_to_crash_report(map_crash_report_t& pCrashReport, - const std::string& pItem, - const std::string& pType, - const std::string& pEditable, - const std::string& pContent) -{ - pCrashReport[pItem].push_back(pType); - pCrashReport[pItem].push_back(pEditable); - pCrashReport[pItem].push_back(pContent); -} - - -#endif /* CRASHTYPES_H_ */ +typedef std::vector<map_crash_data_t> vector_map_crash_data_t; + +void add_to_crash_data(map_crash_data_t& pCrashData, + const char *pItem, + const char *pContent); + +void add_to_crash_data_ext(map_crash_data_t& pCrashData, + const char *pItem, + const char *pType, + const char *pEditable, + const char *pContent); + +const std::string& get_crash_data_item_content(const map_crash_data_t& crash_data, + const char *key); + +#endif diff --git a/inc/CrashTypesSocket.h b/inc/CrashTypesSocket.h index 166a8a81..db3ee44e 100644 --- a/inc/CrashTypesSocket.h +++ b/inc/CrashTypesSocket.h @@ -70,19 +70,19 @@ #define MESSAGE_CREATE_REPORT "(CREATE_REPORT)" #define MESSAGE_END_MARKER 23 -std::string crash_infos_to_string(const vector_crash_infos_t& pCrashInfos); +std::string crash_infos_to_string(const vector_map_crash_data_t& pCrashDatas); std::string crash_data_to_string(const map_crash_data_t& pCrashData); -inline std::string crash_report_to_string(const map_crash_report_t& pCrashReport) +inline std::string crash_report_to_string(const map_crash_data_t& pCrashData) { - return crash_data_to_string(pCrashReport); + return crash_data_to_string(pCrashData); } -vector_crash_infos_t string_to_crash_infos(const std::string& pMessage); +vector_map_crash_data_t string_to_crash_infos(const std::string& pMessage); map_crash_data_t string_to_crash_data(const std::string& pMessage, int& len); -inline map_crash_report_t string_to_crash_report(const std::string& pMessage) +inline map_crash_data_t string_to_crash_report(const std::string& pMessage) { int len; return string_to_crash_data(pMessage, len); } -#endif /* SOCKETCRASHTYPES_H_ */ +#endif diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp index f963eb9c..aafa0198 100644 --- a/lib/Plugins/Bugzilla.cpp +++ b/lib/Plugins/Bugzilla.cpp @@ -32,8 +32,8 @@ struct ctx: public abrt_xmlrpc_conn { int32_t check_uuid_in_bugzilla(const char* component, const char* UUID); bool check_cc_and_reporter(uint32_t bug_id, const char* login); void add_plus_one_cc(uint32_t bug_id, const char* login); - uint32_t new_bug(const map_crash_report_t& pCrashReport); - void add_attachments(const char* bug_id_str, const map_crash_report_t& pCrashReport); + uint32_t new_bug(const map_crash_data_t& pCrashData); + void add_attachments(const char* bug_id_str, const map_crash_data_t& pCrashData); }; void ctx::login(const char* login, const char* passwd) @@ -278,22 +278,22 @@ int32_t ctx::check_uuid_in_bugzilla(const char* component, const char* UUID) return -1; } -uint32_t ctx::new_bug(const map_crash_report_t& pCrashReport) +uint32_t ctx::new_bug(const map_crash_data_t& pCrashData) { xmlrpc_env env; xmlrpc_env_init(&env); - std::string package = pCrashReport.find(FILENAME_PACKAGE)->second[CD_CONTENT]; - std::string component = pCrashReport.find(FILENAME_COMPONENT)->second[CD_CONTENT]; - std::string release = pCrashReport.find(FILENAME_RELEASE)->second[CD_CONTENT]; - std::string arch = pCrashReport.find(FILENAME_ARCHITECTURE)->second[CD_CONTENT]; - std::string uuid = pCrashReport.find(CD_UUID)->second[CD_CONTENT]; + const std::string& package = get_crash_data_item_content(pCrashData, FILENAME_PACKAGE); + const std::string& component = get_crash_data_item_content(pCrashData, FILENAME_COMPONENT); + const std::string& release = get_crash_data_item_content(pCrashData, FILENAME_RELEASE); + const std::string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE); + const std::string& uuid = get_crash_data_item_content(pCrashData, CD_UUID); std::string summary = "[abrt] crash in " + package; std::string status_whiteboard = "abrt_hash:" + uuid; std::string description = "abrt "VERSION" detected a crash.\n\n"; - description += make_description_bz(pCrashReport); + description += make_description_bz(pCrashData); std::string product; std::string version; @@ -346,15 +346,15 @@ uint32_t ctx::new_bug(const map_crash_report_t& pCrashReport) return bug_id; } -void ctx::add_attachments(const char* bug_id_str, const map_crash_report_t& pCrashReport) +void ctx::add_attachments(const char* bug_id_str, const map_crash_data_t& pCrashData) { xmlrpc_env env; xmlrpc_env_init(&env); xmlrpc_value* result = NULL; - map_crash_report_t::const_iterator it = pCrashReport.begin(); - for (; it != pCrashReport.end(); it++) + map_crash_data_t::const_iterator it = pCrashData.begin(); + for (; it != pCrashData.end(); it++) { const std::string &filename = it->first; const std::string &type = it->second[CD_TYPE]; @@ -404,7 +404,7 @@ CReporterBugzilla::CReporterBugzilla() : CReporterBugzilla::~CReporterBugzilla() {} -std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport, +std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) { @@ -433,8 +433,8 @@ std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport, NoSSLVerify = m_bNoSSLVerify; } - std::string component = pCrashReport.find(FILENAME_COMPONENT)->second[CD_CONTENT]; - std::string uuid = pCrashReport.find(CD_UUID)->second[CD_CONTENT]; + const std::string& component = get_crash_data_item_content(pCrashData, FILENAME_COMPONENT); + const std::string& uuid = get_crash_data_item_content(pCrashData, CD_UUID); try { ctx bz_server(BugzillaXMLRPC.c_str(), NoSSLVerify); @@ -442,12 +442,12 @@ std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport, update_client(_("Checking for duplicates...")); bug_id = bz_server.check_uuid_in_bugzilla(component.c_str(), uuid.c_str()); - update_client(_("Logging into bugzilla...")); if ((Login == "") && (Password == "")) { VERB3 log("Empty login and password"); throw CABRTException(EXCEP_PLUGIN, _("Empty login and password. Please check Bugzilla.conf")); } + update_client(_("Logging into bugzilla...")); bz_server.login(Login.c_str(), Password.c_str()); if (bug_id > 0) @@ -458,12 +458,14 @@ std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport, bz_server.add_plus_one_cc(bug_id, Login.c_str()); } bz_server.logout(); - return BugzillaURL + "/show_bug.cgi?id=" + to_string(bug_id); + BugzillaURL += "/show_bug.cgi?id="; + BugzillaURL += to_string(bug_id); + return BugzillaURL; } update_client(_("Creating new bug...")); - bug_id = bz_server.new_bug(pCrashReport); - bz_server.add_attachments(to_string(bug_id).c_str(), pCrashReport); + bug_id = bz_server.new_bug(pCrashData); + bz_server.add_attachments(to_string(bug_id).c_str(), pCrashData); update_client(_("Logging out...")); bz_server.logout(); @@ -475,12 +477,16 @@ std::string CReporterBugzilla::Report(const map_crash_report_t& pCrashReport, if (bug_id > 0) { - return BugzillaURL + "/show_bug.cgi?id=" + to_string(bug_id); + BugzillaURL += "/show_bug.cgi?id="; + BugzillaURL += to_string(bug_id); + return BugzillaURL; } - return BugzillaURL + "/show_bug.cgi?id="; + BugzillaURL += "/show_bug.cgi?id="; + return BugzillaURL; } +//todo: make static map_plugin_settings_t CReporterBugzilla::parse_settings(const map_plugin_settings_t& pSettings) { map_plugin_settings_t plugin_settings; diff --git a/lib/Plugins/Bugzilla.h b/lib/Plugins/Bugzilla.h index ee6bc6a5..571d0c60 100644 --- a/lib/Plugins/Bugzilla.h +++ b/lib/Plugins/Bugzilla.h @@ -20,7 +20,7 @@ class CReporterBugzilla : public CReporter CReporterBugzilla(); virtual ~CReporterBugzilla(); - virtual std::string Report(const map_crash_report_t& pCrashReport, + virtual std::string Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs); diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index ab29fbbe..28e6bac3 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -40,10 +40,6 @@ using namespace std; #define CORE_PATTERN_IFACE "/proc/sys/kernel/core_pattern" #define CORE_PATTERN "|"CCPP_HOOK_PATH" "DEBUG_DUMPS_DIR" %p %s %u %c" -#define FILENAME_COREDUMP "coredump" -#define FILENAME_BACKTRACE "backtrace" -#define FILENAME_MEMORYMAP "memorymap" - #define DEBUGINFO_CACHE_DIR LOCALSTATEDIR"/cache/abrt-di" CAnalyzerCCpp::CAnalyzerCCpp() : @@ -233,7 +229,7 @@ static int rate_backtrace(const char *backtrace) } } - /* Bogus "backtrace" with zero frames? */ + /* Bogus 'backtrace' with zero frames? */ if (best_possible_rating == 0) return 0; diff --git a/lib/Plugins/Catcut.cpp b/lib/Plugins/Catcut.cpp index b69038fb..1bc51f97 100644 --- a/lib/Plugins/Catcut.cpp +++ b/lib/Plugins/Catcut.cpp @@ -215,13 +215,13 @@ struct ctx: public abrt_xmlrpc_conn { ctx(const char* url, bool no_ssl_verify): abrt_xmlrpc_conn(url, no_ssl_verify) {} string login(const char* login, const char* passwd); - string new_bug(const char *auth_cookie, const map_crash_report_t& pCrashReport); + string new_bug(const char *auth_cookie, const map_crash_data_t& pCrashData); string request_upload(const char* auth_cookie, const char* pTicketName, const char* fileName, const char* description); void add_attachments(const char* xmlrpc_URL, const char* auth_cookie, const char* pTicketName, - const map_crash_report_t& pCrashReport, + const map_crash_data_t& pCrashData, int retryCount, int retryDelaySeconds); }; @@ -263,21 +263,21 @@ ctx::login(const char* login, const char* passwd) } string -ctx::new_bug(const char *auth_cookie, const map_crash_report_t& pCrashReport) +ctx::new_bug(const char *auth_cookie, const map_crash_data_t& pCrashData) { xmlrpc_env env; xmlrpc_env_init(&env); - string package = pCrashReport.find(FILENAME_PACKAGE)->second[CD_CONTENT]; - string component = pCrashReport.find(FILENAME_COMPONENT)->second[CD_CONTENT]; - string release = pCrashReport.find(FILENAME_RELEASE)->second[CD_CONTENT]; - string arch = pCrashReport.find(FILENAME_ARCHITECTURE)->second[CD_CONTENT]; - string uuid = pCrashReport.find(CD_UUID)->second[CD_CONTENT]; + const string& package = get_crash_data_item_content(pCrashData, FILENAME_PACKAGE); + const string& component = get_crash_data_item_content(pCrashData, FILENAME_COMPONENT); + const string& release = get_crash_data_item_content(pCrashData, FILENAME_RELEASE); + const string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE); + const string& uuid = get_crash_data_item_content(pCrashData, CD_UUID); string summary = "[abrt] crash in " + package; string status_whiteboard = "abrt_hash:" + uuid; - string description = make_description_catcut(pCrashReport); + string description = make_description_catcut(pCrashData); string product; string version; @@ -382,13 +382,13 @@ void ctx::add_attachments(const char* xmlrpc_URL, const char* auth_cookie, const char* pTicketName, - const map_crash_report_t& pCrashReport, + const map_crash_data_t& pCrashData, int retryCount, int retryDelaySeconds) { - map_crash_report_t::const_iterator it = pCrashReport.begin(); - for (; it != pCrashReport.end(); it++) + map_crash_data_t::const_iterator it = pCrashData.begin(); + for (; it != pCrashData.end(); it++) { if (it->second[CD_TYPE] == CD_TXT && it->second[CD_TYPE].size() > CD_TEXT_ATT_SIZE) { @@ -446,7 +446,7 @@ CReporterCatcut::CReporterCatcut() : CReporterCatcut::~CReporterCatcut() {} -string CReporterCatcut::Report(const map_crash_report_t& pCrashReport, +string CReporterCatcut::Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) { @@ -459,14 +459,14 @@ string CReporterCatcut::Report(const map_crash_report_t& pCrashReport, string message; if (auth_cookie != "") { - string ticket_name = catcut_server.new_bug(auth_cookie.c_str(), pCrashReport); + string ticket_name = catcut_server.new_bug(auth_cookie.c_str(), pCrashData); if (ticket_name != "") { catcut_server.add_attachments( m_sCatcutURL.c_str(), auth_cookie.c_str(), ticket_name.c_str(), - pCrashReport, + pCrashData, m_nRetryCount, m_nRetryDelay ); diff --git a/lib/Plugins/Catcut.h b/lib/Plugins/Catcut.h index 00f486c0..65c70444 100644 --- a/lib/Plugins/Catcut.h +++ b/lib/Plugins/Catcut.h @@ -20,7 +20,7 @@ class CReporterCatcut : public CReporter virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual std::string Report(const map_crash_report_t& pCrashReport, + virtual std::string Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *Args); }; diff --git a/lib/Plugins/Firefox.cpp b/lib/Plugins/Firefox.cpp index d9807556..e8b12f56 100644 --- a/lib/Plugins/Firefox.cpp +++ b/lib/Plugins/Firefox.cpp @@ -36,10 +36,6 @@ #define CORE_PATTERN_IFACE "/proc/sys/kernel/core_pattern" #define CORE_PATTERN "|"CCPP_HOOK_PATH" "DEBUG_DUMPS_DIR" %p %s %u" -#define FILENAME_COREDUMP "coredump" -#define FILENAME_BACKTRACE "backtrace" -#define FILENAME_MEMORYMAP "memorymap" - #define DEBUGINFO_CACHE_DIR LOCALSTATEDIR"/cache/abrt-di" CAnalyzerFirefox::CAnalyzerFirefox() : @@ -227,7 +223,7 @@ static int rate_backtrace(const char *backtrace) } } - /* Bogus "backtrace" with zero frames? */ + /* Bogus 'backtrace' with zero frames? */ if (best_possible_rating == 0) return 0; diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp index 2e28cf4a..bcb7a723 100644 --- a/lib/Plugins/Kerneloops.cpp +++ b/lib/Plugins/Kerneloops.cpp @@ -30,8 +30,6 @@ #include "ABRTException.h" #include "CommLayerInner.h" -#define FILENAME_KERNELOOPS "kerneloops" - std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir) { log(_("Getting local universal unique identification")); diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp index 5cb525bc..18932aea 100644 --- a/lib/Plugins/KerneloopsReporter.cpp +++ b/lib/Plugins/KerneloopsReporter.cpp @@ -30,8 +30,6 @@ #include "CommLayerInner.h" #include "ABRTException.h" -#define FILENAME_KERNELOOPS "kerneloops" - /* helpers */ static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream) { @@ -93,7 +91,7 @@ CKerneloopsReporter::CKerneloopsReporter() : m_sSubmitURL("http://submit.kerneloops.org/submitoops.php") {} -std::string CKerneloopsReporter::Report(const map_crash_report_t& pCrashReport, +std::string CKerneloopsReporter::Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) { @@ -101,8 +99,8 @@ std::string CKerneloopsReporter::Report(const map_crash_report_t& pCrashReport, update_client(_("Creating and submitting a report...")); - map_crash_report_t::const_iterator it = pCrashReport.find(FILENAME_KERNELOOPS); - if (it != pCrashReport.end()) { + map_crash_data_t::const_iterator it = pCrashData.find(FILENAME_KERNELOOPS); + if (it != pCrashData.end()) { ret = http_post_to_kerneloops_site( m_sSubmitURL.c_str(), it->second[CD_CONTENT].c_str() diff --git a/lib/Plugins/KerneloopsReporter.h b/lib/Plugins/KerneloopsReporter.h index 10e5e644..91326526 100644 --- a/lib/Plugins/KerneloopsReporter.h +++ b/lib/Plugins/KerneloopsReporter.h @@ -43,7 +43,7 @@ class CKerneloopsReporter : public CReporter virtual void SetSettings(const map_plugin_settings_t& pSettings); //ok to delete? // virtual const map_plugin_settings_t& GetSettings(); - virtual std::string Report(const map_crash_report_t& pCrashReport, + virtual std::string Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs); }; diff --git a/lib/Plugins/KerneloopsScanner.cpp b/lib/Plugins/KerneloopsScanner.cpp index 1bb45aba..42ffd409 100644 --- a/lib/Plugins/KerneloopsScanner.cpp +++ b/lib/Plugins/KerneloopsScanner.cpp @@ -34,10 +34,6 @@ #include "KerneloopsSysLog.h" #include "KerneloopsScanner.h" -#include <limits.h> - -#define FILENAME_KERNELOOPS "kerneloops" - // TODO: https://fedorahosted.org/abrt/ticket/78 CKerneloopsScanner::CKerneloopsScanner() @@ -54,8 +50,7 @@ void CKerneloopsScanner::Run(const char *pActionDir, const char *pArgs) { const char *syslog_file = "/var/log/messages"; map_plugin_settings_t::const_iterator it = m_pSettings.find("SysLogFile"); - if (it != m_pSettings.end()) - { + if (it != m_pSettings.end()) { syslog_file = it->second.c_str(); } @@ -205,4 +200,4 @@ void save_oops_to_debug_dump(CKerneloopsScanner *This) This->SaveOopsToDebugDump(); } -} +} /* extern "C" */ diff --git a/lib/Plugins/Logger.cpp b/lib/Plugins/Logger.cpp index d6cc124e..f428aec5 100644 --- a/lib/Plugins/Logger.cpp +++ b/lib/Plugins/Logger.cpp @@ -59,12 +59,12 @@ void CLogger::SetSettings(const map_plugin_settings_t& pSettings) // return m_pSettings; //} -std::string CLogger::Report(const map_crash_report_t& pCrashReport, +std::string CLogger::Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) { - std::string description = make_description_logger(pCrashReport); + std::string description = make_description_logger(pCrashData); description += "\n\n\n"; FILE *fOut; diff --git a/lib/Plugins/Logger.h b/lib/Plugins/Logger.h index c7d76798..02429b2c 100644 --- a/lib/Plugins/Logger.h +++ b/lib/Plugins/Logger.h @@ -1,6 +1,6 @@ /* Logger.h - header file for Logger reporter plugin - - it simple writes report to specific file + - it simply writes report to specific file Copyright (C) 2009 Zdenek Prikryl (zprikryl@redhat.com) Copyright (C) 2009 RedHat inc. @@ -37,7 +37,7 @@ class CLogger : public CReporter virtual void SetSettings(const map_plugin_settings_t& pSettings); //ok to delete? // virtual const map_plugin_settings_t& GetSettings(); - virtual std::string Report(const map_crash_report_t& pCrashReport, + virtual std::string Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs); }; diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp index 2f8448f5..ae8c2dc9 100644 --- a/lib/Plugins/Mailx.cpp +++ b/lib/Plugins/Mailx.cpp @@ -65,7 +65,7 @@ static char** append_str_to_vector(char **vec, unsigned &size, const char *str) return vec; } -std::string CMailx::Report(const map_crash_report_t& pCrashReport, +std::string CMailx::Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) { @@ -75,8 +75,8 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, //TODO: move email body generation to make_descr.cpp std::string binaryFiles, commonFiles, additionalFiles, UUIDFile; - map_crash_report_t::const_iterator it; - for (it = pCrashReport.begin(); it != pCrashReport.end(); it++) + map_crash_data_t::const_iterator it; + for (it = pCrashData.begin(); it != pCrashData.end(); it++) { if (it->second[CD_TYPE] == CD_TXT) { @@ -135,7 +135,7 @@ std::string CMailx::Report(const map_crash_report_t& pCrashReport, args = append_str_to_vector(args, arg_size, m_sEmailTo.c_str()); update_client(_("Sending an email...")); - const char *uid_str = pCrashReport.find(CD_MWUID)->second[CD_CONTENT].c_str(); + const char *uid_str = get_crash_data_item_content(pCrashData, CD_MWUID).c_str(); exec_and_feed_input(xatoi_u(uid_str), emailBody.c_str(), args); while (*args) diff --git a/lib/Plugins/Mailx.h b/lib/Plugins/Mailx.h index 1ddb5ff0..619e349c 100644 --- a/lib/Plugins/Mailx.h +++ b/lib/Plugins/Mailx.h @@ -41,7 +41,7 @@ class CMailx : public CReporter virtual void SetSettings(const map_plugin_settings_t& pSettings); //ok to delete? // virtual const map_plugin_settings_t& GetSettings(); - virtual std::string Report(const map_crash_report_t& pCrashReport, + virtual std::string Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs); }; diff --git a/lib/Plugins/Python.cpp b/lib/Plugins/Python.cpp index 23d6f5c0..ad954681 100644 --- a/lib/Plugins/Python.cpp +++ b/lib/Plugins/Python.cpp @@ -1,15 +1,14 @@ +#include "abrtlib.h" #include "Python.h" #include "DebugDump.h" #include "ABRTException.h" -#define FILENAME_BACKTRACE "backtrace" - static std::string CreateHash(const char *pDebugDumpDir) { - std::string uuid; CDebugDump dd; dd.Open(pDebugDumpDir); - dd.LoadText("uuid", uuid); + std::string uuid; + dd.LoadText(FILENAME_UUID, uuid); return uuid; } diff --git a/lib/Plugins/RunApp.cpp b/lib/Plugins/RunApp.cpp index e2147e26..77f5d3c8 100644 --- a/lib/Plugins/RunApp.cpp +++ b/lib/Plugins/RunApp.cpp @@ -19,7 +19,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +#include "abrtlib.h" #include "RunApp.h" #include "DebugDump.h" #include "ABRTException.h" diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp index 7483768d..b273ae8b 100644 --- a/lib/Plugins/TicketUploader.cpp +++ b/lib/Plugins/TicketUploader.cpp @@ -150,7 +150,7 @@ void CTicketUploader::SendFile(const char *pURL, const char *pFilename) } -string CTicketUploader::Report(const map_crash_report_t& pCrashReport, +string CTicketUploader::Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) { @@ -200,8 +200,8 @@ string CTicketUploader::Report(const map_crash_report_t& pCrashReport, // Copy each entry into the tarball root, // files are simply copied, strings are written to a file - map_crash_report_t::const_iterator it; - for (it = pCrashReport.begin(); it != pCrashReport.end(); it++) + map_crash_data_t::const_iterator it; + for (it = pCrashData.begin(); it != pCrashData.end(); it++) { if (it->second[CD_TYPE] == CD_TXT) { diff --git a/lib/Plugins/TicketUploader.h b/lib/Plugins/TicketUploader.h index 1bc8f6ba..fcc59f06 100644 --- a/lib/Plugins/TicketUploader.h +++ b/lib/Plugins/TicketUploader.h @@ -48,7 +48,7 @@ class CTicketUploader : public CReporter virtual const map_plugin_settings_t& GetSettings(); virtual void SetSettings(const map_plugin_settings_t& pSettings); - virtual std::string Report(const map_crash_report_t& pCrashReport, + virtual std::string Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs); }; diff --git a/lib/Utils/CrashTypes.cpp b/lib/Utils/CrashTypes.cpp new file mode 100644 index 00000000..4824e507 --- /dev/null +++ b/lib/Utils/CrashTypes.cpp @@ -0,0 +1,61 @@ +/* + Copyright (C) 2010 Denys Vlasenko (dvlasenk@redhat.com) + 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 "abrt_types.h" +#include "abrtlib.h" +#include "CrashTypes.h" + +void add_to_crash_data_ext(map_crash_data_t& pCrashData, + const char *pItem, + const char *pType, + const char *pEditable, + const char *pContent) +{ + map_crash_data_t::iterator it = pCrashData.find(pItem); + if (it == pCrashData.end()) { + pCrashData[pItem].push_back(pType); + pCrashData[pItem].push_back(pEditable); + pCrashData[pItem].push_back(pContent); + return; + } + vector_string_t& v = it->second; + while (v.size() < 3) + v.push_back(""); + v[CD_TYPE] = pType; + v[CD_EDITABLE] = pEditable; + v[CD_CONTENT] = pContent; +} + +void add_to_crash_data(map_crash_data_t& pCrashData, + const char *pItem, + const char *pContent) +{ + add_to_crash_data_ext(pCrashData, pItem, CD_TXT, CD_ISNOTEDITABLE, pContent); +} + +const std::string& get_crash_data_item_content(const map_crash_data_t& crash_data, const char *key) +{ + map_crash_data_t::const_iterator it = crash_data.find(key); + if (it == crash_data.end()) { + error_msg_and_die("Error accessing crash data: no ['%s']", key); + } + if (it->second.size() <= CD_CONTENT) { + error_msg_and_die("Error accessing crash data: no ['%s'][%d]", key, CD_CONTENT); + } + return it->second[CD_CONTENT]; +} diff --git a/lib/Utils/CrashTypesSocket.cpp b/lib/Utils/CrashTypesSocket.cpp index 3525c6a5..d555571b 100644 --- a/lib/Utils/CrashTypesSocket.cpp +++ b/lib/Utils/CrashTypesSocket.cpp @@ -87,13 +87,13 @@ std::string crash_data_to_string(const map_crash_data_t& pCrashData) return sCD.str(); } -std::string crash_infos_to_string(const vector_crash_infos_t& pCrashInfos) +std::string crash_infos_to_string(const vector_map_crash_data_t& pCrashDatas) { std::stringstream sCI; unsigned int ii; - for (ii = 0; ii < pCrashInfos.size(); ii++) + for (ii = 0; ii < pCrashDatas.size(); ii++) { - sCI << crash_data_to_string(pCrashInfos[ii]); + sCI << crash_data_to_string(pCrashDatas[ii]); } return sCI.str(); } @@ -164,15 +164,15 @@ map_crash_data_t string_to_crash_data(const std::string& pMessage, int& len) return ci; } -vector_crash_infos_t string_to_crash_infos(const std::string& pMessage) +vector_map_crash_data_t string_to_crash_infos(const std::string& pMessage) { - vector_crash_infos_t vci; + vector_map_crash_data_t vci; std::string message = pMessage; int len; while (message != "") { - map_crash_info_t crash_info = string_to_crash_data(message, len); + map_crash_data_t crash_info = string_to_crash_data(message, len); if (crash_info.size() == 0) { return vci; diff --git a/lib/Utils/DebugDump.h b/lib/Utils/DebugDump.h index d3eebb45..60d3bd3b 100644 --- a/lib/Utils/DebugDump.h +++ b/lib/Utils/DebugDump.h @@ -24,25 +24,6 @@ #define DEBUGDUMP_H_ #include <string> -#include <dirent.h> -#include <stdint.h> - -#define FILENAME_ARCHITECTURE "architecture" -#define FILENAME_KERNEL "kernel" -#define FILENAME_TIME "time" -#define FILENAME_UID "uid" -#define FILENAME_PACKAGE "package" -#define FILENAME_COMPONENT "component" -#define FILENAME_DESCRIPTION "description" -#define FILENAME_ANALYZER "analyzer" -#define FILENAME_RELEASE "release" -#define FILENAME_EXECUTABLE "executable" -#define FILENAME_REASON "reason" -#define FILENAME_COMMENT "comment" -#define FILENAME_REPRODUCE "reproduce" -#define FILENAME_RATING "rating" -#define FILENAME_CMDLINE "cmdline" - class CDebugDump { diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am index a944d977..59607104 100644 --- a/lib/Utils/Makefile.am +++ b/lib/Utils/Makefile.am @@ -20,6 +20,7 @@ libABRTUtils_la_SOURCES = \ stringops.cpp \ dirsize.cpp \ DebugDump.h DebugDump.cpp \ + CrashTypes.cpp \ ABRTException.cpp libABRTUtils_la_CPPFLAGS = \ -Wall -Werror \ diff --git a/lib/Utils/Plugin.h b/lib/Utils/Plugin.h index d7108ce9..e8464032 100644 --- a/lib/Utils/Plugin.h +++ b/lib/Utils/Plugin.h @@ -120,8 +120,8 @@ typedef struct SPluginInfo }; /* helper finctions */ -std::string make_description_bz(const map_crash_report_t& pCrashReport); -std::string make_description_logger(const map_crash_report_t& pCrashReport); -std::string make_description_catcut(const map_crash_report_t& pCrashReport); +std::string make_description_bz(const map_crash_data_t& pCrashData); +std::string make_description_logger(const map_crash_data_t& pCrashData); +std::string make_description_catcut(const map_crash_data_t& pCrashData); #endif diff --git a/lib/Utils/Reporter.h b/lib/Utils/Reporter.h index 0a06a7c9..e9445f93 100644 --- a/lib/Utils/Reporter.h +++ b/lib/Utils/Reporter.h @@ -36,11 +36,11 @@ class CReporter : public CPlugin * A method, which reports a crash report to particular receiver. * The plugin can takes arguments, but the plugin has to parse them * by itself. - * @param pCrashReport A crash report. + * @param pCrashData A crash report. * @param pArgs Plugin's arguments. * @retun A message which can be displayed after a report is created. */ - virtual std::string Report(const map_crash_report_t& pCrashReport, + virtual std::string Report(const map_crash_data_t& pCrashData, const map_plugin_settings_t& pSettings, const char *pArgs) = 0; }; diff --git a/lib/Utils/daemon.cpp b/lib/Utils/daemon.cpp index 05270624..7d60ce31 100644 --- a/lib/Utils/daemon.cpp +++ b/lib/Utils/daemon.cpp @@ -16,7 +16,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "abrtlib.h" -#define FILENAME_CMDLINE "cmdline" + #define VAR_RUN_PID_FILE VAR_RUN"/abrt.pid" static char *append_escaped(char *start, const char *s) diff --git a/lib/Utils/make_descr.cpp b/lib/Utils/make_descr.cpp index 2a0d4a99..e74e9b1d 100644 --- a/lib/Utils/make_descr.cpp +++ b/lib/Utils/make_descr.cpp @@ -50,27 +50,27 @@ static void add_content(bool &was_multiline, string& description, const char *he } } -string make_description_bz(const map_crash_report_t& pCrashReport) +string make_description_bz(const map_crash_data_t& pCrashData) { string description; - map_crash_report_t::const_iterator it; - map_crash_report_t::const_iterator end = pCrashReport.end(); + map_crash_data_t::const_iterator it; + map_crash_data_t::const_iterator end = pCrashData.end(); bool was_multiline = 0; - it = pCrashReport.find(CD_REPRODUCE); + it = pCrashData.find(CD_REPRODUCE); if (it != end && it->second[CD_CONTENT] != "1.\n2.\n3.\n") { add_content(was_multiline, description, "How to reproduce", it->second[CD_CONTENT].c_str()); } - it = pCrashReport.find(CD_COMMENT); + it = pCrashData.find(CD_COMMENT); if (it != end) { add_content(was_multiline, description, "Comment", it->second[CD_CONTENT].c_str()); } - it = pCrashReport.begin(); + it = pCrashData.begin(); for (; it != end; it++) { const string &filename = it->first; @@ -97,13 +97,13 @@ string make_description_bz(const map_crash_report_t& pCrashReport) return description; } -string make_description_logger(const map_crash_report_t& pCrashReport) +string make_description_logger(const map_crash_data_t& pCrashData) { string description; string long_description; - map_crash_report_t::const_iterator it = pCrashReport.begin(); - for (; it != pCrashReport.end(); it++) + map_crash_data_t::const_iterator it = pCrashData.begin(); + for (; it != pCrashData.end(); it++) { const string &filename = it->first; const string &type = it->second[CD_TYPE]; @@ -141,13 +141,13 @@ string make_description_logger(const map_crash_report_t& pCrashReport) } /* This needs more work to make the result less ugly */ -string make_description_catcut(const map_crash_report_t& pCrashReport) +string make_description_catcut(const map_crash_data_t& pCrashData) { - map_crash_report_t::const_iterator end = pCrashReport.end(); - map_crash_report_t::const_iterator it; + map_crash_data_t::const_iterator end = pCrashData.end(); + map_crash_data_t::const_iterator it; string howToReproduce; - it = pCrashReport.find(CD_REPRODUCE); + it = pCrashData.find(CD_REPRODUCE); if (it != end) { howToReproduce = "\n\nHow to reproduce\n" @@ -155,7 +155,7 @@ string make_description_catcut(const map_crash_report_t& pCrashReport) howToReproduce += it->second[CD_CONTENT]; } string comment; - it = pCrashReport.find(CD_COMMENT); + it = pCrashData.find(CD_COMMENT); if (it != end) { comment = "\n\nComment\n" @@ -169,7 +169,7 @@ string make_description_catcut(const map_crash_report_t& pCrashReport) pDescription += "\n\nAdditional information\n" "======\n"; - for (it = pCrashReport.begin(); it != end; it++) + for (it = pCrashData.begin(); it != end; it++) { const string &filename = it->first; const string &type = it->second[CD_TYPE]; diff --git a/lib/Utils/test.cpp b/lib/Utils/test.cpp index fbad1db9..160c107b 100644 --- a/lib/Utils/test.cpp +++ b/lib/Utils/test.cpp @@ -80,7 +80,7 @@ int main(int argc, char** argv) std::cout << "-------------------------------------------" << std::endl; } /* Try to save it into DB */ - map_crash_info_t crashInfo; + map_crash_data_t crashInfo; if (middleWare.SaveDebugDump(argv[1], crashInfo)) { std::cout << "Application Crashed! " << @@ -91,7 +91,7 @@ int main(int argc, char** argv) /* Get Report, so user can change data (remove private stuff) * If we do not want user interaction, just send data immediately */ - map_crash_report_t crashReport; + map_crash_data_t crashReport; middleWare.CreateCrashReport(crashInfo[CD_UUID][CD_CONTENT], crashInfo[CD_UID][CD_CONTENT], crashReport); @@ -7,13 +7,13 @@ # Geert Warrink <geert.warrink@onsnet.nu>, 2009. # Richard van der Luit <nippur@fedoraproject.org>, 2009. # Geert Warrink <geert.warrink@onsnet.nu>, 2009, 2010. -#: ../src/Gui/CCReporterDialog.py:208 +#: ../src/Gui/CCReporterDialog.py:233 msgid "" msgstr "" "Project-Id-Version: abrt.master\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2010-01-14 15:35+0000\n" -"PO-Revision-Date: 2010-01-14 17:50+0100\n" +"POT-Creation-Date: 2010-01-20 09:57+0000\n" +"PO-Revision-Date: 2010-01-20 17:54+0100\n" "Last-Translator: Geert Warrink <geert.warrink@onsnet.nu>\n" "Language-Team: nl <fedora-trans-list@redhat.com>\n" "MIME-Version: 1.0\n" @@ -51,10 +51,6 @@ msgstr "Rapporteer plugins" msgid "Database plugins" msgstr "Databse plugins" -#: ../src/Gui/ABRTPlugin.py:99 -msgid "Plugin name is not set, can't load its settings" -msgstr "Plugin naam is niet ingesteld, kan zijn instellingen niet laden" - #: ../src/Gui/CCDBusBackend.py:74 ../src/Gui/CCDBusBackend.py:97 msgid "Can't connect to system dbus" msgstr "Kan niet verbinden met systeem dbus" @@ -79,7 +75,8 @@ msgstr "(C) 2009 Red Hat, Inc." msgid "About ABRT" msgstr "Over ABRT" -#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/abrt.desktop.in.h:1 +#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/CCMainWindow.py:9 +#: ../src/Gui/report.glade.h:15 ../src/Gui/abrt.desktop.in.h:1 msgid "Automatic Bug Reporting Tool" msgstr "Automatisch bug rapporteer gereedschap" @@ -103,7 +100,7 @@ msgstr "Wacht a.u.b..." msgid "Plugins" msgstr "Plugins" -#: ../src/Gui/ccgui.glade.h:9 ../src/Gui/report.glade.h:6 +#: ../src/Gui/ccgui.glade.h:9 msgid "Report" msgstr "Rapport" @@ -148,31 +145,31 @@ msgid "_Help" msgstr "_Hulp" #. add pixbuff separatelly -#: ../src/Gui/CCMainWindow.py:76 +#: ../src/Gui/CCMainWindow.py:78 msgid "Icon" msgstr "Icoon" -#: ../src/Gui/CCMainWindow.py:84 +#: ../src/Gui/CCMainWindow.py:86 msgid "Package" msgstr "Pakket" -#: ../src/Gui/CCMainWindow.py:85 +#: ../src/Gui/CCMainWindow.py:87 msgid "Application" msgstr "Toepassing" -#: ../src/Gui/CCMainWindow.py:86 +#: ../src/Gui/CCMainWindow.py:88 msgid "Date" msgstr "Datum" -#: ../src/Gui/CCMainWindow.py:87 +#: ../src/Gui/CCMainWindow.py:89 msgid "Crash count" msgstr "Crash count" -#: ../src/Gui/CCMainWindow.py:88 +#: ../src/Gui/CCMainWindow.py:90 msgid "User" msgstr "Gebruiker" -#: ../src/Gui/CCMainWindow.py:156 +#: ../src/Gui/CCMainWindow.py:158 #, python-format msgid "" "Can't show the settings dialog\n" @@ -181,7 +178,7 @@ msgstr "" "Kan de instellingen dialoog niet tonen\n" "%s" -#: ../src/Gui/CCMainWindow.py:167 +#: ../src/Gui/CCMainWindow.py:169 #, python-format msgid "" "Unable to finish current task!\n" @@ -191,7 +188,7 @@ msgstr "" "%s" #. there is something wrong with the daemon if we cant get the dumplist -#: ../src/Gui/CCMainWindow.py:194 +#: ../src/Gui/CCMainWindow.py:196 #, python-format msgid "" "Error while loading the dumplist.\n" @@ -200,15 +197,15 @@ msgstr "" "Fout tijdens het laden van de dumplijst.\n" "%s" -#: ../src/Gui/CCMainWindow.py:231 +#: ../src/Gui/CCMainWindow.py:233 msgid "<b>This crash has been reported:</b>\n" msgstr "<b>Deze crash is gerapporteerd:</b>\n" -#: ../src/Gui/CCMainWindow.py:241 +#: ../src/Gui/CCMainWindow.py:247 msgid "<b>Not reported!</b>" msgstr "<b>Niet gerapporteerd!</b>" -#: ../src/Gui/CCMainWindow.py:290 +#: ../src/Gui/CCMainWindow.py:296 msgid "" "Unable to get report!\n" "Debuginfo is missing?" @@ -216,7 +213,7 @@ msgstr "" "Kan geen rapport krijgen!\n" "Mist debuginfo?" -#: ../src/Gui/CCMainWindow.py:309 +#: ../src/Gui/CCMainWindow.py:322 #, python-format msgid "" "Reporting failed!\n" @@ -225,25 +222,16 @@ msgstr "" "Rapporteren mislukte!\n" "%s" -#: ../src/Gui/CCMainWindow.py:328 ../src/Gui/CCMainWindow.py:355 +#: ../src/Gui/CCMainWindow.py:341 ../src/Gui/CCMainWindow.py:368 #, python-format msgid "Error getting the report: %s" msgstr "Fout tijdens het verkrijgen van het rapport: %s" -#: ../src/Gui/CCReporterDialog.py:136 -#, python-format -msgid "" -"Can't save plugin settings:\n" -" %s" -msgstr "" -"Kan de plugin instellingen niet opslaan:\n" -" %s" - -#: ../src/Gui/CCReporterDialog.py:194 -msgid "Brief description how to reproduce this or what you did..." -msgstr "Korte beschrijving hoe dit te reproduceren is of wat je deed..." +#: ../src/Gui/CCReporterDialog.py:97 +msgid "You must agree with submitting the backtrace." +msgstr "Je moet het goed vinden om de backtrace op te sturen." -#: ../src/Gui/CCReporterDialog.py:239 +#: ../src/Gui/CCReporterDialog.py:108 #, python-format msgid "" "Reporting disabled because the backtrace is unusable.\n" @@ -256,11 +244,11 @@ msgstr "" "<b>debuginfo-install %s</b> \n" "en gebruik dan de Verversen knop om de backtrace opnieuw te genereren." -#: ../src/Gui/CCReporterDialog.py:241 +#: ../src/Gui/CCReporterDialog.py:110 msgid "The backtrace is unusable, you can't report this!" msgstr "De backtrace in niet bruikbaar, je kunt dit niet rapporteren!" -#: ../src/Gui/CCReporterDialog.py:246 +#: ../src/Gui/CCReporterDialog.py:113 msgid "" "The backtrace is incomplete, please make sure you provide good steps to " "reproduce." @@ -268,18 +256,20 @@ msgstr "" "De backtrace is niet compleet, wees er zeker van om voor het genereren de " "juiste stappen op te volgen." -#: ../src/Gui/CCReporterDialog.py:296 +#: ../src/Gui/CCReporterDialog.py:153 #, python-format msgid "" -"<b>WARNING</b>, you're about to send data which might contain sensitive " -"information.\n" -"Do you really want to send <b>%s</b>?\n" +"Can't save plugin settings:\n" +" %s" msgstr "" -"<b>WAARSCHUWING</b>, je staat op het punt om data te versturen die gevoelige " -"informatie kan bevatten\n" -"Wil je <b>%s</b> echt versturen?\n" +"Kan de plugin instellingen niet opslaan:\n" +" %s" -#: ../src/Gui/dialogs.glade.h:1 ../src/Gui/report.glade.h:5 +#: ../src/Gui/CCReporterDialog.py:219 +msgid "Brief description how to reproduce this or what you did..." +msgstr "Korte beschrijving hoe dit te reproduceren is of wat je deed..." + +#: ../src/Gui/dialogs.glade.h:1 ../src/Gui/report.glade.h:17 msgid "Log" msgstr "Log" @@ -310,18 +300,68 @@ msgid " " msgstr " " #: ../src/Gui/report.glade.h:2 -msgid "<b>Comment</b>" -msgstr "<b>Commentaar</b>" +msgid "<b>Attachments</b>" +msgstr "<b>Bijlagen</b>" #: ../src/Gui/report.glade.h:3 -msgid "<b>Following items will be sent</b>" -msgstr "<b>De volgende items zullen verzonden worden</b>" +msgid "<b>Backtrace</b>" +msgstr "<b>Backtrace</b>" #: ../src/Gui/report.glade.h:4 +msgid "<b>Comment</b>" +msgstr "<b>Commentaar</b>" + +#: ../src/Gui/report.glade.h:5 msgid "<b>How to reproduce (in a few simple steps)</b>" msgstr "<b>Hoe het te reproduceren (in een paar eenvoudige stappen)</b>" +#: ../src/Gui/report.glade.h:6 +msgid "<b>Please fix the following problems</b>" +msgstr "<b>Los a.u.b. de volgende problemen op</b>" + #: ../src/Gui/report.glade.h:7 +msgid "<span fgcolor=\"blue\">Architecture:</span>" +msgstr "<span fgcolor=\"blue\">Architectuur:</span>" + +#: ../src/Gui/report.glade.h:8 +msgid "<span fgcolor=\"blue\">Cmdline:</span>" +msgstr "<span fgcolor=\"blue\">Cmdregel:</span>" + +#: ../src/Gui/report.glade.h:9 +msgid "<span fgcolor=\"blue\">Component:</span>" +msgstr "<span fgcolor=\"blue\">Onderdeel:</span>" + +#: ../src/Gui/report.glade.h:10 +msgid "<span fgcolor=\"blue\">Executable:</span>" +msgstr "<span fgcolor=\"blue\">Uitvoerbaar programma:</span>" + +#: ../src/Gui/report.glade.h:11 +msgid "<span fgcolor=\"blue\">Kernel:</span>" +msgstr "<span fgcolor=\"blue\">Kernel:</span>" + +#: ../src/Gui/report.glade.h:12 +msgid "<span fgcolor=\"blue\">Package:</span>" +msgstr "<span fgcolor=\"blue\">Pakket:</span>" + +#: ../src/Gui/report.glade.h:13 +msgid "<span fgcolor=\"blue\">Reason:</span>" +msgstr "<span fgcolor=\"blue\">Reden:</span>" + +#: ../src/Gui/report.glade.h:14 +msgid "<span fgcolor=\"blue\">Release:</span>" +msgstr "<span fgcolor=\"blue\">Vrijgave:</span>" + +#: ../src/Gui/report.glade.h:16 +msgid "I agree to submit this backtrace, which could contain sensitive data" +msgstr "" +"Ik ben er mee eens om deze backtrace in te dienen, hoewel hij gevoelige data " +"kan bevatten" + +#: ../src/Gui/report.glade.h:18 +msgid "N/A" +msgstr "n.v.t." + +#: ../src/Gui/report.glade.h:19 msgid "Send" msgstr "Verzenden" @@ -441,12 +481,12 @@ msgstr "gtk-ok" msgid "View and report application crashes" msgstr "Bekijk en rapporteer crashes van toepassingen" -#: ../src/Applet/Applet.cpp:79 +#: ../src/Applet/Applet.cpp:78 #, c-format msgid "A crash in package %s has been detected" msgstr "Een crash in pakket %s is ontdekt" -#: ../src/Applet/Applet.cpp:254 +#: ../src/Applet/Applet.cpp:253 msgid "ABRT service is not running" msgstr "ABRT service draait niet" @@ -454,7 +494,7 @@ msgstr "ABRT service draait niet" msgid "Warning" msgstr "Waarschuwing" -#: ../src/Daemon/Daemon.cpp:474 +#: ../src/Daemon/Daemon.cpp:473 msgid "" "Report size exceeded the quota. Please check system's MaxCrashReportsSize " "value in abrt.conf." @@ -496,31 +536,31 @@ msgstr "Nieuwe bug aanmaken..." msgid "Logging out..." msgstr "Uitloggen..." -#: ../lib/Plugins/Kerneloops.cpp:37 +#: ../lib/Plugins/Kerneloops.cpp:35 msgid "Getting local universal unique identification" msgstr "Verkrijgen van locale universele unieke identificatie" -#: ../lib/Plugins/CCpp.cpp:257 +#: ../lib/Plugins/CCpp.cpp:253 msgid "Generating backtrace" msgstr "Aangemaakte backtrace" -#: ../lib/Plugins/CCpp.cpp:376 +#: ../lib/Plugins/CCpp.cpp:375 msgid "Starting debuginfo installation" msgstr "Start debuginfo installatie" -#: ../lib/Plugins/CCpp.cpp:527 +#: ../lib/Plugins/CCpp.cpp:526 msgid "Getting local universal unique identification..." msgstr "Verkrijgen van locale universele unieke identificatie..." -#: ../lib/Plugins/CCpp.cpp:546 +#: ../lib/Plugins/CCpp.cpp:545 msgid "Getting global universal unique identification..." msgstr "Verkrijgen van golbale universele unieke identificatie..." -#: ../lib/Plugins/CCpp.cpp:725 +#: ../lib/Plugins/CCpp.cpp:723 msgid "Skipping debuginfo installation" msgstr "Sla debuginfo installatie over" -#: ../lib/Plugins/KerneloopsReporter.cpp:102 +#: ../lib/Plugins/KerneloopsReporter.cpp:100 msgid "Creating and submitting a report..." msgstr "Aanmaken en indienen van rapport..." @@ -552,11 +592,11 @@ msgstr "Kan geen archief maken en versturen: %s" msgid "Can't create and send an archive %s" msgstr "Kan archief %s niet aanmaken en versturen" -#: ../lib/Plugins/KerneloopsScanner.cpp:84 +#: ../lib/Plugins/KerneloopsScanner.cpp:81 msgid "Creating kernel oops crash reports..." msgstr "Aanmaken van kernel oops crash rapporten..." -#: ../lib/Plugins/Mailx.cpp:147 +#: ../lib/Plugins/Mailx.cpp:137 msgid "Sending an email..." msgstr "Versturen van email..." @@ -573,6 +613,21 @@ msgstr "sosreport draaien: %s" msgid "done running sosreport" msgstr "klaar met het draaien van sosreport" +#~ msgid "Plugin name is not set, can't load its settings" +#~ msgstr "Plugin naam is niet ingesteld, kan zijn instellingen niet laden" + +#~ msgid "" +#~ "<b>WARNING</b>, you're about to send data which might contain sensitive " +#~ "information.\n" +#~ "Do you really want to send <b>%s</b>?\n" +#~ msgstr "" +#~ "<b>WAARSCHUWING</b>, je staat op het punt om data te versturen die " +#~ "gevoelige informatie kan bevatten\n" +#~ "Wil je <b>%s</b> echt versturen?\n" + +#~ msgid "<b>Following items will be sent</b>" +#~ msgstr "<b>De volgende items zullen verzonden worden</b>" + #~ msgid "Searching for debug-info packages..." #~ msgstr "Zoeken naar debug-info pakketten..." @@ -585,9 +640,6 @@ msgstr "klaar met het draaien van sosreport" #~ msgid "Starting report creation..." #~ msgstr "Beginnen met rapport aanmaken..." -#~ msgid "<span color=\"white\">Description</span>" -#~ msgstr "<span color=\"white\">Beschrijving</span>" - #~ msgid "Working..." #~ msgstr "Ben bezig..." @@ -2,13 +2,13 @@ # Piotr Drąg <piotrdrag@gmail.com>, 2009. # Tomasz Chrzczonowicz <chrzczonowicz@gmail.com>, 2009. # -#: ../src/Gui/CCReporterDialog.py:208 +#: ../src/Gui/CCReporterDialog.py:233 msgid "" msgstr "" "Project-Id-Version: pl\n" "Report-Msgid-Bugs-To: jmoskovc@redhat.com\n" -"POT-Creation-Date: 2010-01-14 20:43+0000\n" -"PO-Revision-Date: 2010-01-14 22:51+0100\n" +"POT-Creation-Date: 2010-01-19 21:16+0000\n" +"PO-Revision-Date: 2010-01-19 22:28+0100\n" "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n" "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n" "MIME-Version: 1.0\n" @@ -69,7 +69,8 @@ msgstr "(C) 2009 Red Hat, Inc." msgid "About ABRT" msgstr "Informacje o ABRT" -#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/abrt.desktop.in.h:1 +#: ../src/Gui/ccgui.glade.h:3 ../src/Gui/CCMainWindow.py:9 +#: ../src/Gui/report.glade.h:15 ../src/Gui/abrt.desktop.in.h:1 msgid "Automatic Bug Reporting Tool" msgstr "Narzędzie do automatycznego zgłaszania błędów" @@ -93,7 +94,7 @@ msgstr "Proszę czekać..." msgid "Plugins" msgstr "Wtyczki" -#: ../src/Gui/ccgui.glade.h:9 ../src/Gui/report.glade.h:6 +#: ../src/Gui/ccgui.glade.h:9 msgid "Report" msgstr "Zgłoś" @@ -140,31 +141,31 @@ msgid "_Help" msgstr "Pomo_c" #. add pixbuff separatelly -#: ../src/Gui/CCMainWindow.py:77 +#: ../src/Gui/CCMainWindow.py:78 msgid "Icon" msgstr "Ikona" -#: ../src/Gui/CCMainWindow.py:85 +#: ../src/Gui/CCMainWindow.py:86 msgid "Package" msgstr "Pakiet" -#: ../src/Gui/CCMainWindow.py:86 +#: ../src/Gui/CCMainWindow.py:87 msgid "Application" msgstr "Aplikacja" -#: ../src/Gui/CCMainWindow.py:87 +#: ../src/Gui/CCMainWindow.py:88 msgid "Date" msgstr "Data" -#: ../src/Gui/CCMainWindow.py:88 +#: ../src/Gui/CCMainWindow.py:89 msgid "Crash count" msgstr "Liczba awarii" -#: ../src/Gui/CCMainWindow.py:89 +#: ../src/Gui/CCMainWindow.py:90 msgid "User" msgstr "Użytkownik" -#: ../src/Gui/CCMainWindow.py:157 +#: ../src/Gui/CCMainWindow.py:158 #, python-format msgid "" "Can't show the settings dialog\n" @@ -173,7 +174,7 @@ msgstr "" "Nie można wyświetlić okna dialogowego ustawień\n" "%s" -#: ../src/Gui/CCMainWindow.py:168 +#: ../src/Gui/CCMainWindow.py:169 #, python-format msgid "" "Unable to finish current task!\n" @@ -183,7 +184,7 @@ msgstr "" "%s" #. there is something wrong with the daemon if we cant get the dumplist -#: ../src/Gui/CCMainWindow.py:195 +#: ../src/Gui/CCMainWindow.py:196 #, python-format msgid "" "Error while loading the dumplist.\n" @@ -192,15 +193,15 @@ msgstr "" "Błąd podczas wczytywania listy zrzutów.\n" "%s" -#: ../src/Gui/CCMainWindow.py:232 +#: ../src/Gui/CCMainWindow.py:233 msgid "<b>This crash has been reported:</b>\n" msgstr "<b>Ta awaria została zgłoszona:</b>\n" -#: ../src/Gui/CCMainWindow.py:242 +#: ../src/Gui/CCMainWindow.py:247 msgid "<b>Not reported!</b>" msgstr "<b>Nie zgłoszono.</b>" -#: ../src/Gui/CCMainWindow.py:291 +#: ../src/Gui/CCMainWindow.py:296 msgid "" "Unable to get report!\n" "Debuginfo is missing?" @@ -208,7 +209,7 @@ msgstr "" "Nie można uzyskać raportu.\n" "Brak pakietów debuginfo?" -#: ../src/Gui/CCMainWindow.py:310 +#: ../src/Gui/CCMainWindow.py:322 #, python-format msgid "" "Reporting failed!\n" @@ -217,27 +218,16 @@ msgstr "" "Zgłoszenie nie powiodło się.\n" "%s" -#: ../src/Gui/CCMainWindow.py:329 ../src/Gui/CCMainWindow.py:356 +#: ../src/Gui/CCMainWindow.py:341 ../src/Gui/CCMainWindow.py:368 #, python-format msgid "Error getting the report: %s" msgstr "Błąd podczas uzyskiwania raportu: %s" -#: ../src/Gui/CCReporterDialog.py:136 -#, python-format -msgid "" -"Can't save plugin settings:\n" -" %s" -msgstr "" -"Nie można zapisać ustawień wtyczki:\n" -" %s" +#: ../src/Gui/CCReporterDialog.py:97 +msgid "You must agree with submitting the backtrace." +msgstr "Należy wyrazić zgodę na wysłanie wyjątku." -#: ../src/Gui/CCReporterDialog.py:194 -msgid "Brief description how to reproduce this or what you did..." -msgstr "" -"Krótki opis, jak ponownie wywołać tę awarię lub co robił użytkownik (w " -"języku angielskim)..." - -#: ../src/Gui/CCReporterDialog.py:239 +#: ../src/Gui/CCReporterDialog.py:108 #, python-format msgid "" "Reporting disabled because the backtrace is unusable.\n" @@ -250,11 +240,11 @@ msgstr "" "<b>debuginfo-install %s</b>, \n" "a następnie nacisnąć przycisk Odśwież, aby ponownie utworzyć wyjątek." -#: ../src/Gui/CCReporterDialog.py:241 +#: ../src/Gui/CCReporterDialog.py:110 msgid "The backtrace is unusable, you can't report this!" msgstr "Nie można użyć tego wyjątku, więc nie można tego zgłosić." -#: ../src/Gui/CCReporterDialog.py:246 +#: ../src/Gui/CCReporterDialog.py:113 msgid "" "The backtrace is incomplete, please make sure you provide good steps to " "reproduce." @@ -262,18 +252,22 @@ msgstr "" "Wyjątek jest niepełny. Proszę upewnić się, że podano właściwe kroki " "ponownego wywołania awarii." -#: ../src/Gui/CCReporterDialog.py:296 +#: ../src/Gui/CCReporterDialog.py:153 #, python-format msgid "" -"<b>WARNING</b>, you're about to send data which might contain sensitive " -"information.\n" -"Do you really want to send <b>%s</b>?\n" +"Can't save plugin settings:\n" +" %s" +msgstr "" +"Nie można zapisać ustawień wtyczki:\n" +" %s" + +#: ../src/Gui/CCReporterDialog.py:219 +msgid "Brief description how to reproduce this or what you did..." msgstr "" -"<b>OSTRZEŻENIE:</b> za chwilę zostaną wysłane dane, które mogą zawierać " -"poufne informacje.\n" -"Na pewno wysłać <b>%s</b>?\n" +"Krótki opis, jak ponownie wywołać tę awarię lub co robił użytkownik (w " +"języku angielskim)..." -#: ../src/Gui/dialogs.glade.h:1 ../src/Gui/report.glade.h:5 +#: ../src/Gui/dialogs.glade.h:1 ../src/Gui/report.glade.h:17 msgid "Log" msgstr "Dziennik" @@ -305,20 +299,69 @@ msgid " " msgstr " " #: ../src/Gui/report.glade.h:2 -msgid "<b>Comment</b>" -msgstr "<b>Komentarz</b>" +msgid "<b>Attachments</b>" +msgstr "<b>Załączniki</b>" #: ../src/Gui/report.glade.h:3 -msgid "<b>Following items will be sent</b>" -msgstr "<b>Następujące elementy zostaną wysłane</b>" +msgid "<b>Backtrace</b>" +msgstr "<b>Wyjątek</b>" #: ../src/Gui/report.glade.h:4 +msgid "<b>Comment</b>" +msgstr "<b>Komentarz</b>" + +#: ../src/Gui/report.glade.h:5 msgid "<b>How to reproduce (in a few simple steps)</b>" msgstr "" "<b>Jak ponownie wywołać tę awarię (w kilku prostych krokach, w języku " "angielskim)</b>" +#: ../src/Gui/report.glade.h:6 +msgid "<b>Please fix the following problems</b>" +msgstr "<b>Proszę naprawić następujące problemy</b>" + #: ../src/Gui/report.glade.h:7 +msgid "<span fgcolor=\"blue\">Architecture:</span>" +msgstr "<span fgcolor=\"blue\">Architektura:</span>" + +#: ../src/Gui/report.glade.h:8 +msgid "<span fgcolor=\"blue\">Cmdline:</span>" +msgstr "<span fgcolor=\"blue\">Wiersz poleceń:</span>" + +#: ../src/Gui/report.glade.h:9 +msgid "<span fgcolor=\"blue\">Component:</span>" +msgstr "<span fgcolor=\"blue\">Składnik:</span>" + +#: ../src/Gui/report.glade.h:10 +msgid "<span fgcolor=\"blue\">Executable:</span>" +msgstr "<span fgcolor=\"blue\">Plik wykonywalny:</span>" + +#: ../src/Gui/report.glade.h:11 +msgid "<span fgcolor=\"blue\">Kernel:</span>" +msgstr "<span fgcolor=\"blue\">Jądro:</span>" + +#: ../src/Gui/report.glade.h:12 +msgid "<span fgcolor=\"blue\">Package:</span>" +msgstr "<span fgcolor=\"blue\">Pakiet:</span>" + +#: ../src/Gui/report.glade.h:13 +msgid "<span fgcolor=\"blue\">Reason:</span>" +msgstr "<span fgcolor=\"blue\">Przyczyna:</span>" + +#: ../src/Gui/report.glade.h:14 +msgid "<span fgcolor=\"blue\">Release:</span>" +msgstr "<span fgcolor=\"blue\">Wydanie:</span>" + +#: ../src/Gui/report.glade.h:16 +msgid "I agree to submit this backtrace, which could contain sensitive data" +msgstr "" +"Wyrażam zgodę na wysłanie tego wyjątku, który może zawierać prywatne dane" + +#: ../src/Gui/report.glade.h:18 +msgid "N/A" +msgstr "Nie dotyczy" + +#: ../src/Gui/report.glade.h:19 msgid "Send" msgstr "Wyślij" @@ -438,12 +481,12 @@ msgstr "gtk-ok" msgid "View and report application crashes" msgstr "Wyświetlanie i zgłaszanie awarii aplikacji" -#: ../src/Applet/Applet.cpp:79 +#: ../src/Applet/Applet.cpp:78 #, c-format msgid "A crash in package %s has been detected" msgstr "Wykryto awarię pakietu %s" -#: ../src/Applet/Applet.cpp:254 +#: ../src/Applet/Applet.cpp:253 msgid "ABRT service is not running" msgstr "Usługa ABRT nie jest uruchomiona" @@ -451,7 +494,7 @@ msgstr "Usługa ABRT nie jest uruchomiona" msgid "Warning" msgstr "Ostrzeżenie" -#: ../src/Daemon/Daemon.cpp:474 +#: ../src/Daemon/Daemon.cpp:473 msgid "" "Report size exceeded the quota. Please check system's MaxCrashReportsSize " "value in abrt.conf." @@ -493,31 +536,31 @@ msgstr "Dodawanie nowego błędu..." msgid "Logging out..." msgstr "Wylogowywanie..." -#: ../lib/Plugins/Kerneloops.cpp:37 +#: ../lib/Plugins/Kerneloops.cpp:35 msgid "Getting local universal unique identification" msgstr "Uzyskiwanie lokalnego uniwersalnego, unikalnego identyfikatora" -#: ../lib/Plugins/CCpp.cpp:257 +#: ../lib/Plugins/CCpp.cpp:253 msgid "Generating backtrace" msgstr "Tworzenie wyjątku" -#: ../lib/Plugins/CCpp.cpp:376 +#: ../lib/Plugins/CCpp.cpp:375 msgid "Starting debuginfo installation" msgstr "Uruchamianie instalacji pakietów debuginfo" -#: ../lib/Plugins/CCpp.cpp:527 +#: ../lib/Plugins/CCpp.cpp:526 msgid "Getting local universal unique identification..." msgstr "Uzyskiwanie lokalnego uniwersalnego, unikalnego identyfikatora..." -#: ../lib/Plugins/CCpp.cpp:546 +#: ../lib/Plugins/CCpp.cpp:545 msgid "Getting global universal unique identification..." msgstr "Uzyskiwanie globalnego uniwersalnego, unikalnego identyfikatora..." -#: ../lib/Plugins/CCpp.cpp:725 +#: ../lib/Plugins/CCpp.cpp:723 msgid "Skipping debuginfo installation" msgstr "Pomijanie instalacji pakietu debuginfo" -#: ../lib/Plugins/KerneloopsReporter.cpp:102 +#: ../lib/Plugins/KerneloopsReporter.cpp:100 msgid "Creating and submitting a report..." msgstr "Tworzenie i wysyłanie raportu..." @@ -549,11 +592,11 @@ msgstr "Nie można utworzyć i wysłać archiwum: %s" msgid "Can't create and send an archive %s" msgstr "Nie można utworzyć i wysłać archiwum %s" -#: ../lib/Plugins/KerneloopsScanner.cpp:84 +#: ../lib/Plugins/KerneloopsScanner.cpp:81 msgid "Creating kernel oops crash reports..." msgstr "Tworzenie raportów awarii \"kernel oops\"" -#: ../lib/Plugins/Mailx.cpp:147 +#: ../lib/Plugins/Mailx.cpp:137 msgid "Sending an email..." msgstr "Wysłanie wiadomości e-mail..." diff --git a/src/CLI/ABRTSocket.cpp b/src/CLI/ABRTSocket.cpp index 13531342..82c304ee 100644 --- a/src/CLI/ABRTSocket.cpp +++ b/src/CLI/ABRTSocket.cpp @@ -106,7 +106,7 @@ void CABRTSocket::Disconnect() close(m_nSocket); } -vector_crash_infos_t CABRTSocket::GetCrashInfos() +vector_map_crash_data_t CABRTSocket::GetCrashInfos() { std::string message = MESSAGE_GET_CRASH_INFOS; Send(message); @@ -115,7 +115,7 @@ vector_crash_infos_t CABRTSocket::GetCrashInfos() return string_to_crash_infos(message); } -map_crash_report_t CABRTSocket::CreateReport(const std::string &pUUID) +map_crash_data_t CABRTSocket::CreateReport(const std::string &pUUID) { std::string message = MESSAGE_CREATE_REPORT + pUUID; Send(message); @@ -124,7 +124,7 @@ map_crash_report_t CABRTSocket::CreateReport(const std::string &pUUID) return string_to_crash_report(message); } -void CABRTSocket::Report(const map_crash_report_t& pReport) +void CABRTSocket::Report(const map_crash_data_t& pReport) { std::string message = MESSAGE_REPORT + crash_report_to_string(pReport); Send(message); diff --git a/src/CLI/ABRTSocket.h b/src/CLI/ABRTSocket.h index c3a63e51..d4905be1 100644 --- a/src/CLI/ABRTSocket.h +++ b/src/CLI/ABRTSocket.h @@ -20,9 +20,9 @@ class CABRTSocket void Connect(const char *pPath); void Disconnect(); - vector_crash_infos_t GetCrashInfos(); - map_crash_report_t CreateReport(const char *pUUID); - void Report(const map_crash_report_t& pReport); + vector_map_crash_data_t GetCrashInfos(); + map_crash_data_t CreateReport(const char *pUUID); + void Report(const map_crash_data_t& pReport); int32_t DeleteDebugDump(const char *pUUID); }; diff --git a/src/CLI/CLI.cpp b/src/CLI/CLI.cpp index bc8ddf60..2f3b4048 100644 --- a/src/CLI/CLI.cpp +++ b/src/CLI/CLI.cpp @@ -47,12 +47,12 @@ enum OPT_DELETE }; -static void print_crash_infos(vector_crash_infos_t& pCrashInfos, int pMode) +static void print_crash_infos(vector_map_crash_data_t& pCrashInfos, int pMode) { unsigned int ii; for (ii = 0; ii < pCrashInfos.size(); ii++) { - map_crash_info_t& info = pCrashInfos[ii]; + map_crash_data_t& info = pCrashInfos[ii]; if (pMode == OPT_GET_LIST_FULL || info[CD_REPORTED][CD_CONTENT] != "1") { const char *timestr = info[CD_TIME][CD_CONTENT].c_str(); @@ -189,7 +189,7 @@ int main(int argc, char** argv) case OPT_GET_LIST: case OPT_GET_LIST_FULL: { - vector_crash_infos_t ci = call_GetCrashInfos(); + vector_map_crash_data_t ci = call_GetCrashInfos(); print_crash_infos(ci, op); break; } diff --git a/src/CLI/dbus.cpp b/src/CLI/dbus.cpp index 0d03c4d7..ffd1157e 100644 --- a/src/CLI/dbus.cpp +++ b/src/CLI/dbus.cpp @@ -104,7 +104,7 @@ static DBusMessage* send_get_reply_and_unref(DBusMessage* msg) } } -vector_crash_infos_t call_GetCrashInfos() +vector_map_crash_data_t call_GetCrashInfos() { DBusMessage* msg = new_call_msg(__func__ + 5); DBusMessage *reply = send_get_reply_and_unref(msg); @@ -112,7 +112,7 @@ vector_crash_infos_t call_GetCrashInfos() DBusMessageIter in_iter; dbus_message_iter_init(reply, &in_iter); - vector_crash_infos_t argout; + vector_map_crash_data_t argout; int r = load_val(&in_iter, argout); if (r != ABRT_DBUS_LAST_FIELD) /* more values present, or bad type */ error_msg_and_die("dbus call %s: return type mismatch", __func__ + 5); @@ -121,7 +121,7 @@ vector_crash_infos_t call_GetCrashInfos() return argout; } -map_crash_report_t call_CreateReport(const char* uuid) +map_crash_data_t call_CreateReport(const char* uuid) { DBusMessage* msg = new_call_msg(__func__ + 5); dbus_message_append_args(msg, @@ -133,7 +133,7 @@ map_crash_report_t call_CreateReport(const char* uuid) DBusMessageIter in_iter; dbus_message_iter_init(reply, &in_iter); - map_crash_report_t argout; + map_crash_data_t argout; int r = load_val(&in_iter, argout); if (r != ABRT_DBUS_LAST_FIELD) /* more values present, or bad type */ error_msg_and_die("dbus call %s: return type mismatch", __func__ + 5); @@ -142,7 +142,7 @@ map_crash_report_t call_CreateReport(const char* uuid) return argout; } -report_status_t call_Report(const map_crash_report_t& report) +report_status_t call_Report(const map_crash_data_t& report) { DBusMessage* msg = new_call_msg(__func__ + 5); DBusMessageIter out_iter; diff --git a/src/CLI/dbus.h b/src/CLI/dbus.h index c692e198..c6fd7a4d 100644 --- a/src/CLI/dbus.h +++ b/src/CLI/dbus.h @@ -23,9 +23,9 @@ extern DBusConnection* s_dbus_conn; -vector_crash_infos_t call_GetCrashInfos(); -map_crash_report_t call_CreateReport(const char *uuid); -report_status_t call_Report(const map_crash_report_t& report); +vector_map_crash_data_t call_GetCrashInfos(); +map_crash_data_t call_CreateReport(const char *uuid); +report_status_t call_Report(const map_crash_data_t& report); int32_t call_DeleteDebugDump(const char* uuid); #ifdef UNUSED diff --git a/src/CLI/report.cpp b/src/CLI/report.cpp index bc8f9008..11037ca7 100644 --- a/src/CLI/report.cpp +++ b/src/CLI/report.cpp @@ -19,7 +19,8 @@ #include "run-command.h" #include "dbus.h" #include "abrtlib.h" -#include "DebugDump.h" // FILENAME_* defines +#include "DebugDump.h" +#include "CrashTypes.h" // FILENAME_* defines #if HAVE_CONFIG_H # include <config.h> #endif @@ -151,10 +152,10 @@ static void remove_comments_and_unescape(char *str) * Writes a field of crash report to a file. * Field must be writable. */ -static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, +static void write_crash_report_field(FILE *fp, const map_crash_data_t &report, const char *field, const char *description) { - const map_crash_report_t::const_iterator it = report.find(field); + const map_crash_data_t::const_iterator it = report.find(field); if (it == report.end()) { // exit silently, all fields are optional for now @@ -186,7 +187,7 @@ static void write_crash_report_field(FILE *fp, const map_crash_report_t &report, * If the report is successfully stored to the file, a zero value is returned. * On failure, nonzero value is returned. */ -static void write_crash_report(const map_crash_report_t &report, FILE *fp) +static void write_crash_report(const map_crash_data_t &report, FILE *fp) { fprintf(fp, "# Please check this report. Lines starting with '#' will be ignored.\n" "# Lines starting with '%%----' separate fields, please do not delete them.\n\n"); @@ -195,13 +196,13 @@ static void write_crash_report(const map_crash_report_t &report, FILE *fp) _("# Describe the circumstances of this crash below.")); write_crash_report_field(fp, report, CD_REPRODUCE, _("# How to reproduce the crash?")); - write_crash_report_field(fp, report, "backtrace", + write_crash_report_field(fp, report, FILENAME_BACKTRACE, _("# Stack trace: a list of active stack frames at the time the crash occurred\n# Check that it does not contain any sensitive data such as passwords.")); write_crash_report_field(fp, report, CD_UUID, _("# UUID")); write_crash_report_field(fp, report, FILENAME_ARCHITECTURE, _("# Architecture")); - write_crash_report_field(fp, report, "cmdline", _("# Command line")); + write_crash_report_field(fp, report, FILENAME_CMDLINE, _("# Command line")); write_crash_report_field(fp, report, FILENAME_COMPONENT, _("# Component")); - write_crash_report_field(fp, report, "coredump", _("# Core dump")); + write_crash_report_field(fp, report, FILENAME_COREDUMP, _("# Core dump")); write_crash_report_field(fp, report, FILENAME_EXECUTABLE, _("# Executable")); write_crash_report_field(fp, report, FILENAME_KERNEL, _("# Kernel version")); write_crash_report_field(fp, report, FILENAME_PACKAGE, _("# Package")); @@ -217,7 +218,7 @@ static void write_crash_report(const map_crash_report_t &report, FILE *fp) * 1 if the field was changed. * Changes to read-only fields are ignored. */ -static int read_crash_report_field(const char *text, map_crash_report_t &report, +static int read_crash_report_field(const char *text, map_crash_data_t &report, const char *field) { char separator[strlen("\n" FIELD_SEP) + strlen(field) + 2]; // 2 = '\n\0' @@ -234,7 +235,7 @@ static int read_crash_report_field(const char *text, map_crash_report_t &report, else length = end - textfield; - const map_crash_report_t::iterator it = report.find(field); + const map_crash_data_t::iterator it = report.find(field); if (it == report.end()) { error_msg("Field %s not found.\n", field); @@ -278,17 +279,17 @@ static int read_crash_report_field(const char *text, map_crash_report_t &report, * 1 if any field was changed. * Changes to read-only fields are ignored. */ -static int read_crash_report(map_crash_report_t &report, const char *text) +static int read_crash_report(map_crash_data_t &report, const char *text) { int result = 0; result |= read_crash_report_field(text, report, CD_COMMENT); result |= read_crash_report_field(text, report, CD_REPRODUCE); - result |= read_crash_report_field(text, report, "backtrace"); + result |= read_crash_report_field(text, report, FILENAME_BACKTRACE); result |= read_crash_report_field(text, report, CD_UUID); result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE); - result |= read_crash_report_field(text, report, "cmdline"); + result |= read_crash_report_field(text, report, FILENAME_CMDLINE); result |= read_crash_report_field(text, report, FILENAME_COMPONENT); - result |= read_crash_report_field(text, report, "coredump"); + result |= read_crash_report_field(text, report, FILENAME_COREDUMP); result |= read_crash_report_field(text, report, FILENAME_EXECUTABLE); result |= read_crash_report_field(text, report, FILENAME_KERNEL); result |= read_crash_report_field(text, report, FILENAME_PACKAGE); @@ -331,7 +332,7 @@ static int launch_editor(const char *path) int report(const char *uuid, bool always) { // Ask for an initial report. - map_crash_report_t cr = call_CreateReport(uuid); + map_crash_data_t cr = call_CreateReport(uuid); //TODO: error check? if (!always) diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp index 182aa6c2..ddfbba49 100644 --- a/src/Daemon/CommLayerServerDBus.cpp +++ b/src/Daemon/CommLayerServerDBus.cpp @@ -133,7 +133,7 @@ static long get_remote_uid(DBusMessage* call, const char** ppSender = NULL) static int handle_GetCrashInfos(DBusMessage* call, DBusMessage* reply) { long unix_uid = get_remote_uid(call); - vector_crash_infos_t argout1 = GetCrashInfos(to_string(unix_uid).c_str()); + vector_map_crash_data_t argout1 = GetCrashInfos(to_string(unix_uid).c_str()); DBusMessageIter out_iter; dbus_message_iter_init_append(reply, &out_iter); @@ -190,7 +190,7 @@ static int handle_CreateReport(DBusMessage* call, DBusMessage* reply) } long unix_uid = get_remote_uid(call); - map_crash_report_t report = CreateReport(pUUID, to_string(unix_uid).c_str(), /*force:*/ 0); + map_crash_data_t report = CreateReport(pUUID, to_string(unix_uid).c_str(), /*force:*/ 0); DBusMessageIter out_iter; dbus_message_iter_init_append(reply, &out_iter); @@ -206,7 +206,7 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) DBusMessageIter in_iter; dbus_message_iter_init(call, &in_iter); - map_crash_report_t argin1; + map_crash_data_t argin1; r = load_val(&in_iter, argin1); if (r == ABRT_DBUS_ERROR) { @@ -214,9 +214,9 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) return -1; } - map_crash_report_t::const_iterator it_comment = argin1.find(CD_COMMENT); - map_crash_report_t::const_iterator it_reproduce = argin1.find(CD_REPRODUCE); + map_crash_data_t::const_iterator it_comment = argin1.find(CD_COMMENT); const char* comment = (it_comment != argin1.end()) ? it_comment->second[CD_CONTENT].c_str() : ""; + map_crash_data_t::const_iterator it_reproduce = argin1.find(CD_REPRODUCE); const char* reproduce = (it_reproduce != argin1.end()) ? it_reproduce->second[CD_CONTENT].c_str() : ""; const char* errmsg = NULL; if (strlen(comment) > LIMIT_MESSAGE) @@ -249,15 +249,14 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) } } +#if 0 //const char * sender = dbus_message_get_sender(call); if (!user_conf_data.empty()) { - std::string PluginName; map_map_string_t::const_iterator it_user_conf_data = user_conf_data.begin(); for (; it_user_conf_data != user_conf_data.end(); it_user_conf_data++) { - PluginName = it_user_conf_data->first; -#if DEBUG + std::string PluginName = it_user_conf_data->first; std::cout << "plugin name: " << it_user_conf_data->first; map_string_t::const_iterator it_plugin_config; for (it_plugin_config = it_user_conf_data->second.begin(); @@ -266,11 +265,11 @@ static int handle_Report(DBusMessage* call, DBusMessage* reply) { std::cout << " key: " << it_plugin_config->first << " value: " << it_plugin_config->second << std::endl; } -#endif // this would overwrite the default settings //g_pPluginManager->SetPluginSettings(PluginName, sender, plugin_settings); } } +#endif long unix_uid = get_remote_uid(call); report_status_t argout1; diff --git a/src/Daemon/CommLayerServerSocket.cpp b/src/Daemon/CommLayerServerSocket.cpp index 0c5f2e31..b54f9a6e 100644 --- a/src/Daemon/CommLayerServerSocket.cpp +++ b/src/Daemon/CommLayerServerSocket.cpp @@ -130,14 +130,14 @@ void CCommLayerServerSocket::ProcessMessage(const std::string& pMessage, GIOChan if (!strncmp(pMessage.c_str(), MESSAGE_GET_CRASH_INFOS, sizeof(MESSAGE_GET_CRASH_INFOS) - 1)) { - vector_crash_infos_t crashInfos = GetCrashInfos(UID); + vector_map_crash_data_t crashInfos = GetCrashInfos(UID); std::string message = MESSAGE_GET_CRASH_INFOS + crash_infos_to_string(crashInfos); Send(message, pSource); } else if (!strncmp(pMessage.c_str(), MESSAGE_REPORT, sizeof(MESSAGE_REPORT) - 1)) { std::string message = pMessage.substr(sizeof(MESSAGE_REPORT) - 1); - map_crash_report_t report = string_to_crash_report(message); + map_crash_data_t report = string_to_crash_report(message); map_plugin_settings_t plugin_settings; //FIXME: another hack to make this compile // Report(report, plugin_settings, UID); @@ -145,7 +145,7 @@ void CCommLayerServerSocket::ProcessMessage(const std::string& pMessage, GIOChan else if (!strncmp(pMessage.c_str(), MESSAGE_CREATE_REPORT, sizeof(MESSAGE_CREATE_REPORT) - 1)) { // std::string UUID = pMessage.substr(sizeof(MESSAGE_CREATE_REPORT) - 1); -// map_crash_report_t crashReport = CreateReport(UUID, UID); +// map_crash_data_t crashReport = CreateReport(UUID, UID); //use CreateReportThread instead of CreateReport? // std::string message = MESSAGE_CREATE_REPORT + crash_report_to_string(crashReport); // Send(message, pSource); @@ -211,22 +211,22 @@ CCommLayerServerSocket::~CCommLayerServerSocket() close(m_nSocket); } -vector_crash_infos_t CCommLayerServerSocket::GetCrashInfos(const std::string &pSender) +vector_map_crash_data_t CCommLayerServerSocket::GetCrashInfos(const std::string &pSender) { - vector_crash_infos_t crashInfos; + vector_map_crash_data_t crashInfos; crashInfos = ::GetCrashInfos(pSender); return crashInfos; } //reimplement as CreateReportThread(...)? -//map_crash_report_t CCommLayerServerSocket::CreateReport(const std::string &pUUID, const std::string &pSender) +//map_crash_data_t CCommLayerServerSocket::CreateReport(const std::string &pUUID, const std::string &pSender) //{ -// map_crash_report_t crashReport; +// map_crash_data_t crashReport; // crashReport = ::CreateReport(pUUID, pSender); // return crashReport; //} -report_status_t CCommLayerServerSocket::Report(const map_crash_report_t& pReport, const std::string& pSender) +report_status_t CCommLayerServerSocket::Report(const map_crash_data_t& pReport, const std::string& pSender) { report_status_t rs; //FIXME: a hack to make this compile, but we don't use sockets anyway diff --git a/src/Daemon/CommLayerServerSocket.h b/src/Daemon/CommLayerServerSocket.h index 753b67af..c511954c 100644 --- a/src/Daemon/CommLayerServerSocket.h +++ b/src/Daemon/CommLayerServerSocket.h @@ -26,8 +26,8 @@ class CCommLayerServerSocket : public CCommLayerServer CCommLayerServerSocket(); virtual ~CCommLayerServerSocket(); - virtual vector_crash_infos_t GetCrashInfos(const char *pSender); - virtual report_status_t Report(const map_crash_report_t& pReport, const char *pSender); + virtual vector_map_crash_data_t GetCrashInfos(const char *pSender); + virtual report_status_t Report(const map_crash_data_t& pReport, const char *pSender); virtual void DeleteDebugDump(const char *pUUID, const char *pSender); virtual void Crash(const char *arg1); diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp index 59f9e65b..80d8cd47 100644 --- a/src/Daemon/CrashWatcher.cpp +++ b/src/Daemon/CrashWatcher.cpp @@ -45,9 +45,9 @@ CCrashWatcher::~CCrashWatcher() { } -vector_crash_infos_t GetCrashInfos(const char *pUID) +vector_map_crash_data_t GetCrashInfos(const char *pUID) { - vector_crash_infos_t retval; + vector_map_crash_data_t retval; log("Getting crash infos..."); try { @@ -58,7 +58,7 @@ vector_crash_infos_t GetCrashInfos(const char *pUID) for (ii = 0; ii < UUIDsUIDs.size(); ii++) { mw_result_t res; - map_crash_info_t info; + map_crash_data_t info; const char *uuid = UUIDsUIDs[ii].first.c_str(); const char *uid = UUIDsUIDs[ii].second.c_str(); @@ -96,15 +96,14 @@ vector_crash_infos_t GetCrashInfos(const char *pUID) * StartJob dbus call already did all the processing, and we just retrieve * the result from dump directory, which is fast. */ -map_crash_report_t CreateReport(const char* pUUID, const char* pUID, int force) +map_crash_data_t CreateReport(const char* pUUID, const char* pUID, int force) { - map_crash_info_t crashReport; - /* FIXME: starting from here, any shared data must be protected with a mutex. * For example, CreateCrashReport does: * g_pPluginManager->GetDatabase(g_settings_sDatabase.c_str()); * which is unsafe wrt concurrent updates to g_pPluginManager state. */ + map_crash_data_t crashReport; mw_result_t res = CreateCrashReport(pUUID, pUID, force, crashReport); switch (res) { @@ -141,7 +140,7 @@ static void* create_report(void* arg) try { log("Creating report..."); - map_crash_info_t crashReport = CreateReport(thread_data->UUID, thread_data->UID, thread_data->force); + map_crash_data_t crashReport = CreateReport(thread_data->UUID, thread_data->UID, thread_data->force); g_pCommLayer->JobDone(thread_data->peer, thread_data->UUID); } catch (CABRTException& e) diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h index 8d56c4ec..1e672b96 100644 --- a/src/Daemon/CrashWatcher.h +++ b/src/Daemon/CrashWatcher.h @@ -48,9 +48,9 @@ class CCrashWatcher virtual void Warning(const char *pMessage, const char* peer, uint64_t pJobID); }; -vector_crash_infos_t GetCrashInfos(const char *pUID); +vector_map_crash_data_t GetCrashInfos(const char *pUID); int CreateReportThread(const char* pUUID, const char* pUID, int force, const char* pSender); -map_crash_report_t CreateReport(const char* pUUID, const char* pUID, int force); +map_crash_data_t CreateReport(const char* pUUID, const char* pUID, int force); int DeleteDebugDump(const char *pUUID, const char *pUID); void DeleteDebugDump_by_dir(const char *dump_dir); diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index dc547af3..c7acffc3 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -51,15 +51,15 @@ * - signal: we got SIGTERM or SIGINT * * DBus methods we have: - * - GetCrashInfos(): returns a vector_crash_infos_t (vector_map_vector_string_t) + * - GetCrashInfos(): returns a vector_map_crash_data_t (vector_map_vector_string_t) * of crashes for given uid * v[N]["executable"/"uid"/"kernel"/"backtrace"][N] = "contents" * - StartJob(UUID,force): starts creating a report for /var/cache/abrt/DIR with this UUID. * Returns job id (uint64). * After thread returns, when report creation thread has finished, * JobDone(client_dbus_ID,UUID) dbus signal is emitted. - * - CreateReport(UUID): returns map_crash_report_t (map_vector_string_t) - * - Report(map_crash_report_t (map_vector_string_t[, map_map_string_t])): + * - CreateReport(UUID): returns map_crash_data_t (map_vector_string_t) + * - Report(map_crash_data_t (map_vector_string_t[, map_map_string_t])): * "Please report this crash": calls Report() of all registered reporter plugins. * Returns report_status_t (map_vector_string_t) - the status of each call. * 2nd parameter is the contents of user's abrt.conf. @@ -320,9 +320,9 @@ static void FindNewDumps(const char* pPath) vector_string_t::iterator itt = dirs.begin(); for (; itt != dirs.end(); ++itt) { - map_crash_info_t crashinfo; try { + map_crash_data_t crashinfo; mw_result_t res = SaveDebugDump(itt->c_str(), crashinfo); switch (res) { @@ -476,11 +476,11 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin worst_dir = ""; } - map_crash_info_t crashinfo; try { std::string fullname = concat_path_file(DEBUG_DUMPS_DIR, name); - + map_crash_data_t crashinfo; +//todo: rename SaveDebugDump to ???? it does not save crashinfo, it FETCHES crashinfo mw_result_t res = SaveDebugDump(fullname.c_str(), crashinfo); switch (res) { @@ -501,7 +501,7 @@ static gboolean handle_inotify_cb(GIOChannel *gio, GIOCondition condition, gpoin if (analyzer_has_AutoReportUIDs(analyzer, uid_str)) { VERB1 log("Reporting the crash automatically"); - map_crash_report_t crash_report; + map_crash_data_t crash_report; mw_result_t crash_result = CreateCrashReport( crashinfo[CD_UUID][CD_CONTENT].c_str(), uid_str, /*force:*/ 0, crash_report diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index c2a122a7..a2b20e68 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -85,8 +85,8 @@ static char* is_text_file(const char *name, ssize_t *sz) } /* Some files in our dump directories are known to always be textual */ - if (strcmp(name, "backtrace") == 0 - || strcmp(name, "cmdline") == 0 + if (strcmp(name, FILENAME_BACKTRACE) == 0 + || strcmp(name, FILENAME_CMDLINE) == 0 ) { return buf; } @@ -120,29 +120,11 @@ static char* is_text_file(const char *name, ssize_t *sz) return NULL; /* it's binary */ } -/** - * Transforms a debugdump direcortry to inner crash - * report form. This form is used for later reporting. - * @param pDebugDumpDir A debugdump dir containing all necessary data. - * @param pCrashReport A created crash report. - */ -static void DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_report_t& pCrashReport) +static void load_crash_data_from_debug_dump(CDebugDump& dd, map_crash_data_t& data) { - CDebugDump dd; - dd.Open(pDebugDumpDir); - if (!dd.Exist(FILENAME_ARCHITECTURE) - || !dd.Exist(FILENAME_KERNEL) - || !dd.Exist(FILENAME_PACKAGE) - || !dd.Exist(FILENAME_COMPONENT) - || !dd.Exist(FILENAME_RELEASE) - || !dd.Exist(FILENAME_EXECUTABLE) - ) { - throw CABRTException(EXCEP_ERROR, "DebugDumpToCrashReport(): One or more of important file(s) are missing"); - } - std::string short_name; std::string full_name; - pCrashReport.clear(); + dd.InitGetNextFile(); while (dd.GetNextFile(&short_name, &full_name)) { @@ -150,11 +132,11 @@ static void DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_report_t char *text = is_text_file(full_name.c_str(), &sz); if (!text) { - add_crash_data_to_crash_report(pCrashReport, - short_name, - CD_BIN, - CD_ISNOTEDITABLE, - full_name + add_to_crash_data_ext(data, + short_name.c_str(), + CD_BIN, + CD_ISNOTEDITABLE, + full_name.c_str() ); continue; } @@ -173,7 +155,12 @@ static void DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_report_t || short_name == FILENAME_RELEASE || short_name == FILENAME_EXECUTABLE ) { - add_crash_data_to_crash_report(pCrashReport, short_name, CD_TXT, CD_ISNOTEDITABLE, content); + add_to_crash_data_ext(data, + short_name.c_str(), + CD_TXT, + CD_ISNOTEDITABLE, + content.c_str() + ); continue; } @@ -184,18 +171,41 @@ static void DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_report_t && short_name != FILENAME_REPRODUCE && short_name != FILENAME_COMMENT ) { - add_crash_data_to_crash_report( - pCrashReport, - short_name, + add_to_crash_data_ext( + data, + short_name.c_str(), CD_TXT, CD_ISEDITABLE, - content + content.c_str() ); } } } /** + * Transforms a debugdump directory to inner crash + * report form. This form is used for later reporting. + * @param pDebugDumpDir A debugdump dir containing all necessary data. + * @param pCrashData A created crash report. + */ +static void DebugDumpToCrashReport(const char *pDebugDumpDir, map_crash_data_t& pCrashData) +{ + CDebugDump dd; + dd.Open(pDebugDumpDir); + if (!dd.Exist(FILENAME_ARCHITECTURE) + || !dd.Exist(FILENAME_KERNEL) + || !dd.Exist(FILENAME_PACKAGE) + || !dd.Exist(FILENAME_COMPONENT) + || !dd.Exist(FILENAME_RELEASE) + || !dd.Exist(FILENAME_EXECUTABLE) + ) { + throw CABRTException(EXCEP_ERROR, "DebugDumpToCrashReport(): One or more of important file(s) are missing"); + } + + load_crash_data_from_debug_dump(dd, pCrashData); +} + +/** * Get a local UUID from particular analyzer plugin. * @param pAnalyzer A name of an analyzer plugin. * @param pDebugDumpDir A debugdump dir containing all necessary data. @@ -250,7 +260,7 @@ static void CreateReport(const char *pAnalyzer, mw_result_t CreateCrashReport(const char *pUUID, const char *pUID, int force, - map_crash_report_t& pCrashReport) + map_crash_data_t& pCrashData) { VERB2 log("CreateCrashReport('%s','%s',result)", pUUID, pUID); @@ -272,7 +282,6 @@ mw_result_t CreateCrashReport(const char *pUUID, { CDebugDump dd; std::string analyzer; - std::string gUUID; std::string comment; std::string reproduce = "1.\n2.\n3.\n"; @@ -292,20 +301,20 @@ mw_result_t CreateCrashReport(const char *pUUID, VERB3 log(" CreateReport('%s')", analyzer.c_str()); CreateReport(analyzer.c_str(), row.m_sDebugDumpDir.c_str(), force); - gUUID = GetGlobalUUID(analyzer.c_str(), row.m_sDebugDumpDir.c_str()); + std::string gUUID = GetGlobalUUID(analyzer.c_str(), row.m_sDebugDumpDir.c_str()); VERB3 log(" GetGlobalUUID:'%s'", gUUID.c_str()); - VERB3 log(" RunAnalyzerActions"); + VERB3 log(" RunAnalyzerActions('%s','%s')", analyzer.c_str(), row.m_sDebugDumpDir.c_str()); RunAnalyzerActions(analyzer.c_str(), row.m_sDebugDumpDir.c_str()); VERB3 log(" DebugDumpToCrashReport"); - DebugDumpToCrashReport(row.m_sDebugDumpDir.c_str(), pCrashReport); + DebugDumpToCrashReport(row.m_sDebugDumpDir.c_str(), pCrashData); - add_crash_data_to_crash_report(pCrashReport, CD_UUID, CD_TXT, CD_ISNOTEDITABLE, gUUID); - add_crash_data_to_crash_report(pCrashReport, CD_MWANALYZER, CD_SYS, CD_ISNOTEDITABLE, analyzer); - add_crash_data_to_crash_report(pCrashReport, CD_MWUID, CD_SYS, CD_ISNOTEDITABLE, pUID); - add_crash_data_to_crash_report(pCrashReport, CD_MWUUID, CD_SYS, CD_ISNOTEDITABLE, pUUID); - add_crash_data_to_crash_report(pCrashReport, CD_COMMENT, CD_TXT, CD_ISEDITABLE, comment); - add_crash_data_to_crash_report(pCrashReport, CD_REPRODUCE, CD_TXT, CD_ISEDITABLE, reproduce); + add_to_crash_data_ext(pCrashData, CD_UUID , CD_TXT, CD_ISNOTEDITABLE, gUUID.c_str() ); + add_to_crash_data_ext(pCrashData, CD_MWANALYZER, CD_SYS, CD_ISNOTEDITABLE, analyzer.c_str() ); + add_to_crash_data_ext(pCrashData, CD_MWUID , CD_SYS, CD_ISNOTEDITABLE, pUID ); + add_to_crash_data_ext(pCrashData, CD_MWUUID , CD_SYS, CD_ISNOTEDITABLE, pUUID ); + add_to_crash_data_ext(pCrashData, CD_COMMENT , CD_TXT, CD_ISEDITABLE , comment.c_str() ); + add_to_crash_data_ext(pCrashData, CD_REPRODUCE , CD_TXT, CD_ISEDITABLE , reproduce.c_str()); } catch (CABRTException& e) { @@ -362,7 +371,7 @@ void RunActionsAndReporters(const char *pDebugDumpDir) if (tp == REPORTER) { CReporter* reporter = g_pPluginManager->GetReporter(plugin_name); /* can't be NULL */ - map_crash_report_t crashReport; + map_crash_data_t crashReport; DebugDumpToCrashReport(pDebugDumpDir, crashReport); VERB2 log("%s.Report(...)", plugin_name); reporter->Report(crashReport, plugin_settings, it_ar->second.c_str()); @@ -382,20 +391,20 @@ void RunActionsAndReporters(const char *pDebugDumpDir) } -static bool CheckReport(const map_crash_report_t& pCrashReport) +static bool CheckReport(const map_crash_data_t& pCrashData) { - map_crash_report_t::const_iterator it_analyzer = pCrashReport.find(CD_MWANALYZER); - map_crash_report_t::const_iterator it_mwuid = pCrashReport.find(CD_MWUID); - map_crash_report_t::const_iterator it_mwuuid = pCrashReport.find(CD_MWUUID); + map_crash_data_t::const_iterator it_analyzer = pCrashData.find(CD_MWANALYZER); + map_crash_data_t::const_iterator it_mwuid = pCrashData.find(CD_MWUID); + map_crash_data_t::const_iterator it_mwuuid = pCrashData.find(CD_MWUUID); - map_crash_report_t::const_iterator it_package = pCrashReport.find(FILENAME_PACKAGE); - map_crash_report_t::const_iterator it_architecture = pCrashReport.find(FILENAME_ARCHITECTURE); - map_crash_report_t::const_iterator it_kernel = pCrashReport.find(FILENAME_KERNEL); - map_crash_report_t::const_iterator it_component = pCrashReport.find(FILENAME_COMPONENT); - map_crash_report_t::const_iterator it_release = pCrashReport.find(FILENAME_RELEASE); - map_crash_report_t::const_iterator it_executable = pCrashReport.find(FILENAME_EXECUTABLE); + map_crash_data_t::const_iterator it_package = pCrashData.find(FILENAME_PACKAGE); + map_crash_data_t::const_iterator it_architecture = pCrashData.find(FILENAME_ARCHITECTURE); + map_crash_data_t::const_iterator it_kernel = pCrashData.find(FILENAME_KERNEL); + map_crash_data_t::const_iterator it_component = pCrashData.find(FILENAME_COMPONENT); + map_crash_data_t::const_iterator it_release = pCrashData.find(FILENAME_RELEASE); + map_crash_data_t::const_iterator it_executable = pCrashData.find(FILENAME_EXECUTABLE); - map_crash_report_t::const_iterator end = pCrashReport.end(); + map_crash_data_t::const_iterator end = pCrashData.end(); if (it_package == end) { @@ -427,38 +436,38 @@ static bool CheckReport(const map_crash_report_t& pCrashReport) return true; } -report_status_t Report(const map_crash_report_t& pCrashReport, +report_status_t Report(const map_crash_data_t& pCrashData, map_map_string_t& pSettings, const char *pUID) { report_status_t ret; - /* dbus handler passes pCrashReport from user without checking it */ + /* dbus handler passes pCrashData from user without checking it */ - if (!CheckReport(pCrashReport)) + if (!CheckReport(pCrashData)) { throw CABRTException(EXCEP_ERROR, "Report(): Some of mandatory report data are missing."); } - std::string analyzer = pCrashReport.find(CD_MWANALYZER)->second[CD_CONTENT]; - std::string UID = pCrashReport.find(CD_MWUID)->second[CD_CONTENT]; - std::string UUID = pCrashReport.find(CD_MWUUID)->second[CD_CONTENT]; - std::string packageNVR = pCrashReport.find(FILENAME_PACKAGE)->second[CD_CONTENT]; + const std::string& analyzer = get_crash_data_item_content(pCrashData, CD_MWANALYZER); + const std::string& UID = get_crash_data_item_content(pCrashData, CD_MWUID); + const std::string& UUID = get_crash_data_item_content(pCrashData, CD_MWUUID); + const std::string& packageNVR = get_crash_data_item_content(pCrashData, FILENAME_PACKAGE); std::string packageName = packageNVR.substr(0, packageNVR.rfind("-", packageNVR.rfind("-") - 1)); // Save comment and "how to reproduce" - map_crash_report_t::const_iterator it_comment = pCrashReport.find(CD_COMMENT); - map_crash_report_t::const_iterator it_reproduce = pCrashReport.find(CD_REPRODUCE); - if (it_comment != pCrashReport.end() || it_reproduce != pCrashReport.end()) + map_crash_data_t::const_iterator it_comment = pCrashData.find(CD_COMMENT); + map_crash_data_t::const_iterator it_reproduce = pCrashData.find(CD_REPRODUCE); + if (it_comment != pCrashData.end() || it_reproduce != pCrashData.end()) { std::string pDumpDir = getDebugDumpDir(UUID.c_str(), UID.c_str()); CDebugDump dd; dd.Open(pDumpDir.c_str()); - if (it_comment != pCrashReport.end()) + if (it_comment != pCrashData.end()) { dd.SaveText(FILENAME_COMMENT, it_comment->second[CD_CONTENT].c_str()); } - if (it_reproduce != pCrashReport.end()) + if (it_reproduce != pCrashData.end()) { dd.SaveText(FILENAME_REPRODUCE, it_reproduce->second[CD_CONTENT].c_str()); } @@ -509,7 +518,7 @@ report_status_t Report(const map_crash_report_t& pCrashReport, } #endif map_plugin_settings_t plugin_settings = pSettings[plugin_name]; - std::string res = reporter->Report(pCrashReport, plugin_settings, it_r->second.c_str()); + std::string res = reporter->Report(pCrashData, plugin_settings, it_r->second.c_str()); #if 0 /* Using ~user/.abrt/ is bad wrt security */ if (home != "") @@ -767,7 +776,7 @@ bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char* uid) return false; } -void autoreport(const pair_string_string_t& reporter_options, const map_crash_report_t& crash_report) +void autoreport(const pair_string_string_t& reporter_options, const map_crash_data_t& crash_report) { CReporter* reporter = g_pPluginManager->GetReporter(reporter_options.first.c_str()); if (!reporter) @@ -821,14 +830,14 @@ static void RunAnalyzerActions(const char *pAnalyzer, const char *pDebugDumpDir) * @param pUID An UID of an user. * @param pTime Time when a crash occurs. * @param pDebugDumpPath A debugdump path. - * @param pCrashInfo A filled crash info. + * @param pCrashData A filled crash info. * @return It return results of operation. See mw_result_t. */ static mw_result_t SaveDebugDumpToDatabase(const char *pUUID, const char *pUID, const char *pTime, const char *pDebugDumpDir, - map_crash_info_t& pCrashInfo) + map_crash_data_t& pCrashData) { CDatabase* database = g_pPluginManager->GetDatabase(g_settings_sDatabase.c_str()); database->Connect(); @@ -837,7 +846,7 @@ static mw_result_t SaveDebugDumpToDatabase(const char *pUUID, database_row_t row = database->GetRow(pUUID, pUID); database->DisConnect(); - mw_result_t res = FillCrashInfo(pUUID, pUID, pCrashInfo); + mw_result_t res = FillCrashInfo(pUUID, pUID, pCrashData); if (res == MW_OK) { if (row.m_sReported == "1") @@ -865,7 +874,7 @@ std::string getDebugDumpDir(const char *pUUID, } mw_result_t SaveDebugDump(const char *pDebugDumpDir, - map_crash_info_t& pCrashInfo) + map_crash_data_t& pCrashData) { std::string UID; std::string time; @@ -907,12 +916,12 @@ mw_result_t SaveDebugDump(const char *pDebugDumpDir, const char *uid_str = analyzer_has_InformAllUsers(analyzer.c_str()) ? "-1" : UID.c_str(); - return SaveDebugDumpToDatabase(lUUID.c_str(), uid_str, time.c_str(), pDebugDumpDir, pCrashInfo); + return SaveDebugDumpToDatabase(lUUID.c_str(), uid_str, time.c_str(), pDebugDumpDir, pCrashData); } mw_result_t FillCrashInfo(const char *pUUID, const char *pUID, - map_crash_info_t& pCrashInfo) + map_crash_data_t& pCrashData) { CDatabase* database = g_pPluginManager->GetDatabase(g_settings_sDatabase.c_str()); database->Connect(); @@ -938,18 +947,18 @@ mw_result_t FillCrashInfo(const char *pUUID, return MW_ERROR; } - pCrashInfo.clear(); - add_crash_data_to_crash_info(pCrashInfo, CD_EXECUTABLE, executable); - add_crash_data_to_crash_info(pCrashInfo, CD_PACKAGE, package); - add_crash_data_to_crash_info(pCrashInfo, CD_DESCRIPTION, description); - add_crash_data_to_crash_info(pCrashInfo, CD_UUID, row.m_sUUID); - add_crash_data_to_crash_info(pCrashInfo, CD_UID, row.m_sUID); - add_crash_data_to_crash_info(pCrashInfo, CD_COUNT, row.m_sCount); - add_crash_data_to_crash_info(pCrashInfo, CD_TIME, row.m_sTime); - add_crash_data_to_crash_info(pCrashInfo, CD_REPORTED, row.m_sReported); - add_crash_data_to_crash_info(pCrashInfo, CD_MESSAGE, row.m_sMessage); - add_crash_data_to_crash_info(pCrashInfo, CD_MWDDD, row.m_sDebugDumpDir); - add_crash_data_to_crash_info(pCrashInfo, CD_MWANALYZER, analyzer); + pCrashData.clear(); + add_to_crash_data(pCrashData, CD_EXECUTABLE , executable.c_str() ); + add_to_crash_data(pCrashData, CD_PACKAGE , package.c_str() ); + add_to_crash_data(pCrashData, CD_DESCRIPTION, description.c_str() ); + add_to_crash_data(pCrashData, CD_UUID , row.m_sUUID.c_str() ); + add_to_crash_data(pCrashData, CD_UID , row.m_sUID.c_str() ); + add_to_crash_data(pCrashData, CD_COUNT , row.m_sCount.c_str() ); + add_to_crash_data(pCrashData, CD_TIME , row.m_sTime.c_str() ); + add_to_crash_data(pCrashData, CD_REPORTED , row.m_sReported.c_str() ); + add_to_crash_data(pCrashData, CD_MESSAGE , row.m_sMessage.c_str() ); + add_to_crash_data(pCrashData, CD_MWDDD , row.m_sDebugDumpDir.c_str()); + add_to_crash_data(pCrashData, CD_MWANALYZER , analyzer.c_str() ); return MW_OK; } diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h index b2b58dcd..5fab84d3 100644 --- a/src/Daemon/MiddleWare.h +++ b/src/Daemon/MiddleWare.h @@ -60,13 +60,13 @@ void LoadOpenGPGPublicKey(const char* key); * is successful, then a crash report is filled. * @param pAnalyzer A name of an analyzer plugin. * @param pDebugDumpPath A debugdump dir containing all necessary data. - * @param pCrashReport A filled crash report. + * @param pCrashData A filled crash report. * @return It return results of operation. See mw_result_t. */ mw_result_t CreateCrashReport(const char *pUUID, const char *pUID, int force, - map_crash_report_t& pCrashReport); + map_crash_data_t& pCrashData); /** * Activates particular action plugin. * @param pActionDir A directory, which is passed as working to a action plugin. @@ -88,11 +88,11 @@ void RunActionsAndReporters(const char *pDebugDumpDir); * fails, then default config is used. If pUID is emply string, default * config is used. * ...). - * @param pCrashReport A crash report. + * @param pCrashData A crash report. * @param pUID An user uid * @return A report status, which reporters ends successfuly with messages. */ -report_status_t Report(const map_crash_report_t& pCrashReport, +report_status_t Report(const map_crash_data_t& pCrashData, map_map_string_t& pSettings, const char *pUID); /** @@ -108,22 +108,22 @@ std::string getDebugDumpDir( const char *pUUID, * Saves debugdump into database. If saving is successful, * it fills crash info. * @param pDebugDumpDir A debugdump directory. - * @param pCrashInfo A crash info. + * @param pCrashData A crash info. * @return It return results of operation. See mw_result_t. */ mw_result_t SaveDebugDump(const char *pDebugDumpDir, - map_crash_info_t& pCrashInfo); + map_crash_data_t& pCrashData); /** * Get one crash info. If getting is successful, * then crash info is filled. * @param pUUID A local UUID of a crash. * @param pUID An UID of an user. - * @param pCrashInfo A crash info. + * @param pCrashData A crash info. * @return It return results of operation. See mw_result_t. */ mw_result_t FillCrashInfo(const char *pUUID, const char *pUID, - map_crash_info_t& pCrashInfo); + map_crash_data_t& pCrashData); /** * Gets all local UUIDs and UIDs of crashes. These crashes * occurred when a particular user was logged in. @@ -154,5 +154,5 @@ bool analyzer_has_InformAllUsers(const char *analyzer_name); bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char* uid); -void autoreport(const pair_string_string_t& reporter_options, const map_crash_report_t& crash_report); +void autoreport(const pair_string_string_t& reporter_options, const map_crash_data_t& crash_report); #endif /*MIDDLEWARE_H_*/ diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp index 48658e28..73736f13 100644 --- a/src/Daemon/Settings.cpp +++ b/src/Daemon/Settings.cpp @@ -146,8 +146,8 @@ static vector_pair_string_string_t ParseListWithArgs(const char *pValue) static void ParseCommon() { - map_string_t::const_iterator it = s_mapSectionCommon.find("OpenGPGCheck"); map_string_t::const_iterator end = s_mapSectionCommon.end(); + map_string_t::const_iterator it = s_mapSectionCommon.find("OpenGPGCheck"); if (it != end) { g_settings_bOpenGPGCheck = string_to_bool(it->second.c_str()); diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index a8101d49..f67cd06a 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -233,12 +233,14 @@ class MainWindow(): report_label = _("<b>This crash has been reported:</b>\n") # plugin message follows, but at least in case of kerneloops, # it is not informative (no URL to the report) - for message in dump.getMessage().split('\n'): - if message: - #Doesn't work (far too easy to make it worse, not better): - #if "http" in message[0:5] or "file:///"[0:8] in message: - # message = "<a href=\"%s\">%s</a>" % (message, message) - report_label += "%s\n" % message + for message in dump.getMessage().split(';'): + if message: + message_clean = message.strip() + if "http" in message_clean[0:5] or "file:///"[0:8] in message_clean: + report_message = "<a href=\"%s\">%s</a>" % (message_clean, message_clean) + else: + report_message = message_clean + report_label += "%s\n" % report_message log2("setting markup '%s'", report_label) self.wTree.get_widget("lReported").set_markup(report_label) else: diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py index 2cba6074..d24c0dd8 100644 --- a/src/Gui/CCReporterDialog.py +++ b/src/Gui/CCReporterDialog.py @@ -39,7 +39,6 @@ class ReporterDialog(): self.builder.add_from_file(builderfile) #Get the Main Window, and connect the "destroy" event self.window = self.builder.get_object("reporter_dialog") - self.window.set_default_size(640, 480) self.window.connect("response", self.on_response, daemon) if parent: self.window.set_transient_for(parent) @@ -54,7 +53,7 @@ class ReporterDialog(): self.tevHowToReproduce = self.builder.get_object("tevHowToReproduce") self.how_to_changed = False - self.builder.get_object("ebErrors").hide() + self.builder.get_object("fErrors").hide() self.builder.get_object("bLog").connect("clicked", self.show_log_cb, log) self.builder.get_object("cbSendBacktrace").connect("toggled", self.on_send_backtrace_toggled) self.allow_send() @@ -65,7 +64,7 @@ class ReporterDialog(): def warn_user(self, warnings): # FIXME: show in lError - ebErrors = self.builder.get_object("ebErrors") + fErrors = self.builder.get_object("fErrors") lErrors = self.builder.get_object("lErrors") warning_lbl = None for warning in warnings: @@ -74,12 +73,12 @@ class ReporterDialog(): else: warning_lbl = "* %s" % warning lErrors.set_label(warning_lbl) - ebErrors.show_all() + fErrors.show_all() def hide_warning(self): - ebErrors = self.builder.get_object("ebErrors") + fErrors = self.builder.get_object("fErrors") lErrors = self.builder.get_object("lErrors") - ebErrors.hide() + fErrors.hide() def allow_send(self): self.hide_warning() @@ -97,7 +96,7 @@ class ReporterDialog(): send = False error_msgs.append(_("You must agree with submitting the backtrace.")) # we have both SendBacktrace and rating - elif rating: + if rating: try: package = self.report["package"][CD_CONTENT] # if we don't have package for some reason @@ -201,7 +200,11 @@ class ReporterDialog(): return True return True - + def set_label(self, label_widget, text): + if len(text) > label_widget.get_max_width_chars(): + label_widget.set_tooltip_text(text) + label_widget.set_text(text) + def hydrate(self): self.editable = [] for item in self.report: @@ -254,7 +257,7 @@ class ReporterDialog(): continue item_label = self.builder.get_object("l%s" % item) if item_label: - item_label.set_text(self.report[item][CD_CONTENT]) + self.set_label(item_label, self.report[item][CD_CONTENT]) else: # no widget to show this item # probably some new item need to adjust the GUI! diff --git a/src/Gui/report.glade b/src/Gui/report.glade index d3bf5eb0..d6fec06b 100644 --- a/src/Gui/report.glade +++ b/src/Gui/report.glade @@ -16,11 +16,12 @@ <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="orientation">vertical</property> + <property name="spacing">5</property> <child> <object class="GtkFrame" id="fSysInfo"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="shadow_type">in</property> <child> <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> @@ -32,6 +33,7 @@ <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> <property name="orientation">vertical</property> + <property name="homogeneous">True</property> <child> <object class="GtkLabel" id="l"> <property name="visible">True</property> @@ -78,6 +80,8 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -92,6 +96,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">0</property> @@ -103,6 +108,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">1</property> @@ -114,6 +120,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">2</property> @@ -125,6 +132,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">3</property> @@ -139,6 +147,7 @@ <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> <property name="orientation">vertical</property> + <property name="homogeneous">True</property> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> @@ -185,6 +194,8 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> @@ -198,6 +209,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">0</property> @@ -209,6 +221,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">1</property> @@ -220,6 +233,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">2</property> @@ -231,6 +245,7 @@ <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes">N/A</property> + <property name="max_width_chars">40</property> </object> <packing> <property name="position">3</property> @@ -245,13 +260,8 @@ </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="ypad">5</property> - <property name="label" translatable="yes"><b>General information</b></property> - <property name="use_markup">True</property> - </object> + <child type="label_item"> + <placeholder/> </child> </object> <packing> @@ -322,7 +332,7 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame2"> + <object class="GtkFrame" id="fUserInfo"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> @@ -381,8 +391,6 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -427,8 +435,6 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -441,13 +447,8 @@ </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="ypad">5</property> - <property name="label" translatable="yes"><b>User information</b></property> - <property name="use_markup">True</property> - </object> + <child type="label_item"> + <placeholder/> </child> </object> <packing> @@ -482,75 +483,87 @@ </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkHBox" id="ebErrors"> + <object class="GtkFrame" id="fErrors"> <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">in</property> <child> - <object class="GtkAlignment" id="alignment7"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-warning</property> - <property name="icon-size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="vbox8"> + <object class="GtkHBox" id="ebErrors"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="label12"> + <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>Please fix the following problems</b></property> - <property name="use_markup">True</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="lErrors"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> - <property name="use_markup">True</property> - <property name="selectable">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon-size">6</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="alignment8"> - <property name="visible">True</property> <child> - <placeholder/> + <object class="GtkVBox" id="vbox8"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Please fix the following problems</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lErrors"> + <property name="visible">True</property> + <property name="label" translatable="yes"> </property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment8"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">3</property> + </packing> </child> </object> - <packing> - <property name="position">3</property> - </packing> + </child> + <child type="label_item"> + <placeholder/> </child> </object> <packing> diff --git a/src/Hooks/abrt-hook-ccpp.cpp b/src/Hooks/abrt-hook-ccpp.cpp index 1c91dc8a..b844be70 100644 --- a/src/Hooks/abrt-hook-ccpp.cpp +++ b/src/Hooks/abrt-hook-ccpp.cpp @@ -21,12 +21,10 @@ #include "abrtlib.h" #include "hooklib.h" #include "DebugDump.h" +#include "CrashTypes.h" #include "ABRTException.h" #include <syslog.h> -#define FILENAME_EXECUTABLE "executable" -#define FILENAME_COREDUMP "coredump" - using namespace std; static char* malloc_readlink(const char *linkname) diff --git a/src/Hooks/abrt-hook-python.cpp b/src/Hooks/abrt-hook-python.cpp index c8a25e39..90197ccf 100644 --- a/src/Hooks/abrt-hook-python.cpp +++ b/src/Hooks/abrt-hook-python.cpp @@ -26,6 +26,7 @@ #include "abrtlib.h" #include "hooklib.h" #include "DebugDump.h" +#include "CrashTypes.h" #include "ABRTException.h" #if HAVE_CONFIG_H # include <config.h> @@ -149,14 +150,14 @@ int main(int argc, char** argv) dd.SaveText(FILENAME_ANALYZER, "Python"); dd.SaveText(FILENAME_EXECUTABLE, executable); - dd.SaveText("backtrace", bt); + dd.SaveText(FILENAME_BACKTRACE, bt); free(bt); - dd.SaveText("cmdline", cmdline); + dd.SaveText(FILENAME_CMDLINE, cmdline); free(cmdline); - dd.SaveText("uuid", uuid); + dd.SaveText(FILENAME_UUID, uuid); char uid[sizeof(long) * 3 + 2]; sprintf(uid, "%lu", (long)getuid()); - dd.SaveText("uid", uid); + dd.SaveText(FILENAME_UID, uid); dd.Close(); log("saved python crash dump of pid %s to %s", pid, path); |