mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 07:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made name longer

Browse Source
This commit is contained in:
Brian Carrier 2018-05-16 13:57:41 -04:00
parent b1f78c62c6
commit 04df83dd93
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.java
View File

@ -351,7 +351,7 @@ public class StringExtract {
res.reset(); res.reset();
int curOffset = offset; int curOffset = offset;
int ch; //character being extracted int curChar; //character being extracted
int chBytes; //num bytes consumed by current char (1 - 4) int chBytes; //num bytes consumed by current char (1 - 4)
final StringBuilder tempString = new StringBuilder(); final StringBuilder tempString = new StringBuilder();
@ -364,7 +364,7 @@ public class StringExtract {
final int curByte = toUnsignedInt(buff[curOffset]); final int curByte = toUnsignedInt(buff[curOffset]);
if (curByte <= 0x7F) { if (curByte <= 0x7F) {
chBytes = 1; chBytes = 1;
ch = curByte; curChar = curByte;
} else if (curByte <= 0xC1) { } else if (curByte <= 0xC1) {
break; break;
} else if (curByte <= 0xDF) { } else if (curByte <= 0xDF) {
@ -374,7 +374,7 @@ public class StringExtract {
final int curByte_1 = toUnsignedInt(buff[curOffset + 1]); final int curByte_1 = toUnsignedInt(buff[curOffset + 1]);
if (curByte_1 >= 0x80 && curByte_1 <= 0xBF) { if (curByte_1 >= 0x80 && curByte_1 <= 0xBF) {
chBytes = 2; chBytes = 2;
ch = (((curByte & 0x1f) << 6) + (curByte_1 & 0x3f)); curChar = (((curByte & 0x1f) << 6) + (curByte_1 & 0x3f));
} else { } else {
break; break;
} }
@ -388,7 +388,7 @@ public class StringExtract {
if (curByte_1 >= 0xA0 && curByte_1 <= 0xBF if (curByte_1 >= 0xA0 && curByte_1 <= 0xBF
&& curByte_2 >= 0x80 && curByte_2 <= 0xBF) { && curByte_2 >= 0x80 && curByte_2 <= 0xBF) {
chBytes = 3; chBytes = 3;
ch = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f)); curChar = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f));
} else { } else {
break; break;
} }
@ -401,7 +401,7 @@ public class StringExtract {
if (curByte_1 >= 0x80 && curByte_1 <= 0xBF if (curByte_1 >= 0x80 && curByte_1 <= 0xBF
&& curByte_2 >= 0x80 && curByte_2 <= 0xBF) { && curByte_2 >= 0x80 && curByte_2 <= 0xBF) {
chBytes = 3; chBytes = 3;
ch = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f)); curChar = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f));
} else { } else {
break; break;
} }
@ -414,7 +414,7 @@ public class StringExtract {
if (curByte_1 >= 0x80 && curByte_1 <= 0x9F if (curByte_1 >= 0x80 && curByte_1 <= 0x9F
&& curByte_2 >= 0x80 && curByte_2 <= 0xBF) { && curByte_2 >= 0x80 && curByte_2 <= 0xBF) {
chBytes = 3; chBytes = 3;
ch = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f)); curChar = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f));
} else { } else {
break; break;
} }
@ -427,7 +427,7 @@ public class StringExtract {
if (curByte_1 >= 0x80 && curByte_1 <= 0xBF if (curByte_1 >= 0x80 && curByte_1 <= 0xBF
&& curByte_2 >= 0x80 && curByte_2 <= 0xBF) { && curByte_2 >= 0x80 && curByte_2 <= 0xBF) {
chBytes = 3; chBytes = 3;
ch = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f)); curChar = (((curByte & 0x0f) << 12) + ((curByte_1 & 0x3f) << 6) + (curByte_2 & 0x3f));
} else { } else {
break; break;
} }
@ -442,7 +442,7 @@ public class StringExtract {
&& curByte_2 >= 0x80 && curByte_2 <= 0xBF && curByte_2 >= 0x80 && curByte_2 <= 0xBF
&& curByte_3 >= 0x80 && curByte_3 <= 0xBF) { && curByte_3 >= 0x80 && curByte_3 <= 0xBF) {
chBytes = 4; chBytes = 4;
ch = (((curByte & 0x07) << 18) + ((curByte_1 & 0x3f) << 12) + ((curByte_2 & 0x3f) << 6) + (curByte_3 & 0x3f)); curChar = (((curByte & 0x07) << 18) + ((curByte_1 & 0x3f) << 12) + ((curByte_2 & 0x3f) << 6) + (curByte_3 & 0x3f));
} else { } else {
break; break;
} }
@ -457,7 +457,7 @@ public class StringExtract {
&& curByte_2 >= 0x80 && curByte_2 <= 0xBF && curByte_2 >= 0x80 && curByte_2 <= 0xBF
&& curByte_3 >= 0x80 && curByte_3 <= 0xBF) { && curByte_3 >= 0x80 && curByte_3 <= 0xBF) {
chBytes = 4; chBytes = 4;
ch = (((curByte & 0x07) << 18) + ((curByte_1 & 0x3f) << 12) + ((curByte_2 & 0x3f) << 6) + (curByte_3 & 0x3f)); curChar = (((curByte & 0x07) << 18) + ((curByte_1 & 0x3f) << 12) + ((curByte_2 & 0x3f) << 6) + (curByte_3 & 0x3f));
} else { } else {
break; break;
} }
@ -468,12 +468,12 @@ public class StringExtract {
curOffset += chBytes; curOffset += chBytes;
//skip if beyond range //skip if beyond range
if (ch > StringExtractUnicodeTable.UNICODE_TABLE_SIZE - 1) { if (curChar > StringExtractUnicodeTable.UNICODE_TABLE_SIZE - 1) {
break; break;
} }
//lookup byteVal in the unicode table //lookup byteVal in the unicode table
SCRIPT scriptFound = unicodeTable.getScript(ch); SCRIPT scriptFound = unicodeTable.getScript(curChar);
if (scriptFound == SCRIPT.NONE) { if (scriptFound == SCRIPT.NONE) {
break; break;
@ -507,7 +507,7 @@ public class StringExtract {
res.numBytes += chBytes; res.numBytes += chBytes;
//append the char //append the char
++res.numChars; ++res.numChars;
tempString.append((char) ch); tempString.append((char) curChar);
} else { } else {
//bail out //bail out
break; break;