Merge branch 'master' from Windows

2015-01-05 13:33:52 -05:00
parent 584baa3f19 60730702a5
commit ec617322d0
4 changed files with 10 additions and 6 deletions
--- a/src/tools/tarball.cpp
+++ b/src/tools/tarball.cpp
@@ -35,7 +35,7 @@ tarball::header_posix_ustar tarball::generateTarHeader(const std::string& fileNa
 	memset(header.checksum,' ',8);
 	header.typeflag[0] = directory ? '5' : '0';
 	// leave linkname filled with NULs
-	snprintf(header.magic,6,"ustar  ");
+	snprintf(header.magic,6,"ustar");
 	snprintf(header.version,2," ");
 	// leave uname filled with NULs
 	// leave gname filled with NULs