Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d099d6e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use broader permissions when archiving files." into sc-dev

parents 7e148881 0f437f21

jar/jar.go

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ func MetaDirFileHeader() *zip.FileHeader { 
		Name:  MetaDir,

		Extra: []byte{MetaDirExtra[1], MetaDirExtra[0], 0, 0},

	}

	dirHeader.SetMode(0700 | os.ModeDir)

	dirHeader.SetMode(0755 | os.ModeDir)

	dirHeader.SetModTime(DefaultTime)



	return dirHeader
@@ -95,7 +95,7 @@ func ManifestFileContents(contents []byte) (*zip.FileHeader, []byte, error) { 
		Method:             zip.Store,

		UncompressedSize64: uint64(len(b)),

	}

	fh.SetMode(0700)

	fh.SetMode(0644)

	fh.SetModTime(DefaultTime)



	return fh, b, nil

zip/zip.go

+3 −3
Original line number Diff line number Diff line
@@ -656,9 +656,9 @@ func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar, srcJar 
			UncompressedSize64: uint64(fileSize),

		}



		mode := os.FileMode(0600)

		mode := os.FileMode(0644)

		if executable {

			mode = 0700

			mode = 0755

		}

		header.SetMode(mode)
@@ -955,7 +955,7 @@ func (z *ZipWriter) writeDirectory(dir string, src string, emulateJar bool) erro 
				dirHeader = &zip.FileHeader{

					Name: cleanDir + "/",

				}

				dirHeader.SetMode(0700 | os.ModeDir)

				dirHeader.SetMode(0755 | os.ModeDir)

			}



			dirHeader.SetModTime(z.time)

zip/zip_test.go

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ func fh(name string, contents []byte, method uint16) zip.FileHeader { 
		Method:             method,

		CRC32:              crc32.ChecksumIEEE(contents),

		UncompressedSize64: uint64(len(contents)),

		ExternalAttrs:      (syscall.S_IFREG | 0600) << 16,

		ExternalAttrs:      (syscall.S_IFREG | 0644) << 16,

	}

}
@@ -72,7 +72,7 @@ func fhManifest(contents []byte) zip.FileHeader { 
		Method:             zip.Store,

		CRC32:              crc32.ChecksumIEEE(contents),

		UncompressedSize64: uint64(len(contents)),

		ExternalAttrs:      (syscall.S_IFREG | 0700) << 16,

		ExternalAttrs:      (syscall.S_IFREG | 0644) << 16,

	}

}
@@ -92,7 +92,7 @@ func fhDir(name string) zip.FileHeader { 
		Method:             zip.Store,

		CRC32:              crc32.ChecksumIEEE(nil),

		UncompressedSize64: 0,

		ExternalAttrs:      (syscall.S_IFDIR|0700)<<16 | 0x10,

		ExternalAttrs:      (syscall.S_IFDIR|0755)<<16 | 0x10,

	}

}