suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge Ted's patch for writing symbols to stdout for linux.

Browse source 
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@149 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
luly81 2007-05-02 19:13:09 +00:00
parent 3c27dcc1b6
commit e219ba182e
3 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/linux/dump_symbols.cc
View file

@ -616,7 +616,7 @@ class MmapWrapper {
namespace google_breakpad {
bool DumpSymbols::WriteSymbolFile(const std::string &obj_file,
const std::string &symbol_file) {
int sym_fd) {
int obj_fd = open(obj_file.c_str(), O_RDONLY);
if (obj_fd < 0)
return false;
@ -636,16 +636,10 @@ bool DumpSymbols::WriteSymbolFile(const std::string &obj_file,
if (!LoadSymbols(elf_header, &symbols))
return false;
// Write to symbol file.
int sym_fd = open(symbol_file.c_str(), O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (sym_fd < 0)
return false;
FDWrapper sym_fd_wrapper(sym_fd);
if (WriteModuleInfo(sym_fd, elf_header->e_machine, obj_file) &&
DumpStabSymbols(sym_fd, symbols))
return true;
// Remove the symbol file if failed to write the symbols.
unlink(symbol_file.c_str());
return false;
}

2
src/common/linux/dump_symbols.h
View file

@ -40,7 +40,7 @@ namespace google_breakpad {
class DumpSymbols {
public:
bool WriteSymbolFile(const std::string &obj_file,
const std::string &symbol_file);
int sym_fd);
};
} // namespace google_breakpad

20
src/tools/linux/dump_syms/dump_syms.cc
View file

@ -28,29 +28,25 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string>
#include <cstdio>
#include "common/linux/dump_symbols.h"
using namespace google_breakpad;
int main(int argc, char **argv) {
if (argc < 2 || argc > 3) {
fprintf(stderr,
"Usage: %s <binary-with-stab-symbol> [output-symbol-file]\n",
argv[0]);
if (argc != 2) {
fprintf(stderr, "Usage: %s <binary-with-stab-symbol>\n", argv[0]);
return 1;
}
const char *binary = argv[1];
std::string symbol_file(binary);
symbol_file += ".sym";
if (argc == 3)
symbol_file = argv[2];
DumpSymbols dumper;
if (dumper.WriteSymbolFile(binary, symbol_file))
printf("Symbol file successfully written: %s\n", symbol_file.c_str());
else
printf("Failed to write symbol file.\n");
if (!dumper.WriteSymbolFile(binary, fileno(stdout))) {
fprintf(stderr, "Failed to write symbol file.\n");
return 1;
}
return 0;
}