rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-06-19 23:58:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean archive names for every output format other than scripts.

Browse Source
This commit is contained in:
Chris Johns 2012-11-21 17:40:44 +11:00
parent 7b2762fe14
commit c2657cdc11
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
linkers/rld-outputter.cpp
View File

@ -43,7 +43,8 @@ namespace rld
const std::string const std::string
script_text (const std::string& entry, script_text (const std::string& entry,
const files::object_list& dependents, const files::object_list& dependents,
const files::cache& cache) const files::cache& cache,
bool not_in_archive)
{ {
std::ostringstream out; std::ostringstream out;
files::object_list objects; files::object_list objects;
@ -63,11 +64,22 @@ namespace rld
++oi) ++oi)
{ {
files::object& obj = *(*oi); files::object& obj = *(*oi);
std::string name = obj.name ().basename ();
if (not_in_archive)
{
size_t pos = name.find (':');
if (pos != std::string::npos)
name[pos] = '_';
pos = name.find ('@');
if (pos != std::string::npos)
name = name.substr (0, pos);
}
if (rld::verbose () >= RLD_VERBOSE_INFO) if (rld::verbose () >= RLD_VERBOSE_INFO)
std::cout << " o: " << obj.name ().full () << std::endl; std::cout << " o: " << name << std::endl;
out << "o:" << obj.name ().basename () << std::endl; out << "o:" << name << std::endl;
symbols::table& unresolved = obj.unresolved_symbols (); symbols::table& unresolved = obj.unresolved_symbols ();
@ -99,7 +111,7 @@ namespace rld
if (rld::verbose () >= RLD_VERBOSE_INFO) if (rld::verbose () >= RLD_VERBOSE_INFO)
std::cout << "metadata: " << metadata.name ().full () << std::endl; std::cout << "metadata: " << metadata.name ().full () << std::endl;
const std::string script = script_text (entry, dependents, cache); const std::string script = script_text (entry, dependents, cache, true);
metadata.open (true); metadata.open (true);
metadata.begin (); metadata.begin ();
@ -182,7 +194,7 @@ namespace rld
try try
{ {
out << script_text (entry, dependents, cache); out << script_text (entry, dependents, cache, false);
} }
catch (...) catch (...)
{ {
@ -265,7 +277,7 @@ namespace rld
header = "RAP,00000000,01.00.00,LZ77,00000000\n"; header = "RAP,00000000,01.00.00,LZ77,00000000\n";
header += '\0'; header += '\0';
script = script_text (entry, dependents, cache); script = script_text (entry, dependents, cache, true);
cache.get_objects (objects); cache.get_objects (objects);
objects.merge (dep_copy); objects.merge (dep_copy);