Fix entry name length. Ustar limits name to 100 symbols, it does not include terminating symbol

creker · creker · commit 64ff7ab72440 · 2015-09-16T12:37:19.000+03:00
diff --git a/src/Tar/TarHeader.cs b/src/Tar/TarHeader.cs
@@ -896,7 +896,7 @@ public static int GetNameBytes(string name, int nameOffset, byte[] buffer, int b
 
 			int i;
 			
-			for (i = 0 ; i < length - 1 && nameOffset + i < name.Length; ++i) {
+			for (i = 0 ; i < length && nameOffset + i < name.Length; ++i) {
 				buffer[bufferOffset + i] = (byte)name[nameOffset + i];
 			}
 			
diff --git a/src/Tar/TarOutputStream.cs b/src/Tar/TarOutputStream.cs
@@ -278,7 +278,7 @@ public void PutNextEntry(TarEntry entry)
 				throw new ArgumentNullException("entry");
 			}
 
-			if (entry.TarHeader.Name.Length >= TarHeader.NAMELEN) {
+			if (entry.TarHeader.Name.Length > TarHeader.NAMELEN) {
 				TarHeader longHeader = new TarHeader();
 				longHeader.TypeFlag = TarHeader.LF_GNU_LONGNAME;
 				longHeader.Name = longHeader.Name + "././@LongLink";

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,7 @@ public static int GetNameBytes(string name, int nameOffset, byte[] buffer, int b`
`896`	`896`
`897`	`897`	`int i;`
`898`	`898`
`899`		`- for (i = 0 ; i < length - 1 && nameOffset + i < name.Length; ++i) {`
	`899`	`+ for (i = 0 ; i < length && nameOffset + i < name.Length; ++i) {`
`900`	`900`	`buffer[bufferOffset + i] = (byte)name[nameOffset + i];`
`901`	`901`	`}`
`902`	`902`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ public void PutNextEntry(TarEntry entry)`
`278`	`278`	`throw new ArgumentNullException("entry");`
`279`	`279`	`}`
`280`	`280`
`281`		`- if (entry.TarHeader.Name.Length >= TarHeader.NAMELEN) {`
	`281`	`+ if (entry.TarHeader.Name.Length > TarHeader.NAMELEN) {`
`282`	`282`	`TarHeader longHeader = new TarHeader();`
`283`	`283`	`longHeader.TypeFlag = TarHeader.LF_GNU_LONGNAME;`
`284`	`284`	`longHeader.Name = longHeader.Name + "././@LongLink";`