Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com --- inc/debug_dump.h | 6 ++-- lib/plugins/CCpp.cpp | 42 +++++++++++++------------- lib/plugins/Kerneloops.cpp | 2 +- lib/plugins/KerneloopsScanner.cpp | 12 ++++---- lib/plugins/Python.cpp | 2 +- lib/plugins/RunApp.cpp | 2 +- lib/utils/DebugDump.cpp | 58 ++++++++++++++++++------------------ src/daemon/MiddleWare.cpp | 34 +++++++++++----------- src/daemon/dumpsocket.cpp | 12 ++++---- src/hooks/abrt-hook-ccpp.cpp | 8 ++-- 10 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/inc/debug_dump.h b/inc/debug_dump.h index 60cddd7..96d50d3 100644 --- a/inc/debug_dump.h +++ b/inc/debug_dump.h @@ -44,9 +44,9 @@ int dd_create(dump_dir_t *dd, const char *dir, uid_t uid); int dd_init_next_file(dump_dir_t *dd); int dd_get_next_file(dump_dir_t *dd, char **short_name, char **full_name);
-char* dd_loadtxt(const dump_dir_t *dd, const char* name); -void dd_savetxt(dump_dir_t *dd, const char *name, const char *data); -void dd_savebin(dump_dir_t* dd, const char* name, const char* data, unsigned size); +char* dd_load_text(const dump_dir_t *dd, const char* name); +void dd_save_text(dump_dir_t *dd, const char *name, const char *data); +void dd_save_binary(dump_dir_t* dd, const char* name, const char* data, unsigned size); void dd_delete(dump_dir_t *dd);
void delete_debug_dump_dir(const char *dd_dir); diff --git a/lib/plugins/CCpp.cpp b/lib/plugins/CCpp.cpp index 7665cad..c01b195 100644 --- a/lib/plugins/CCpp.cpp +++ b/lib/plugins/CCpp.cpp @@ -194,8 +194,8 @@ static char *get_backtrace(const char *pDebugDumpDir, const char *pDebugInfoDirs return NULL; }
- char *uid = dd_loadtxt(dd, CD_UID); - char *executable = dd_loadtxt(dd, FILENAME_EXECUTABLE); + char *uid = dd_load_text(dd, CD_UID); + char *executable = dd_load_text(dd, FILENAME_EXECUTABLE); dd_close(dd);
// Workaround for @@ -343,7 +343,7 @@ static char* run_unstrip_n(const char *pDebugDumpDir) return NULL; }
- char *uid = dd_loadtxt(dd, CD_UID); + char *uid = dd_load_text(dd, CD_UID); dd_close(dd);
char* args[4]; @@ -537,8 +537,8 @@ string CAnalyzerCCpp::GetLocalUUID(const char *pDebugDumpDir) return string(""); }
- char *executable = dd_loadtxt(dd, FILENAME_EXECUTABLE); - char *package = dd_loadtxt(dd, FILENAME_PACKAGE); + char *executable = dd_load_text(dd, FILENAME_EXECUTABLE); + char *package = dd_load_text(dd, FILENAME_PACKAGE); dd_close(dd);
string independentBuildIdPC; @@ -599,7 +599,7 @@ string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir)
if (dd_exist(dd, FILENAME_GLOBAL_UUID)) { - char *uuid = dd_loadtxt(dd, FILENAME_GLOBAL_UUID); + char *uuid = dd_load_text(dd, FILENAME_GLOBAL_UUID); dd_close(dd); string ret = uuid; free(uuid); @@ -612,9 +612,9 @@ string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir) log(_("Getting global universal unique identification..."));
string backtrace_path = concat_path_file(pDebugDumpDir, FILENAME_BACKTRACE); - char *executable = dd_loadtxt(dd, FILENAME_EXECUTABLE); - char *package = dd_loadtxt(dd, FILENAME_PACKAGE); - char *uid_str = m_bBacktrace ? dd_loadtxt(dd, CD_UID) : xstrdup(""); + char *executable = dd_load_text(dd, FILENAME_EXECUTABLE); + char *package = dd_load_text(dd, FILENAME_PACKAGE); + char *uid_str = m_bBacktrace ? dd_load_text(dd, CD_UID) : xstrdup("");
string independent_backtrace; if (m_bBacktrace) @@ -712,7 +712,7 @@ string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir) */ else { - dd_savetxt(dd, FILENAME_RATING, "0"); + dd_save_text(dd, FILENAME_RATING, "0"); } dd_close(dd);
@@ -770,7 +770,7 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) /* Skip remote crashes. */ if (dd_exist(dd, FILENAME_REMOTE)) { - char *remote_str = dd_loadtxt(dd, FILENAME_REMOTE); + char *remote_str = dd_load_text(dd, FILENAME_REMOTE); bool remote = (remote_str[0] != '1'); free(remote_str); if (remote && !m_bBacktraceRemotes) @@ -796,9 +796,9 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) } }
- char *package = dd_loadtxt(dd, FILENAME_PACKAGE); - char *executable = dd_loadtxt(dd, FILENAME_EXECUTABLE); - char *uid = dd_loadtxt(dd, CD_UID); + char *package = dd_load_text(dd, FILENAME_PACKAGE); + char *executable = dd_load_text(dd, FILENAME_EXECUTABLE); + char *uid = dd_load_text(dd, CD_UID); dd_close(dd); /* do not keep dir locked longer than needed */
char *build_ids = NULL; @@ -829,11 +829,11 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) VERB1 log(_("Unable to open debug dump '%s'"), pDebugDumpDir); return; } - dd_savetxt(dd, FILENAME_BACKTRACE, bt_build_ids); + dd_save_text(dd, FILENAME_BACKTRACE, bt_build_ids); free(bt_build_ids);
if (m_bMemoryMap) - dd_savetxt(dd, FILENAME_MEMORYMAP, "memory map of the crashed C/C++ application, not implemented yet"); + dd_save_text(dd, FILENAME_MEMORYMAP, "memory map of the crashed C/C++ application, not implemented yet");
/* Compute and store UUID from the backtrace. */ char *backtrace_cpy = xstrdup(backtrace_str); @@ -870,7 +870,7 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) struct strbuf *bt = backtrace_tree_as_str(backtrace, false); strbuf_prepend_str(bt, executable); strbuf_prepend_str(bt, package); - dd_savetxt(dd, FILENAME_GLOBAL_UUID, create_hash(bt->buf).c_str()); + dd_save_text(dd, FILENAME_GLOBAL_UUID, create_hash(bt->buf).c_str()); strbuf_free(bt);
/* Compute and store backtrace rating. */ @@ -886,7 +886,7 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) else if (qtot < 0.8f) rating = "2"; else if (qtot < 0.9f) rating = "3"; else rating = "4"; - dd_savetxt(dd, FILENAME_RATING, rating); + dd_save_text(dd, FILENAME_RATING, rating);
/* Get the function name from the crash frame. */ if (crash_thread) @@ -896,7 +896,7 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) if (abort_frame) crash_frame = abort_frame->next; if (crash_frame && crash_frame->function && 0 != strcmp(crash_frame->function, "??")) - dd_savetxt(dd, FILENAME_CRASH_FUNCTION, crash_frame->function); + dd_save_text(dd, FILENAME_CRASH_FUNCTION, crash_frame->function); }
backtrace_free(backtrace); @@ -910,12 +910,12 @@ void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force) struct strbuf *ibt = independent_backtrace(backtrace_str); strbuf_prepend_str(ibt, executable); strbuf_prepend_str(ibt, package); - dd_savetxt(dd, FILENAME_GLOBAL_UUID, create_hash(ibt->buf).c_str()); + dd_save_text(dd, FILENAME_GLOBAL_UUID, create_hash(ibt->buf).c_str()); strbuf_free(ibt);
/* Compute and store backtrace rating. */ /* Crash frame is not known so store nothing. */ - dd_savetxt(dd, FILENAME_RATING, to_string(backtrace_rate_old(backtrace_str)).c_str()); + dd_save_text(dd, FILENAME_RATING, to_string(backtrace_rate_old(backtrace_str)).c_str()); } free(executable); free(package); diff --git a/lib/plugins/Kerneloops.cpp b/lib/plugins/Kerneloops.cpp index f6fa260..a3ef474 100644 --- a/lib/plugins/Kerneloops.cpp +++ b/lib/plugins/Kerneloops.cpp @@ -134,7 +134,7 @@ std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir) return std::string(""); }
- char *oops = dd_loadtxt(dd, FILENAME_BACKTRACE); + char *oops = dd_load_text(dd, FILENAME_BACKTRACE); unsigned hash = hash_oops_str(oops); free(oops);
diff --git a/lib/plugins/KerneloopsScanner.cpp b/lib/plugins/KerneloopsScanner.cpp index 1621b04..2a1bc47 100644 --- a/lib/plugins/KerneloopsScanner.cpp +++ b/lib/plugins/KerneloopsScanner.cpp @@ -136,14 +136,14 @@ int save_oops_to_debug_dump(const vector_string_t& oopsList) dump_dir_t *dd = dd_init(); if (dd_create(dd, path, /*uid:*/ 0)) { - dd_savetxt(dd, FILENAME_ANALYZER, "Kerneloops"); - dd_savetxt(dd, FILENAME_EXECUTABLE, "kernel"); - dd_savetxt(dd, FILENAME_KERNEL, first_line); - dd_savetxt(dd, FILENAME_CMDLINE, "not_applicable"); - dd_savetxt(dd, FILENAME_BACKTRACE, second_line); + dd_save_text(dd, FILENAME_ANALYZER, "Kerneloops"); + dd_save_text(dd, FILENAME_EXECUTABLE, "kernel"); + dd_save_text(dd, FILENAME_KERNEL, first_line); + dd_save_text(dd, FILENAME_CMDLINE, "not_applicable"); + dd_save_text(dd, FILENAME_BACKTRACE, second_line); /* Optional, makes generated bz more informative */ strchrnul(second_line, '\n')[0] = '\0'; - dd_savetxt(dd, FILENAME_REASON, second_line); + dd_save_text(dd, FILENAME_REASON, second_line); dd_close(dd); } else diff --git a/lib/plugins/Python.cpp b/lib/plugins/Python.cpp index d634e0c..96ba03e 100644 --- a/lib/plugins/Python.cpp +++ b/lib/plugins/Python.cpp @@ -34,7 +34,7 @@ string CAnalyzerPython::GetLocalUUID(const char *pDebugDumpDir) return string(""); }
- char *bt = dd_loadtxt(dd, FILENAME_BACKTRACE); + char *bt = dd_load_text(dd, FILENAME_BACKTRACE); dd_close(dd);
const char *bt_end = strchrnul(bt, '\n'); diff --git a/lib/plugins/RunApp.cpp b/lib/plugins/RunApp.cpp index f583356..2f9d128 100644 --- a/lib/plugins/RunApp.cpp +++ b/lib/plugins/RunApp.cpp @@ -66,7 +66,7 @@ void CActionRunApp::Run(const char *pActionDir, const char *pArgs, int force) return; }
- dd_savebin(dd, args[FILENAME].c_str(), cmd_out, cmd_out_size); + dd_save_binary(dd, args[FILENAME].c_str(), cmd_out, cmd_out_size); dd_close(dd); }
diff --git a/lib/utils/DebugDump.cpp b/lib/utils/DebugDump.cpp index 8987b43..cda1f98 100644 --- a/lib/utils/DebugDump.cpp +++ b/lib/utils/DebugDump.cpp @@ -34,7 +34,7 @@ static bool isdigit_str(const char *str) return true; }
-static char* RemoveBackSlashes(const char *pDir) +static char* rm_trailing_slashes(const char *pDir) { unsigned len = strlen(pDir); while (len != 0 && pDir[len-1] == '/') @@ -42,7 +42,7 @@ static char* RemoveBackSlashes(const char *pDir) return xstrndup(pDir, len); }
-static bool ExistFileDir(const char *pPath) +static bool exist_file_dir(const char *pPath) { struct stat buf; if (stat(pPath, &buf) == 0) @@ -55,7 +55,7 @@ static bool ExistFileDir(const char *pPath) return false; }
-static char *LoadTextFile(const char *path); +static char *load_text_file(const char *path); static void dd_lock(dump_dir_t *dd); static void dd_unlock(dump_dir_t *dd);
@@ -85,8 +85,8 @@ int dd_opendir(dump_dir_t *dd, const char *dir) if (dd->opened) error_msg_and_die("CDebugDump is already opened");
- dd->dd_dir = RemoveBackSlashes(dir); - if (!dd->dd_dir || !ExistFileDir(dd->dd_dir)) + dd->dd_dir = rm_trailing_slashes(dir); + if (!dd->dd_dir || !exist_file_dir(dd->dd_dir)) { error_msg("'%s' does not exist", dd->dd_dir); return 0; @@ -109,12 +109,12 @@ int dd_opendir(dump_dir_t *dd, const char *dir) int dd_exist(dump_dir_t *dd, const char *path) { char *full_path = concat_path_file(dd->dd_dir, path); - int ret = ExistFileDir(full_path); + int ret = exist_file_dir(full_path); free(full_path); return ret; }
-static bool GetAndSetLock(const char* pLockFile, const char* pPID) +static bool get_and_set_lock(const char* pLockFile, const char* pPID) { while (symlink(pPID, pLockFile) != 0) { @@ -232,7 +232,7 @@ static void dd_lock(dump_dir_t *dd)
char pid_buf[sizeof(long)*3 + 2]; sprintf(pid_buf, "%lu", (long)getpid()); - while ((dd->locked = GetAndSetLock(lock_buf, pid_buf)) != true) + while ((dd->locked = get_and_set_lock(lock_buf, pid_buf)) != true) { sleep(1); /* was 0.5 seconds */ } @@ -273,8 +273,8 @@ int dd_create(dump_dir_t *dd, const char *dir, uid_t uid) if (dd->opened) error_msg_and_die("DebugDump is already opened");
- dd->dd_dir = RemoveBackSlashes(dir); - if (ExistFileDir(dd->dd_dir)) + dd->dd_dir = rm_trailing_slashes(dir); + if (exist_file_dir(dd->dd_dir)) { error_msg("'%s' already exists", dd->dd_dir); return 0; @@ -328,7 +328,7 @@ int dd_create(dump_dir_t *dd, const char *dir, uid_t uid)
char uid_str[sizeof(long) * 3 + 2]; sprintf(uid_str, "%lu", (long)uid); - dd_savetxt(dd, CD_UID, uid_str); + dd_save_text(dd, CD_UID, uid_str);
{ struct utsname buf; @@ -336,25 +336,25 @@ int dd_create(dump_dir_t *dd, const char *dir, uid_t uid) { perror_msg_and_die("uname"); } - dd_savetxt(dd, FILENAME_KERNEL, buf.release); - dd_savetxt(dd, FILENAME_ARCHITECTURE, buf.machine); - char *release = LoadTextFile("/etc/redhat-release"); + dd_save_text(dd, FILENAME_KERNEL, buf.release); + dd_save_text(dd, FILENAME_ARCHITECTURE, buf.machine); + char *release = load_text_file("/etc/redhat-release"); strchrnul(release, '\n')[0] = '\0'; - dd_savetxt(dd, FILENAME_RELEASE, release); + dd_save_text(dd, FILENAME_RELEASE, release); free(release); }
time_t t = time(NULL); char t_str[sizeof(time_t) * 3 + 2]; sprintf(t_str, "%lu", (time_t)t); - dd_savetxt(dd, FILENAME_TIME, t_str); + dd_save_text(dd, FILENAME_TIME, t_str);
return 1; }
-static bool DeleteFileDir(const char *pDir) +static bool delete_file_dir(const char *pDir) { - if (!ExistFileDir(pDir)) + if (!exist_file_dir(pDir)) return true;
DIR *d = opendir(pDir); @@ -379,7 +379,7 @@ static bool DeleteFileDir(const char *pDir) free(full_path); return false; } - DeleteFileDir(full_path); + delete_file_dir(full_path); } free(full_path); } @@ -395,15 +395,15 @@ static bool DeleteFileDir(const char *pDir)
void dd_delete(dump_dir_t *dd) { - if (!ExistFileDir(dd->dd_dir)) + if (!exist_file_dir(dd->dd_dir)) { return; }
- DeleteFileDir(dd->dd_dir); + delete_file_dir(dd->dd_dir); }
-static char *LoadTextFile(const char *pPath) +static char *load_text_file(const char *pPath) { FILE *fp = fopen(pPath, "r"); if (!fp) @@ -426,7 +426,7 @@ static char *LoadTextFile(const char *pPath) return strbuf_free_nobuf(buf_content); }
-static bool SaveBinaryFile(const char *pPath, const char* pData, unsigned size, uid_t uid, gid_t gid) +static bool save_binary_file(const char *pPath, const char* pData, unsigned size, uid_t uid, gid_t gid) { /* "Why 0640?!" See ::Create() for security analysis */ unlink(pPath); @@ -451,35 +451,35 @@ static bool SaveBinaryFile(const char *pPath, const char* pData, unsigned size, return true; }
-char* dd_loadtxt(const dump_dir_t *dd, const char *name) +char* dd_load_text(const dump_dir_t *dd, const char *name) { if (!dd->opened) error_msg_and_die("DebugDump is not opened");
char *full_path = concat_path_file(dd->dd_dir, name); - char *ret = LoadTextFile(full_path); + char *ret = load_text_file(full_path); free(full_path);
return ret; }
-void dd_savetxt(dump_dir_t *dd, const char *name, const char *data) +void dd_save_text(dump_dir_t *dd, const char *name, const char *data) { if (!dd->opened) error_msg_and_die("DebugDump is not opened");
char *full_path = concat_path_file(dd->dd_dir, name); - SaveBinaryFile(full_path, data, strlen(data), dd->uid, dd->gid); + save_binary_file(full_path, data, strlen(data), dd->uid, dd->gid); free(full_path); }
-void dd_savebin(dump_dir_t* dd, const char* name, const char* data, unsigned size) +void dd_save_binary(dump_dir_t* dd, const char* name, const char* data, unsigned size) { if (dd->opened) error_msg_and_die("DebugDump is not opened");
char *full_path = concat_path_file(dd->dd_dir, name); - SaveBinaryFile(full_path, data, size, dd->uid, dd->gid); + save_binary_file(full_path, data, size, dd->uid, dd->gid); free(full_path); }
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index e8c7d85..65d4a4b 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -164,7 +164,7 @@ static void load_crash_data_from_debug_dump(dump_dir_t *dd, map_crash_data_t& da if (sz < 4*1024) /* is_text_file did read entire file */ content = xstrndup(text, sz); //TODO: can avoid this copying if is_text_file() adds NUL else /* no, need to read it all */ - content = dd_loadtxt(dd, short_name); + content = dd_load_text(dd, short_name); free(text);
add_to_crash_data_ext(data, @@ -459,17 +459,17 @@ report_status_t Report(const map_crash_data_t& client_report, { if (comment) { - dd_savetxt(dd, FILENAME_COMMENT, comment); + dd_save_text(dd, FILENAME_COMMENT, comment); add_to_crash_data_ext(stored_report, FILENAME_COMMENT, CD_TXT, CD_ISEDITABLE, comment); } if (reproduce) { - dd_savetxt(dd, FILENAME_REPRODUCE, reproduce); + dd_save_text(dd, FILENAME_REPRODUCE, reproduce); add_to_crash_data_ext(stored_report, FILENAME_REPRODUCE, CD_TXT, CD_ISEDITABLE, reproduce); } if (backtrace) { - dd_savetxt(dd, FILENAME_BACKTRACE, backtrace); + dd_save_text(dd, FILENAME_BACKTRACE, backtrace); add_to_crash_data_ext(stored_report, FILENAME_BACKTRACE, CD_TXT, CD_ISEDITABLE, backtrace); } } @@ -735,9 +735,9 @@ static mw_result_t SavePackageDescriptionToDebugDump( return MW_ERROR; }
- dd_savetxt(dd, FILENAME_PACKAGE, ""); - dd_savetxt(dd, FILENAME_COMPONENT, ""); - dd_savetxt(dd, FILENAME_DESCRIPTION, "Crashed executable does not belong to any installed package"); + dd_save_text(dd, FILENAME_PACKAGE, ""); + dd_save_text(dd, FILENAME_COMPONENT, ""); + dd_save_text(dd, FILENAME_DESCRIPTION, "Crashed executable does not belong to any installed package");
dd_close(dd); return MW_OK; @@ -858,24 +858,24 @@ static mw_result_t SavePackageDescriptionToDebugDump( { if (rpm_pkg) { - dd_savetxt(dd, FILENAME_PACKAGE, rpm_pkg); + dd_save_text(dd, FILENAME_PACKAGE, rpm_pkg); free(rpm_pkg); }
if (dsc) { - dd_savetxt(dd, FILENAME_DESCRIPTION, dsc); + dd_save_text(dd, FILENAME_DESCRIPTION, dsc); free(dsc); }
if (component) { - dd_savetxt(dd, FILENAME_COMPONENT, component); + dd_save_text(dd, FILENAME_COMPONENT, component); free(component); }
if (!remote) - dd_savetxt(dd, FILENAME_HOSTNAME, host); + dd_save_text(dd, FILENAME_HOSTNAME, host);
dd_close(dd); return MW_OK; @@ -1047,15 +1047,15 @@ mw_result_t SaveDebugDump(const char *pDebugDumpDir, return MW_ERROR; }
- char *time = dd_loadtxt(dd, FILENAME_TIME); - char *uid = dd_loadtxt(dd, CD_UID); - char *analyzer = dd_loadtxt(dd, FILENAME_ANALYZER); - char *executable = dd_loadtxt(dd, FILENAME_EXECUTABLE); - char *cmdline = dd_loadtxt(dd, FILENAME_CMDLINE); + char *time = dd_load_text(dd, FILENAME_TIME); + char *uid = dd_load_text(dd, CD_UID); + char *analyzer = dd_load_text(dd, FILENAME_ANALYZER); + char *executable = dd_load_text(dd, FILENAME_EXECUTABLE); + char *cmdline = dd_load_text(dd, FILENAME_CMDLINE);
char *remote_str = xstrdup(""); if (dd_exist(dd, FILENAME_REMOTE)) - remote_str = dd_loadtxt(dd, FILENAME_REMOTE); + remote_str = dd_load_text(dd, FILENAME_REMOTE);
dd_close(dd);
diff --git a/src/daemon/dumpsocket.cpp b/src/daemon/dumpsocket.cpp index 999df00..c72e366 100644 --- a/src/daemon/dumpsocket.cpp +++ b/src/daemon/dumpsocket.cpp @@ -181,20 +181,20 @@ static void create_debug_dump(struct client *client) error_msg_and_die("dumpsocket: Error while creating crash dump %s", path); }
- dd_savetxt(dd, FILENAME_ANALYZER, client->analyzer); - dd_savetxt(dd, FILENAME_EXECUTABLE, client->executable); - dd_savetxt(dd, FILENAME_BACKTRACE, client->backtrace); - dd_savetxt(dd, FILENAME_REASON, client->reason); + dd_save_text(dd, FILENAME_ANALYZER, client->analyzer); + dd_save_text(dd, FILENAME_EXECUTABLE, client->executable); + dd_save_text(dd, FILENAME_BACKTRACE, client->backtrace); + dd_save_text(dd, FILENAME_REASON, client->reason);
/* Obtain and save the command line. */ char *cmdline = get_cmdline(client->pid); // never NULL - dd_savetxt(dd, FILENAME_CMDLINE, cmdline); + dd_save_text(dd, FILENAME_CMDLINE, cmdline); free(cmdline);
/* Store id of the user whose application crashed. */ char uid_str[sizeof(long) * 3 + 2]; sprintf(uid_str, "%lu", (long)client->uid); - dd_savetxt(dd, CD_UID, uid_str); + dd_save_text(dd, CD_UID, uid_str);
dd_close(dd);
diff --git a/src/hooks/abrt-hook-ccpp.cpp b/src/hooks/abrt-hook-ccpp.cpp index 4862c6c..9a7500b 100644 --- a/src/hooks/abrt-hook-ccpp.cpp +++ b/src/hooks/abrt-hook-ccpp.cpp @@ -420,10 +420,10 @@ int main(int argc, char** argv) { char *cmdline = get_cmdline(pid); /* never NULL */ char *reason = xasprintf("Process %s was killed by signal %s (SIG%s)", executable, signal_str, signame ? signame : signal_str); - dd_savetxt(dd, FILENAME_ANALYZER, "CCpp"); - dd_savetxt(dd, FILENAME_EXECUTABLE, executable); - dd_savetxt(dd, FILENAME_CMDLINE, cmdline); - dd_savetxt(dd, FILENAME_REASON, reason); + dd_save_text(dd, FILENAME_ANALYZER, "CCpp"); + dd_save_text(dd, FILENAME_EXECUTABLE, executable); + dd_save_text(dd, FILENAME_CMDLINE, cmdline); + dd_save_text(dd, FILENAME_REASON, reason); free(cmdline); free(reason);
Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com --- lib/utils/DebugDump.cpp | 72 +++++++++++++++++++++++----------------------- 1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/lib/utils/DebugDump.cpp b/lib/utils/DebugDump.cpp index cda1f98..689c9da 100644 --- a/lib/utils/DebugDump.cpp +++ b/lib/utils/DebugDump.cpp @@ -34,18 +34,18 @@ static bool isdigit_str(const char *str) return true; }
-static char* rm_trailing_slashes(const char *pDir) +static char* rm_trailing_slashes(const char *dir) { - unsigned len = strlen(pDir); - while (len != 0 && pDir[len-1] == '/') + unsigned len = strlen(dir); + while (len != 0 && dir[len-1] == '/') len--; - return xstrndup(pDir, len); + return xstrndup(dir, len); }
-static bool exist_file_dir(const char *pPath) +static bool exist_file_dir(const char *path) { struct stat buf; - if (stat(pPath, &buf) == 0) + if (stat(path, &buf) == 0) { if (S_ISDIR(buf.st_mode) || S_ISREG(buf.st_mode)) { @@ -114,30 +114,30 @@ int dd_exist(dump_dir_t *dd, const char *path) return ret; }
-static bool get_and_set_lock(const char* pLockFile, const char* pPID) +static bool get_and_set_lock(const char* lock_file, const char* pid) { - while (symlink(pPID, pLockFile) != 0) + while (symlink(pid, lock_file) != 0) { if (errno != EEXIST) - perror_msg_and_die("Can't create lock file '%s'", pLockFile); + perror_msg_and_die("Can't create lock file '%s'", lock_file);
char pid_buf[sizeof(pid_t)*3 + 4]; - ssize_t r = readlink(pLockFile, pid_buf, sizeof(pid_buf) - 1); + ssize_t r = readlink(lock_file, pid_buf, sizeof(pid_buf) - 1); if (r < 0) { if (errno == ENOENT) { - /* Looks like pLockFile was deleted */ + /* Looks like lock_file was deleted */ usleep(10 * 1000); /* avoid CPU eating loop */ continue; } - perror_msg_and_die("Can't read lock file '%s'", pLockFile); + perror_msg_and_die("Can't read lock file '%s'", lock_file); } pid_buf[r] = '\0';
- if (strcmp(pid_buf, pPID) == 0) + if (strcmp(pid_buf, pid) == 0) { - log("Lock file '%s' is already locked by us", pLockFile); + log("Lock file '%s' is already locked by us", lock_file); return false; } if (isdigit_str(pid_buf)) @@ -146,19 +146,19 @@ static bool get_and_set_lock(const char* pLockFile, const char* pPID) sprintf(pid_str, "/proc/%s", pid_buf); if (access(pid_str, F_OK) == 0) { - log("Lock file '%s' is locked by process %s", pLockFile, pid_buf); + log("Lock file '%s' is locked by process %s", lock_file, pid_buf); return false; } - log("Lock file '%s' was locked by process %s, but it crashed?", pLockFile, pid_buf); + log("Lock file '%s' was locked by process %s, but it crashed?", lock_file, pid_buf); } /* The file may be deleted by now by other process. Ignore ENOENT */ - if (unlink(pLockFile) != 0 && errno != ENOENT) + if (unlink(lock_file) != 0 && errno != ENOENT) { - perror_msg_and_die("Can't remove stale lock file '%s'", pLockFile); + perror_msg_and_die("Can't remove stale lock file '%s'", lock_file); } }
- VERB1 log("Locked '%s'", pLockFile); + VERB1 log("Locked '%s'", lock_file); return true;
#if 0 @@ -352,15 +352,15 @@ int dd_create(dump_dir_t *dd, const char *dir, uid_t uid) return 1; }
-static bool delete_file_dir(const char *pDir) +static bool delete_file_dir(const char *dir) { - if (!exist_file_dir(pDir)) + if (!exist_file_dir(dir)) return true;
- DIR *d = opendir(pDir); + DIR *d = opendir(dir); if (!d) { - error_msg("Can't open dir '%s'", pDir); + error_msg("Can't open dir '%s'", dir); return false; }
@@ -369,7 +369,7 @@ static bool delete_file_dir(const char *pDir) { if (dot_or_dotdot(dent->d_name)) continue; - char *full_path = concat_path_file(pDir, dent->d_name); + char *full_path = concat_path_file(dir, dent->d_name); if (unlink(full_path) == -1) { if (errno != EISDIR) @@ -384,9 +384,9 @@ static bool delete_file_dir(const char *pDir) free(full_path); } closedir(d); - if (rmdir(pDir) == -1) + if (rmdir(dir) == -1) { - error_msg("Can't remove dir %s", pDir); + error_msg("Can't remove dir %s", dir); return false; }
@@ -403,12 +403,12 @@ void dd_delete(dump_dir_t *dd) delete_file_dir(dd->dd_dir); }
-static char *load_text_file(const char *pPath) +static char *load_text_file(const char *path) { - FILE *fp = fopen(pPath, "r"); + FILE *fp = fopen(path, "r"); if (!fp) { - perror_msg("Can't open file '%s'", pPath); + perror_msg("Can't open file '%s'", path); return xstrdup(""); }
@@ -426,25 +426,25 @@ static char *load_text_file(const char *pPath) return strbuf_free_nobuf(buf_content); }
-static bool save_binary_file(const char *pPath, const char* pData, unsigned size, uid_t uid, gid_t gid) +static bool save_binary_file(const char *path, const char* data, unsigned size, uid_t uid, gid_t gid) { /* "Why 0640?!" See ::Create() for security analysis */ - unlink(pPath); - int fd = open(pPath, O_WRONLY | O_TRUNC | O_CREAT, 0640); + unlink(path); + int fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, 0640); if (fd < 0) { - error_msg("Can't open file '%s': %s", pPath, errno ? strerror(errno) : "errno == 0"); + error_msg("Can't open file '%s': %s", path, errno ? strerror(errno) : "errno == 0"); return false; } if (fchown(fd, uid, gid) == -1) { - perror_msg("can't change '%s' ownership to %lu:%lu", pPath, (long)uid, (long)gid); + perror_msg("can't change '%s' ownership to %lu:%lu", path, (long)uid, (long)gid); } - unsigned r = full_write(fd, pData, size); + unsigned r = full_write(fd, data, size); close(fd); if (r != size) { - error_msg("Can't save file '%s'", pPath); + error_msg("Can't save file '%s'", path); return false; }
On Wed, 2010-09-01 at 15:59 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com
inc/debug_dump.h | 6 ++-- lib/plugins/CCpp.cpp | 42 +++++++++++++------------- lib/plugins/Kerneloops.cpp | 2 +- lib/plugins/KerneloopsScanner.cpp | 12 ++++---- lib/plugins/Python.cpp | 2 +- lib/plugins/RunApp.cpp | 2 +- lib/utils/DebugDump.cpp | 58 ++++++++++++++++++------------------ src/daemon/MiddleWare.cpp | 34 +++++++++++----------- src/daemon/dumpsocket.cpp | 12 ++++---- src/hooks/abrt-hook-ccpp.cpp | 8 ++-- 10 files changed, 89 insertions(+), 89 deletions(-)
Both patches look good. Please apply. Thanks!
crash-catcher@lists.fedorahosted.org