drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 25eb0464: Merge "Normalize output from aapt d"

Browse Source 
* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d
This commit is contained in:
Dianne Hackborn
2011-01-29 23:01:20 -08:00
committed by Android Git Automerger
parent 2107757dde 25eb04642c
commit a30063d80c
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/utils/ResourceTypes.h
View File

@ -1983,6 +1983,7 @@ public:
#ifndef HAVE_ANDROID_OS
void print(bool inclValues) const;
static String8 normalizeForOutput(const char* input);
#endif
private:

36
libs/utils/ResourceTypes.cpp
View File

@ -4038,6 +4038,38 @@ void print_complex(uint32_t complex, bool isFraction)
}
}
// Normalize a string for output
String8 ResTable::normalizeForOutput( const char *input )
{
String8 ret;
char buff[2];
buff[1] = '\0';
while (*input != '\0') {
switch (*input) {
// All interesting characters are in the ASCII zone, so we are making our own lives
// easier by scanning the string one byte at a time.
case '\\':
ret += "\\\\";
break;
case '\n':
ret += "\\n";
break;
case '"':
ret += "\\\"";
break;
default:
buff[0] = *input;
ret += buff;
break;
}
input++;
}
return ret;
}
void ResTable::print_value(const Package* pkg, const Res_value& value) const
{
if (value.dataType == Res_value::TYPE_NULL) {
@ -4051,13 +4083,13 @@ void ResTable::print_value(const Package* pkg, const Res_value& value) const
const char* str8 = pkg->header->values.string8At(
value.data, &len);
if (str8 != NULL) {
printf("(string8) \"%s\"\n", str8);
printf("(string8) \"%s\"\n", normalizeForOutput(str8).string());
} else {
const char16_t* str16 = pkg->header->values.stringAt(
value.data, &len);
if (str16 != NULL) {
printf("(string16) \"%s\"\n",
String8(str16, len).string());
normalizeForOutput(String8(str16, len).string()).string());
} else {
printf("(string) null\n");
}

6
tools/aapt/XMLNode.cpp
View File

@ -451,13 +451,15 @@ void printXMLBlock(ResXMLTree* block)
printf("=?0x%x", (int)value.data);
} else if (value.dataType == Res_value::TYPE_STRING) {
printf("=\"%s\"",
String8(block->getAttributeStringValue(i, &len)).string());
ResTable::normalizeForOutput(String8(block->getAttributeStringValue(i,
&len)).string()).string());
} else {
printf("=(type 0x%x)0x%x", (int)value.dataType, (int)value.data);
}
const char16_t* val = block->getAttributeStringValue(i, &len);
if (val != NULL) {
printf(" (Raw: \"%s\")", String8(val).string());
printf(" (Raw: \"%s\")", ResTable::normalizeForOutput(String8(val).string()).
string());
}
printf("\n");
}