mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Removed deprecated functions.

Browse Source 
Recoded so file/dir checks existance is not done before target was opened
This commit is contained in:
Sanel Zukan 2009-04-16 11:18:34 +00:00
parent 98f939c61c
commit cfe8b8adb7
1 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
ede-crasher/CrashDialog.cpp
View File

@ -30,8 +30,8 @@
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <edelib/File.h> #include <edelib/File.h>
#include <edelib/Directory.h>
#include <edelib/MessageBox.h> #include <edelib/MessageBox.h>
#include <edelib/FileTest.h>
#define DIALOG_W 380 #define DIALOG_W 380
#define DIALOG_H 130 #define DIALOG_H 130
@ -42,14 +42,14 @@ int spawn_backtrace(const char* gdb_path, const char* program, const char* core,
const char* gdb_script = "bt\nquit\n"; const char* gdb_script = "bt\nquit\n";
const int gdb_script_len = 8; const int gdb_script_len = 8;
// file with gdb commands /* file with gdb commands */
int sfd = open(script, O_WRONLY | O_TRUNC | O_CREAT, 0770); int sfd = open(script, O_WRONLY | O_TRUNC | O_CREAT, 0770);
if(sfd == -1) if(sfd == -1)
return -1; return -1;
write(sfd, gdb_script, gdb_script_len); write(sfd, gdb_script, gdb_script_len);
close(sfd); close(sfd);
// output file with gdb backtrace /* output file with gdb backtrace */
int ofd = open(output, O_WRONLY | O_TRUNC | O_CREAT, 0770); int ofd = open(output, O_WRONLY | O_TRUNC | O_CREAT, 0770);
if(ofd == -1) if(ofd == -1)
return -1; return -1;
@ -129,7 +129,7 @@ CrashDialog::CrashDialog() : Fl_Window(DIALOG_W, DIALOG_H, _("EDE crash handler"
details->align(FL_ALIGN_INSIDE | FL_ALIGN_LEFT); details->align(FL_ALIGN_INSIDE | FL_ALIGN_LEFT);
details->callback(show_details_cb, this); details->callback(show_details_cb, this);
// widgets for expanded dialog /* widgets for expanded dialog */
trace_log = new Fl_Text_Display(10, 130, 360, 165); trace_log = new Fl_Text_Display(10, 130, 360, 165);
trace_buff = new Fl_Text_Buffer(); trace_buff = new Fl_Text_Buffer();
trace_log->buffer(trace_buff); trace_log->buffer(trace_buff);
@ -141,7 +141,7 @@ CrashDialog::CrashDialog() : Fl_Window(DIALOG_W, DIALOG_H, _("EDE crash handler"
} }
CrashDialog::~CrashDialog() { CrashDialog::~CrashDialog() {
// looks like fltk does not clean image() assigned data /* looks like fltk does not clean image() assigned data */
delete pix; delete pix;
} }
@ -164,7 +164,7 @@ void CrashDialog::show_details(void) {
if(bugaddress) if(bugaddress)
address += bugaddress; address += bugaddress;
else else
address += "bugs@equinox-project.org"; address += "http://bugs.equinox-project.org";
trace_buff->append(address.c_str()); trace_buff->append(address.c_str());
trace_buff->append("\n\n"); trace_buff->append("\n\n");
@ -198,11 +198,14 @@ void CrashDialog::show_details(void) {
else else
trace_buff->append("(unknown)"); trace_buff->append("(unknown)");
// try backtrace via gdb /* try backtrace via gdb */
trace_buff->append("\n\n---------- backtrace ----------\n"); trace_buff->append("\n\n---------- backtrace ----------\n");
const char* core_file = "core";
if(!edelib::file_exists(core_file)) { const char* core_file = "core";
const char* gdb_output = "/tmp/.gdb_output";
const char* gdb_script = "/tmp/.gdb_script";
if(!edelib::file_test(core_file, edelib::FILE_TEST_IS_REGULAR)) {
trace_buff->append("\nUnable to find 'core' file. Backtrace will not be done."); trace_buff->append("\nUnable to find 'core' file. Backtrace will not be done.");
details_shown = false; details_shown = false;
return; return;
@ -210,49 +213,30 @@ void CrashDialog::show_details(void) {
edelib::String gdb_path = edelib::file_path("gdb"); edelib::String gdb_path = edelib::file_path("gdb");
if(gdb_path.empty()) { if(gdb_path.empty()) {
trace_buff->append("\nUnable to find gdb. Is it installed ?"); trace_buff->append("\nUnable to find gdb. Please install it first.");
// set to false so next 'Show Details' click can try again with the debugger /* set to false so next 'Show Details' click can try again with the debugger */
details_shown = false; details_shown = false;
return; return;
} }
// check if we can write in /tmp; if not, try with $HOME /* TODO: these files should be unique per session */
edelib::String dir = "/tmp"; if(spawn_backtrace(gdb_path.c_str(), cmd.c_str(), core_file, gdb_output, gdb_script) == -1) {
if(!edelib::dir_writeable(dir.c_str())) {
dir = edelib::dir_home();
if(!edelib::dir_writeable(dir.c_str())) {
trace_buff->append("\nDon't have permissions to write either to /tmp or $HOME");
details_shown = false;
return;
}
}
edelib::String gdb_output, gdb_script;
gdb_output = gdb_script = dir;
// TODO: these files should be unique per session
gdb_output += "/.gdb_output";
gdb_script += "/.gdb_script";
if(spawn_backtrace(gdb_path.c_str(), cmd.c_str(), core_file, gdb_output.c_str(), gdb_script.c_str()) == -1) {
trace_buff->append("\nUnable to properly execute gdb"); trace_buff->append("\nUnable to properly execute gdb");
details_shown = false; details_shown = false;
return; return;
} }
if(!edelib::file_exists(gdb_output.c_str())) { trace_buff->append("\n");
trace_buff->append("\nStrange, can't find gdb output that I was just wrote to"); if(trace_buff->appendfile(gdb_output) != 0) {
trace_buff->append("Unable to read gdb output file");
details_shown = false; details_shown = false;
return; return;
} }
trace_buff->appendfile(gdb_output.c_str()); edelib::file_remove(gdb_output);
edelib::file_remove(gdb_script);
edelib::file_remove(gdb_output.c_str());
edelib::file_remove(gdb_script.c_str());
edelib::file_remove(core_file); edelib::file_remove(core_file);
details_shown = true; details_shown = true;
} }
} }