rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-21 15:54:39 +01:00
Code Issues Releases Activity

Fix typos in ArchiveExtractor.java error messages

Browse Source
This commit is contained in:
per1234 2015-10-12 14:34:52 -07:00
parent bf609ecc4c
commit c1ce649554
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arduino-core/src/cc/arduino/utils/ArchiveExtractor.java
View File

@ -164,7 +164,7 @@ public class ArchiveExtractor {
while (stripPath > 0) { while (stripPath > 0) {
slash = name.indexOf("/", slash); slash = name.indexOf("/", slash);
if (slash == -1) { if (slash == -1) {
throw new IOException("Invalid archive: it must contains a single root folder"); throw new IOException("Invalid archive: it must contain a single root folder");
} }
slash++; slash++;
stripPath--; stripPath--;
@ -174,7 +174,7 @@ public class ArchiveExtractor {
// Strip the common path prefix when requested // Strip the common path prefix when requested
if (!name.startsWith(pathPrefix)) { if (!name.startsWith(pathPrefix)) {
throw new IOException("Invalid archive: it must contains a single root folder while file " + name + " is outside " + pathPrefix); throw new IOException("Invalid archive: it must contain a single root folder while file " + name + " is outside " + pathPrefix);
} }
name = name.substring(pathPrefix.length()); name = name.substring(pathPrefix.length());
if (name.isEmpty()) { if (name.isEmpty()) {
@ -185,7 +185,7 @@ public class ArchiveExtractor {
File outputLinkedFile = null; File outputLinkedFile = null;
if (isLink) { if (isLink) {
if (!linkName.startsWith(pathPrefix)) { if (!linkName.startsWith(pathPrefix)) {
throw new IOException("Invalid archive: it must contains a single root folder while file " + linkName + " is outside " + pathPrefix); throw new IOException("Invalid archive: it must contain a single root folder while file " + linkName + " is outside " + pathPrefix);
} }
linkName = linkName.substring(pathPrefix.length()); linkName = linkName.substring(pathPrefix.length());
outputLinkedFile = new File(destFolder, linkName); outputLinkedFile = new File(destFolder, linkName);