actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed ssprintf().

Browse Source 
Fixed the buffer length constant.
Replaced some exit()s w/ return to get at least a partial crashlog.
Replaced exit() with _exit() in the forked process.
This commit is contained in:
Steve Checkoway
2003-08-12 00:53:32 +00:00
parent e2523bf1e6
commit 3934e67cbd
1 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+51 -41
View File
@@ -162,14 +162,14 @@ void BacktraceNames::FromAddr( void *p )
if (pipe(fds) != 0) if (pipe(fds) != 0)
{ {
fprintf(stderr, "FromAddr pipe() failed: %s\n", strerror(errno)); fprintf(stderr, "FromAddr pipe() failed: %s\n", strerror(errno));
exit(1); return;
} }
pid = fork(); pid = fork();
if (pid == -1) if (pid == -1)
{ {
fprintf(stderr, "FromAddr fork() failed: %s\n", strerror(errno)); fprintf(stderr, "FromAddr fork() failed: %s\n", strerror(errno));
exit(1); return;
} }
if (pid == 0) if (pid == 0)
@@ -183,54 +183,48 @@ void BacktraceNames::FromAddr( void *p )
char *addy; char *addy;
asprintf(&addy, "0x%x", long(p)); asprintf(&addy, "0x%x", long(p));
const char *p = ssprintf("%d", ppid); char *p;
asprintf(&p, "%d", ppid);
fprintf(stderr, "%s\n", p); execl("/usr/bin/atos", "/usr/bin/atos", "-p", p, addy, NULL);
if (execl("/usr/bin/atos", "/usr/bin/atos", "-p", p, addy, NULL))
fprintf(stderr, "atos failed: %s\n", strerror(errno)); fprintf(stderr, "execl(atos) failed: %s\n", strerror(errno));
free(addy); free(addy);
free(p);
close(out); close(out);
exit(0); _exit(0);
} }
close(fds[1]); close(fds[1]);
char f[BACKTRACE_MAX_SIZE]; char f[1024];
bzero(f, BACKTRACE_MAX_SIZE); bzero(f, 1024);
int len = read(fds[0], f, BACKTRACE_MAX_SIZE); int len = read(fds[0], f, 1024);
Symbol = "";
File = "";
if (len == -1) if (len == -1)
{ {
fprintf(stderr, "FromAddr read() failed: %s\n", strerror(errno)); fprintf(stderr, "FromAddr read() failed: %s\n", strerror(errno));
Symbol = ""; return;
File = "";
} }
else
{
CStringArray mangledAndFile; CStringArray mangledAndFile;
split(f, " ", mangledAndFile, true); split(f, " ", mangledAndFile, true);
if (mangledAndFile.size() > 0) if (mangledAndFile.size() == 0)
{ return;
Symbol = mangledAndFile[0]; Symbol = mangledAndFile[0];
if (Symbol[0] != '-' && Symbol[0] != '+') /* eg
{ * -[NSApplication run]
if (Symbol[0] == '_') * +[SomeClass initialize]
Symbol = Symbol.substr(1); */
if (mangledAndFile.size() > 3) if (Symbol[0] == '-' || Symbol[0] == '+')
{
File = mangledAndFile[3];
unsigned pos = File.find('(');
unsigned start = (pos == File.npos ? 0 : pos+1);
pos = File.rfind(')') - 1;
File = File.substr(start, pos);
}
else if (mangledAndFile.size() == 3)
File = mangledAndFile[2].substr(0, mangledAndFile[2].rfind(')'));
else
File = "";
}
else
{ {
Symbol = mangledAndFile[0] + " " + mangledAndFile[1]; Symbol = mangledAndFile[0] + " " + mangledAndFile[1];
/* eg
* (crt.c:300)
* (AppKit)
*/
if (mangledAndFile.size() == 3) if (mangledAndFile.size() == 3)
{ {
File = mangledAndFile[2]; File = mangledAndFile[2];
@@ -239,16 +233,32 @@ void BacktraceNames::FromAddr( void *p )
pos = File.rfind(')') - 1; pos = File.rfind(')') - 1;
File = File.substr(start, pos); File = File.substr(start, pos);
} }
else return;
File = "";
} }
} /* eg
else * __start -> _start
* _SDL_main -> SDL_main
*/
if (Symbol[0] == '_')
Symbol = Symbol.substr(1);
/* eg, the full line:
* __Z1Ci (in a.out) (asmtest.cc:33)
* _main (in a.out) (asmtest.cc:52)
*/
if (mangledAndFile.size() > 3)
{ {
Symbol = ""; File = mangledAndFile[3];
File = ""; unsigned pos = File.find('(');
} unsigned start = (pos == File.npos ? 0 : pos+1);
pos = File.rfind(')') - 1;
File = File.substr(start, pos);
} }
/* eg, the full line:
* _main (SDLMain.m:308)
* __Z8GameLoopv (crt.c:300)
*/
else if (mangledAndFile.size() == 3)
File = mangledAndFile[2].substr(0, mangledAndFile[2].rfind(')'));
} }
#else #else
#warning Undefined BACKTRACE_LOOKUP_METHOD_* #warning Undefined BACKTRACE_LOOKUP_METHOD_*