blob: cb85f5ced77b417a43c6fbfdf0f09c31fdd00503 [file] [log] [blame]
Colin Cross2fe66872015-03-30 17:20:39 -07001// Copyright 2015 Google Inc. All rights reserved.
2//
3// Licensed under the Apache License, Version 2.0 (the "License");
4// you may not use this file except in compliance with the License.
5// You may obtain a copy of the License at
6//
7// http://www.apache.org/licenses/LICENSE-2.0
8//
9// Unless required by applicable law or agreed to in writing, software
10// distributed under the License is distributed on an "AS IS" BASIS,
11// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12// See the License for the specific language governing permissions and
13// limitations under the License.
14
Jeff Gaston11b5c512017-10-12 12:19:14 -070015package zip
Colin Cross2fe66872015-03-30 17:20:39 -070016
17import (
Dan Willemsen017d8932016-08-04 15:43:03 -070018 "bytes"
19 "compress/flate"
Jeff Gastona2976952017-08-22 17:51:25 -070020 "errors"
Colin Cross2fe66872015-03-30 17:20:39 -070021 "fmt"
Dan Willemsen017d8932016-08-04 15:43:03 -070022 "hash/crc32"
Colin Cross2fe66872015-03-30 17:20:39 -070023 "io"
24 "io/ioutil"
25 "os"
26 "path/filepath"
Jeff Gastona2976952017-08-22 17:51:25 -070027 "sort"
Colin Cross2fe66872015-03-30 17:20:39 -070028 "strings"
Dan Willemsen017d8932016-08-04 15:43:03 -070029 "sync"
Colin Cross1d98ee22018-09-18 17:05:15 -070030 "syscall"
Colin Cross2fe66872015-03-30 17:20:39 -070031 "time"
Nan Zhang674dd932018-01-26 18:30:36 -080032 "unicode"
Dan Willemsen017d8932016-08-04 15:43:03 -070033
Colin Crossf83c1502017-11-10 13:11:02 -080034 "github.com/google/blueprint/pathtools"
35
Jeff Gastona2976952017-08-22 17:51:25 -070036 "android/soong/jar"
Dan Willemsen017d8932016-08-04 15:43:03 -070037 "android/soong/third_party/zip"
Colin Cross2fe66872015-03-30 17:20:39 -070038)
39
Dan Willemsen017d8932016-08-04 15:43:03 -070040// Block size used during parallel compression of a single file.
41const parallelBlockSize = 1 * 1024 * 1024 // 1MB
42
43// Minimum file size to use parallel compression. It requires more
44// flate.Writer allocations, since we can't change the dictionary
45// during Reset
46const minParallelFileSize = parallelBlockSize * 6
47
48// Size of the ZIP compression window (32KB)
49const windowSize = 32 * 1024
50
51type nopCloser struct {
52 io.Writer
53}
54
55func (nopCloser) Close() error {
56 return nil
57}
58
Jeff Gastoncef50b92017-08-23 15:41:35 -070059type byteReaderCloser struct {
Colin Cross635acc92017-09-12 22:50:46 -070060 *bytes.Reader
Jeff Gastoncef50b92017-08-23 15:41:35 -070061 io.Closer
62}
63
Nan Zhang9067b042017-03-17 14:04:43 -070064type pathMapping struct {
65 dest, src string
Nan Zhangf281bd82017-04-25 16:47:45 -070066 zipMethod uint16
67}
68
Jeff Gastonc3bdc972017-10-12 12:18:19 -070069type FileArg struct {
70 PathPrefixInZip, SourcePrefixToStrip string
71 SourceFiles []string
Colin Crossb7c69112018-09-18 16:51:43 -070072 JunkPaths bool
Jeff Gastonc3bdc972017-10-12 12:18:19 -070073 GlobDir string
74}
75
Colin Crossfe945b42018-09-27 15:00:07 -070076type FileArgsBuilder struct {
77 state FileArg
78 err error
79 fs pathtools.FileSystem
80
81 fileArgs []FileArg
82}
83
84func NewFileArgsBuilder() *FileArgsBuilder {
85 return &FileArgsBuilder{
86 fs: pathtools.OsFs,
87 }
88}
89
90func (b *FileArgsBuilder) JunkPaths(v bool) *FileArgsBuilder {
91 b.state.JunkPaths = v
92 b.state.SourcePrefixToStrip = ""
93 return b
94}
95
96func (b *FileArgsBuilder) SourcePrefixToStrip(prefixToStrip string) *FileArgsBuilder {
97 b.state.JunkPaths = false
98 b.state.SourcePrefixToStrip = prefixToStrip
99 return b
100}
101
102func (b *FileArgsBuilder) PathPrefixInZip(rootPrefix string) *FileArgsBuilder {
103 b.state.PathPrefixInZip = rootPrefix
104 return b
105}
106
107func (b *FileArgsBuilder) File(name string) *FileArgsBuilder {
108 if b.err != nil {
109 return b
110 }
111
112 arg := b.state
113 arg.SourceFiles = []string{name}
114 b.fileArgs = append(b.fileArgs, arg)
115 return b
116}
117
118func (b *FileArgsBuilder) Dir(name string) *FileArgsBuilder {
119 if b.err != nil {
120 return b
121 }
122
123 arg := b.state
124 arg.GlobDir = name
125 b.fileArgs = append(b.fileArgs, arg)
126 return b
127}
128
Sasha Smundak8eedba62020-11-16 19:00:27 -0800129// List reads the file names from the given file and adds them to the source files list.
Colin Crossfe945b42018-09-27 15:00:07 -0700130func (b *FileArgsBuilder) List(name string) *FileArgsBuilder {
131 if b.err != nil {
132 return b
133 }
134
135 f, err := b.fs.Open(name)
136 if err != nil {
137 b.err = err
138 return b
139 }
140 defer f.Close()
141
142 list, err := ioutil.ReadAll(f)
143 if err != nil {
144 b.err = err
145 return b
146 }
147
148 arg := b.state
Jiyong Park04bbf982019-11-04 13:18:41 +0900149 arg.SourceFiles = strings.Fields(string(list))
Colin Crossfe945b42018-09-27 15:00:07 -0700150 b.fileArgs = append(b.fileArgs, arg)
151 return b
152}
153
Sasha Smundak8eedba62020-11-16 19:00:27 -0800154// RspFile reads the file names from given .rsp file and adds them to the source files list.
Colin Cross053fca12020-08-19 13:51:47 -0700155func (b *FileArgsBuilder) RspFile(name string) *FileArgsBuilder {
156 if b.err != nil {
157 return b
158 }
159
160 f, err := b.fs.Open(name)
161 if err != nil {
162 b.err = err
163 return b
164 }
165 defer f.Close()
166
167 list, err := ioutil.ReadAll(f)
168 if err != nil {
169 b.err = err
170 return b
171 }
172
173 arg := b.state
174 arg.SourceFiles = ReadRespFile(list)
175 b.fileArgs = append(b.fileArgs, arg)
176 return b
177}
178
Colin Crossfe945b42018-09-27 15:00:07 -0700179func (b *FileArgsBuilder) Error() error {
180 if b == nil {
181 return nil
182 }
183 return b.err
184}
185
186func (b *FileArgsBuilder) FileArgs() []FileArg {
187 if b == nil {
188 return nil
189 }
190 return b.fileArgs
191}
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700192
Colin Cross1d98ee22018-09-18 17:05:15 -0700193type IncorrectRelativeRootError struct {
194 RelativeRoot string
195 Path string
196}
197
198func (x IncorrectRelativeRootError) Error() string {
199 return fmt.Sprintf("path %q is outside relative root %q", x.Path, x.RelativeRoot)
200}
201
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700202type ZipWriter struct {
Colin Crosse5580972017-08-30 17:40:21 -0700203 time time.Time
204 createdFiles map[string]string
205 createdDirs map[string]string
206 directories bool
Colin Crosse19c7932015-04-24 15:08:38 -0700207
Dan Willemsen017d8932016-08-04 15:43:03 -0700208 errors chan error
209 writeOps chan chan *zipEntry
210
Jeff Gaston175f34c2017-08-17 21:43:21 -0700211 cpuRateLimiter *CPURateLimiter
212 memoryRateLimiter *MemoryRateLimiter
Dan Willemsen017d8932016-08-04 15:43:03 -0700213
214 compressorPool sync.Pool
215 compLevel int
Colin Cross05518bc2018-09-27 15:06:19 -0700216
Colin Cross4be8f9e2018-09-28 15:16:48 -0700217 followSymlinks pathtools.ShouldFollowSymlinks
218 ignoreMissingFiles bool
Colin Cross09f11052018-09-21 15:12:39 -0700219
Colin Cross4be8f9e2018-09-28 15:16:48 -0700220 stderr io.Writer
221 fs pathtools.FileSystem
Dan Willemsen017d8932016-08-04 15:43:03 -0700222}
223
224type zipEntry struct {
225 fh *zip.FileHeader
226
227 // List of delayed io.Reader
228 futureReaders chan chan io.Reader
Jeff Gaston175f34c2017-08-17 21:43:21 -0700229
230 // Only used for passing into the MemoryRateLimiter to ensure we
231 // release as much memory as much as we request
232 allocatedSize int64
Colin Cross2fe66872015-03-30 17:20:39 -0700233}
234
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700235type ZipArgs struct {
Colin Crossfe945b42018-09-27 15:00:07 -0700236 FileArgs []FileArg
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700237 OutputFilePath string
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700238 EmulateJar bool
Colin Cross9cb51db2019-06-17 14:12:41 -0700239 SrcJar bool
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700240 AddDirectoryEntriesToZip bool
241 CompressionLevel int
242 ManifestSourcePath string
243 NumParallelJobs int
244 NonDeflatedFiles map[string]bool
Colin Crossf83c1502017-11-10 13:11:02 -0800245 WriteIfChanged bool
Colin Cross09f11052018-09-21 15:12:39 -0700246 StoreSymlinks bool
Colin Cross4be8f9e2018-09-28 15:16:48 -0700247 IgnoreMissingFiles bool
Colin Cross09f11052018-09-21 15:12:39 -0700248
Colin Cross4be8f9e2018-09-28 15:16:48 -0700249 Stderr io.Writer
Colin Cross09f11052018-09-21 15:12:39 -0700250 Filesystem pathtools.FileSystem
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700251}
Colin Cross2fe66872015-03-30 17:20:39 -0700252
Nan Zhang674dd932018-01-26 18:30:36 -0800253const NOQUOTE = '\x00'
254
255func ReadRespFile(bytes []byte) []string {
256 var args []string
257 var arg []rune
258
259 isEscaping := false
260 quotingStart := NOQUOTE
261 for _, c := range string(bytes) {
262 switch {
263 case isEscaping:
264 if quotingStart == '"' {
265 if !(c == '"' || c == '\\') {
266 // '\"' or '\\' will be escaped under double quoting.
267 arg = append(arg, '\\')
268 }
269 }
270 arg = append(arg, c)
271 isEscaping = false
272 case c == '\\' && quotingStart != '\'':
273 isEscaping = true
274 case quotingStart == NOQUOTE && (c == '\'' || c == '"'):
275 quotingStart = c
276 case quotingStart != NOQUOTE && c == quotingStart:
277 quotingStart = NOQUOTE
278 case quotingStart == NOQUOTE && unicode.IsSpace(c):
279 // Current character is a space outside quotes
280 if len(arg) != 0 {
281 args = append(args, string(arg))
282 }
283 arg = arg[:0]
284 default:
285 arg = append(arg, c)
286 }
287 }
288
289 if len(arg) != 0 {
290 args = append(args, string(arg))
291 }
292
293 return args
294}
295
Sasha Smundak8eedba62020-11-16 19:00:27 -0800296func zipTo(args ZipArgs, w io.Writer) error {
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700297 if args.EmulateJar {
298 args.AddDirectoryEntriesToZip = true
Jeff Gaston8edbb3a2017-08-22 20:05:28 -0700299 }
300
Colin Cross09f11052018-09-21 15:12:39 -0700301 // Have Glob follow symlinks if they are not being stored as symlinks in the zip file.
302 followSymlinks := pathtools.ShouldFollowSymlinks(!args.StoreSymlinks)
303
Colin Cross05518bc2018-09-27 15:06:19 -0700304 z := &ZipWriter{
Colin Cross4be8f9e2018-09-28 15:16:48 -0700305 time: jar.DefaultTime,
306 createdDirs: make(map[string]string),
307 createdFiles: make(map[string]string),
308 directories: args.AddDirectoryEntriesToZip,
309 compLevel: args.CompressionLevel,
310 followSymlinks: followSymlinks,
311 ignoreMissingFiles: args.IgnoreMissingFiles,
312 stderr: args.Stderr,
313 fs: args.Filesystem,
Colin Cross2fe66872015-03-30 17:20:39 -0700314 }
Colin Cross05518bc2018-09-27 15:06:19 -0700315
316 if z.fs == nil {
317 z.fs = pathtools.OsFs
318 }
319
Colin Cross4be8f9e2018-09-28 15:16:48 -0700320 if z.stderr == nil {
321 z.stderr = os.Stderr
322 }
323
Nan Zhang9067b042017-03-17 14:04:43 -0700324 pathMappings := []pathMapping{}
Nan Zhang9067b042017-03-17 14:04:43 -0700325
Colin Crossd3216292018-09-14 15:06:31 -0700326 noCompression := args.CompressionLevel == 0
327
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700328 for _, fa := range args.FileArgs {
Colin Cross1d98ee22018-09-18 17:05:15 -0700329 var srcs []string
330 for _, s := range fa.SourceFiles {
331 s = strings.TrimSpace(s)
332 if s == "" {
333 continue
334 }
335
Colin Cross09f11052018-09-21 15:12:39 -0700336 globbed, _, err := z.fs.Glob(s, nil, followSymlinks)
Colin Cross1d98ee22018-09-18 17:05:15 -0700337 if err != nil {
338 return err
339 }
340 if len(globbed) == 0 {
Colin Cross4be8f9e2018-09-28 15:16:48 -0700341 err := &os.PathError{
342 Op: "lstat",
Colin Cross1d98ee22018-09-18 17:05:15 -0700343 Path: s,
344 Err: os.ErrNotExist,
345 }
Colin Cross4be8f9e2018-09-28 15:16:48 -0700346 if args.IgnoreMissingFiles {
Dan Willemsenedc934c2018-12-27 12:41:25 -0800347 fmt.Fprintln(z.stderr, "warning:", err)
Colin Cross4be8f9e2018-09-28 15:16:48 -0700348 } else {
349 return err
350 }
Colin Cross1d98ee22018-09-18 17:05:15 -0700351 }
352 srcs = append(srcs, globbed...)
353 }
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700354 if fa.GlobDir != "" {
Colin Cross1d98ee22018-09-18 17:05:15 -0700355 if exists, isDir, err := z.fs.Exists(fa.GlobDir); err != nil {
356 return err
Colin Cross4be8f9e2018-09-28 15:16:48 -0700357 } else if !exists && !args.IgnoreMissingFiles {
358 err := &os.PathError{
359 Op: "lstat",
Colin Cross1d98ee22018-09-18 17:05:15 -0700360 Path: fa.GlobDir,
361 Err: os.ErrNotExist,
362 }
Colin Cross4be8f9e2018-09-28 15:16:48 -0700363 if args.IgnoreMissingFiles {
Dan Willemsenedc934c2018-12-27 12:41:25 -0800364 fmt.Fprintln(z.stderr, "warning:", err)
Colin Cross4be8f9e2018-09-28 15:16:48 -0700365 } else {
366 return err
367 }
368 } else if !isDir && !args.IgnoreMissingFiles {
369 err := &os.PathError{
370 Op: "lstat",
Colin Cross1d98ee22018-09-18 17:05:15 -0700371 Path: fa.GlobDir,
372 Err: syscall.ENOTDIR,
373 }
Colin Cross4be8f9e2018-09-28 15:16:48 -0700374 if args.IgnoreMissingFiles {
Dan Willemsenedc934c2018-12-27 12:41:25 -0800375 fmt.Fprintln(z.stderr, "warning:", err)
Colin Cross4be8f9e2018-09-28 15:16:48 -0700376 } else {
377 return err
378 }
Colin Cross1d98ee22018-09-18 17:05:15 -0700379 }
Colin Cross09f11052018-09-21 15:12:39 -0700380 globbed, _, err := z.fs.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, followSymlinks)
Colin Cross1d98ee22018-09-18 17:05:15 -0700381 if err != nil {
382 return err
383 }
384 srcs = append(srcs, globbed...)
Colin Cross7b10cf12017-08-30 14:12:21 -0700385 }
386 for _, src := range srcs {
Colin Crossb7c69112018-09-18 16:51:43 -0700387 err := fillPathPairs(fa, src, &pathMappings, args.NonDeflatedFiles, noCompression)
Colin Crossd3216292018-09-14 15:06:31 -0700388 if err != nil {
Colin Cross05518bc2018-09-27 15:06:19 -0700389 return err
Nan Zhang9067b042017-03-17 14:04:43 -0700390 }
391 }
392 }
393
Colin Cross9cb51db2019-06-17 14:12:41 -0700394 return z.write(w, pathMappings, args.ManifestSourcePath, args.EmulateJar, args.SrcJar, args.NumParallelJobs)
Colin Cross05518bc2018-09-27 15:06:19 -0700395}
396
Sasha Smundak8eedba62020-11-16 19:00:27 -0800397// Zip creates an output zip archive from given sources.
Colin Cross05518bc2018-09-27 15:06:19 -0700398func Zip(args ZipArgs) error {
399 if args.OutputFilePath == "" {
400 return fmt.Errorf("output file path must be nonempty")
401 }
402
Colin Crossf83c1502017-11-10 13:11:02 -0800403 buf := &bytes.Buffer{}
404 var out io.Writer = buf
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700405
Colin Crossf83c1502017-11-10 13:11:02 -0800406 if !args.WriteIfChanged {
407 f, err := os.Create(args.OutputFilePath)
408 if err != nil {
409 return err
410 }
411
412 defer f.Close()
413 defer func() {
414 if err != nil {
415 os.Remove(args.OutputFilePath)
416 }
417 }()
418
419 out = f
420 }
421
Sasha Smundak8eedba62020-11-16 19:00:27 -0800422 err := zipTo(args, out)
Colin Crossf83c1502017-11-10 13:11:02 -0800423 if err != nil {
424 return err
425 }
426
427 if args.WriteIfChanged {
428 err := pathtools.WriteFileIfChanged(args.OutputFilePath, buf.Bytes(), 0666)
429 if err != nil {
430 return err
431 }
432 }
433
434 return nil
Colin Cross2fe66872015-03-30 17:20:39 -0700435}
436
Colin Crossb7c69112018-09-18 16:51:43 -0700437func fillPathPairs(fa FileArg, src string, pathMappings *[]pathMapping,
Colin Crossd3216292018-09-14 15:06:31 -0700438 nonDeflatedFiles map[string]bool, noCompression bool) error {
439
Colin Crossb7c69112018-09-18 16:51:43 -0700440 var dest string
441
442 if fa.JunkPaths {
443 dest = filepath.Base(src)
444 } else {
445 var err error
446 dest, err = filepath.Rel(fa.SourcePrefixToStrip, src)
447 if err != nil {
448 return err
449 }
Colin Cross1d98ee22018-09-18 17:05:15 -0700450 if strings.HasPrefix(dest, "../") {
451 return IncorrectRelativeRootError{
452 Path: src,
453 RelativeRoot: fa.SourcePrefixToStrip,
454 }
455 }
Nan Zhang9067b042017-03-17 14:04:43 -0700456 }
Colin Crossb7c69112018-09-18 16:51:43 -0700457 dest = filepath.Join(fa.PathPrefixInZip, dest)
Nan Zhang9067b042017-03-17 14:04:43 -0700458
Nan Zhangf281bd82017-04-25 16:47:45 -0700459 zipMethod := zip.Deflate
Colin Crossd3216292018-09-14 15:06:31 -0700460 if _, found := nonDeflatedFiles[dest]; found || noCompression {
Nan Zhangf281bd82017-04-25 16:47:45 -0700461 zipMethod = zip.Store
462 }
463 *pathMappings = append(*pathMappings,
464 pathMapping{dest: dest, src: src, zipMethod: zipMethod})
Nan Zhang9067b042017-03-17 14:04:43 -0700465
466 return nil
467}
468
Jeff Gastona2976952017-08-22 17:51:25 -0700469func jarSort(mappings []pathMapping) {
Sasha Smundak8eedba62020-11-16 19:00:27 -0800470 sort.SliceStable(mappings, func(i int, j int) bool {
Jeff Gastona2976952017-08-22 17:51:25 -0700471 return jar.EntryNamesLess(mappings[i].dest, mappings[j].dest)
Sasha Smundak8eedba62020-11-16 19:00:27 -0800472 })
Jeff Gastona2976952017-08-22 17:51:25 -0700473}
474
Colin Cross9cb51db2019-06-17 14:12:41 -0700475func (z *ZipWriter) write(f io.Writer, pathMappings []pathMapping, manifest string, emulateJar, srcJar bool,
476 parallelJobs int) error {
477
Dan Willemsen017d8932016-08-04 15:43:03 -0700478 z.errors = make(chan error)
479 defer close(z.errors)
Colin Cross2fe66872015-03-30 17:20:39 -0700480
Dan Willemsen017d8932016-08-04 15:43:03 -0700481 // This channel size can be essentially unlimited -- it's used as a fifo
482 // queue decouple the CPU and IO loads. Directories don't require any
483 // compression time, but still cost some IO. Similar with small files that
484 // can be very fast to compress. Some files that are more difficult to
485 // compress won't take a corresponding longer time writing out.
486 //
487 // The optimum size here depends on your CPU and IO characteristics, and
488 // the the layout of your zip file. 1000 was chosen mostly at random as
489 // something that worked reasonably well for a test file.
490 //
491 // The RateLimit object will put the upper bounds on the number of
492 // parallel compressions and outstanding buffers.
493 z.writeOps = make(chan chan *zipEntry, 1000)
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700494 z.cpuRateLimiter = NewCPURateLimiter(int64(parallelJobs))
Jeff Gaston175f34c2017-08-17 21:43:21 -0700495 z.memoryRateLimiter = NewMemoryRateLimiter(0)
496 defer func() {
497 z.cpuRateLimiter.Stop()
498 z.memoryRateLimiter.Stop()
499 }()
Jeff Gastona2976952017-08-22 17:51:25 -0700500
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700501 if manifest != "" && !emulateJar {
Colin Cross635acc92017-09-12 22:50:46 -0700502 return errors.New("must specify --jar when specifying a manifest via -m")
Jeff Gastona2976952017-08-22 17:51:25 -0700503 }
504
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700505 if emulateJar {
Colin Cross635acc92017-09-12 22:50:46 -0700506 // manifest may be empty, in which case addManifest will fill in a default
507 pathMappings = append(pathMappings, pathMapping{jar.ManifestFile, manifest, zip.Deflate})
508
Jeff Gastona2976952017-08-22 17:51:25 -0700509 jarSort(pathMappings)
510 }
511
Dan Willemsen017d8932016-08-04 15:43:03 -0700512 go func() {
513 var err error
514 defer close(z.writeOps)
515
Nan Zhang9067b042017-03-17 14:04:43 -0700516 for _, ele := range pathMappings {
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700517 if emulateJar && ele.dest == jar.ManifestFile {
Jeff Gastoncef50b92017-08-23 15:41:35 -0700518 err = z.addManifest(ele.dest, ele.src, ele.zipMethod)
519 } else {
Colin Cross9cb51db2019-06-17 14:12:41 -0700520 err = z.addFile(ele.dest, ele.src, ele.zipMethod, emulateJar, srcJar)
Jeff Gastoncef50b92017-08-23 15:41:35 -0700521 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700522 if err != nil {
523 z.errors <- err
524 return
525 }
526 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700527 }()
528
529 zipw := zip.NewWriter(f)
530
531 var currentWriteOpChan chan *zipEntry
532 var currentWriter io.WriteCloser
533 var currentReaders chan chan io.Reader
534 var currentReader chan io.Reader
535 var done bool
536
537 for !done {
538 var writeOpsChan chan chan *zipEntry
539 var writeOpChan chan *zipEntry
540 var readersChan chan chan io.Reader
541
542 if currentReader != nil {
543 // Only read and process errors
544 } else if currentReaders != nil {
545 readersChan = currentReaders
546 } else if currentWriteOpChan != nil {
547 writeOpChan = currentWriteOpChan
548 } else {
549 writeOpsChan = z.writeOps
550 }
551
552 select {
553 case writeOp, ok := <-writeOpsChan:
554 if !ok {
555 done = true
556 }
557
558 currentWriteOpChan = writeOp
559
560 case op := <-writeOpChan:
561 currentWriteOpChan = nil
562
Colin Crossf83c1502017-11-10 13:11:02 -0800563 var err error
Dan Willemsen017d8932016-08-04 15:43:03 -0700564 if op.fh.Method == zip.Deflate {
565 currentWriter, err = zipw.CreateCompressedHeader(op.fh)
566 } else {
567 var zw io.Writer
Jeff Gastonc5eb66d2017-08-24 14:11:27 -0700568
569 op.fh.CompressedSize64 = op.fh.UncompressedSize64
570
571 zw, err = zipw.CreateHeaderAndroid(op.fh)
Dan Willemsen017d8932016-08-04 15:43:03 -0700572 currentWriter = nopCloser{zw}
573 }
574 if err != nil {
575 return err
576 }
577
578 currentReaders = op.futureReaders
579 if op.futureReaders == nil {
580 currentWriter.Close()
581 currentWriter = nil
582 }
Jeff Gaston175f34c2017-08-17 21:43:21 -0700583 z.memoryRateLimiter.Finish(op.allocatedSize)
Dan Willemsen017d8932016-08-04 15:43:03 -0700584
585 case futureReader, ok := <-readersChan:
586 if !ok {
587 // Done with reading
588 currentWriter.Close()
589 currentWriter = nil
590 currentReaders = nil
591 }
592
593 currentReader = futureReader
594
595 case reader := <-currentReader:
Colin Crossf83c1502017-11-10 13:11:02 -0800596 _, err := io.Copy(currentWriter, reader)
Dan Willemsen017d8932016-08-04 15:43:03 -0700597 if err != nil {
598 return err
599 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700600
601 currentReader = nil
602
Colin Crossf83c1502017-11-10 13:11:02 -0800603 case err := <-z.errors:
Colin Cross2fe66872015-03-30 17:20:39 -0700604 return err
605 }
606 }
607
Dan Willemsen017d8932016-08-04 15:43:03 -0700608 // One last chance to catch an error
609 select {
Colin Crossf83c1502017-11-10 13:11:02 -0800610 case err := <-z.errors:
Dan Willemsen017d8932016-08-04 15:43:03 -0700611 return err
612 default:
613 zipw.Close()
614 return nil
Colin Cross2fe66872015-03-30 17:20:39 -0700615 }
Colin Cross2fe66872015-03-30 17:20:39 -0700616}
617
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700618// imports (possibly with compression) <src> into the zip at sub-path <dest>
Colin Cross9cb51db2019-06-17 14:12:41 -0700619func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar, srcJar bool) error {
Dan Willemsen017d8932016-08-04 15:43:03 -0700620 var fileSize int64
Dan Willemsen10462b32017-03-15 19:02:51 -0700621 var executable bool
Dan Willemsen017d8932016-08-04 15:43:03 -0700622
Colin Cross09f11052018-09-21 15:12:39 -0700623 var s os.FileInfo
624 var err error
625 if z.followSymlinks {
626 s, err = z.fs.Stat(src)
627 } else {
628 s, err = z.fs.Lstat(src)
629 }
630
631 if err != nil {
Colin Cross4be8f9e2018-09-28 15:16:48 -0700632 if os.IsNotExist(err) && z.ignoreMissingFiles {
633 fmt.Fprintln(z.stderr, "warning:", err)
634 return nil
635 }
Dan Willemsena59a3bc2016-08-03 17:47:23 -0700636 return err
Colin Cross9cb51db2019-06-17 14:12:41 -0700637 }
638
639 createParentDirs := func(dest, src string) error {
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700640 if err := z.writeDirectory(filepath.Dir(dest), src, emulateJar); err != nil {
Colin Crosse5580972017-08-30 17:40:21 -0700641 return err
642 }
643
644 if prev, exists := z.createdDirs[dest]; exists {
645 return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src)
646 }
647 if prev, exists := z.createdFiles[dest]; exists {
648 return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src)
649 }
650
651 z.createdFiles[dest] = src
652
Colin Cross9cb51db2019-06-17 14:12:41 -0700653 return nil
654 }
655
656 if s.IsDir() {
657 if z.directories {
658 return z.writeDirectory(dest, src, emulateJar)
659 }
660 return nil
661 } else if s.Mode()&os.ModeSymlink != 0 {
662 err = createParentDirs(dest, src)
663 if err != nil {
664 return err
665 }
666
667 return z.writeSymlink(dest, src)
668 } else if s.Mode().IsRegular() {
669 r, err := z.fs.Open(src)
670 if err != nil {
671 return err
672 }
673
674 if srcJar && filepath.Ext(src) == ".java" {
675 // rewrite the destination using the package path if it can be determined
676 pkg, err := jar.JavaPackage(r, src)
677 if err != nil {
678 // ignore errors for now, leaving the file at in its original location in the zip
679 } else {
680 dest = filepath.Join(filepath.Join(strings.Split(pkg, ".")...), filepath.Base(src))
681 }
682
683 _, err = r.Seek(0, io.SeekStart)
684 if err != nil {
685 return err
686 }
Colin Crosse5580972017-08-30 17:40:21 -0700687 }
688
Dan Willemsen017d8932016-08-04 15:43:03 -0700689 fileSize = s.Size()
Dan Willemsen10462b32017-03-15 19:02:51 -0700690 executable = s.Mode()&0100 != 0
Colin Cross957cc4e2015-04-24 15:10:32 -0700691
Colin Cross9cb51db2019-06-17 14:12:41 -0700692 header := &zip.FileHeader{
693 Name: dest,
694 Method: method,
695 UncompressedSize64: uint64(fileSize),
696 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700697
Colin Cross9cb51db2019-06-17 14:12:41 -0700698 if executable {
699 header.SetMode(0700)
700 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700701
Colin Cross9cb51db2019-06-17 14:12:41 -0700702 err = createParentDirs(dest, src)
703 if err != nil {
704 return err
705 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700706
Colin Cross9cb51db2019-06-17 14:12:41 -0700707 return z.writeFileContents(header, r)
708 } else {
709 return fmt.Errorf("%s is not a file, directory, or symlink", src)
710 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700711}
712
Sasha Smundak8eedba62020-11-16 19:00:27 -0800713func (z *ZipWriter) addManifest(dest string, src string, _ uint16) error {
Colin Crosse5580972017-08-30 17:40:21 -0700714 if prev, exists := z.createdDirs[dest]; exists {
715 return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src)
716 }
717 if prev, exists := z.createdFiles[dest]; exists {
718 return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src)
719 }
720
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700721 if err := z.writeDirectory(filepath.Dir(dest), src, true); err != nil {
Colin Cross635acc92017-09-12 22:50:46 -0700722 return err
Jeff Gastoncef50b92017-08-23 15:41:35 -0700723 }
724
Colin Cross05518bc2018-09-27 15:06:19 -0700725 var contents []byte
726 if src != "" {
727 f, err := z.fs.Open(src)
728 if err != nil {
729 return err
730 }
731
732 contents, err = ioutil.ReadAll(f)
733 f.Close()
734 if err != nil {
735 return err
736 }
737 }
738
739 fh, buf, err := jar.ManifestFileContents(contents)
Colin Cross635acc92017-09-12 22:50:46 -0700740 if err != nil {
741 return err
Jeff Gastoncef50b92017-08-23 15:41:35 -0700742 }
743
Colin Cross635acc92017-09-12 22:50:46 -0700744 reader := &byteReaderCloser{bytes.NewReader(buf), ioutil.NopCloser(nil)}
745
746 return z.writeFileContents(fh, reader)
Jeff Gastoncef50b92017-08-23 15:41:35 -0700747}
748
Colin Cross05518bc2018-09-27 15:06:19 -0700749func (z *ZipWriter) writeFileContents(header *zip.FileHeader, r pathtools.ReaderAtSeekerCloser) (err error) {
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700750
751 header.SetModTime(z.time)
752
Dan Willemsen017d8932016-08-04 15:43:03 -0700753 compressChan := make(chan *zipEntry, 1)
754 z.writeOps <- compressChan
755
756 // Pre-fill a zipEntry, it will be sent in the compressChan once
757 // we're sure about the Method and CRC.
758 ze := &zipEntry{
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700759 fh: header,
Dan Willemsen10462b32017-03-15 19:02:51 -0700760 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700761
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700762 ze.allocatedSize = int64(header.UncompressedSize64)
Jeff Gaston175f34c2017-08-17 21:43:21 -0700763 z.cpuRateLimiter.Request()
764 z.memoryRateLimiter.Request(ze.allocatedSize)
Dan Willemsen017d8932016-08-04 15:43:03 -0700765
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700766 fileSize := int64(header.UncompressedSize64)
767 if fileSize == 0 {
768 fileSize = int64(header.UncompressedSize)
769 }
770
771 if header.Method == zip.Deflate && fileSize >= minParallelFileSize {
Dan Willemsen017d8932016-08-04 15:43:03 -0700772 wg := new(sync.WaitGroup)
773
774 // Allocate enough buffer to hold all readers. We'll limit
775 // this based on actual buffer sizes in RateLimit.
776 ze.futureReaders = make(chan chan io.Reader, (fileSize/parallelBlockSize)+1)
777
778 // Calculate the CRC in the background, since reading the entire
779 // file could take a while.
780 //
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700781 // We could split this up into chunks as well, but it's faster
Dan Willemsen017d8932016-08-04 15:43:03 -0700782 // than the compression. Due to the Go Zip API, we also need to
783 // know the result before we can begin writing the compressed
784 // data out to the zipfile.
785 wg.Add(1)
Jeff Gaston175f34c2017-08-17 21:43:21 -0700786 go z.crcFile(r, ze, compressChan, wg)
Dan Willemsen017d8932016-08-04 15:43:03 -0700787
788 for start := int64(0); start < fileSize; start += parallelBlockSize {
789 sr := io.NewSectionReader(r, start, parallelBlockSize)
790 resultChan := make(chan io.Reader, 1)
791 ze.futureReaders <- resultChan
792
Jeff Gaston175f34c2017-08-17 21:43:21 -0700793 z.cpuRateLimiter.Request()
Dan Willemsen017d8932016-08-04 15:43:03 -0700794
795 last := !(start+parallelBlockSize < fileSize)
796 var dict []byte
797 if start >= windowSize {
798 dict, err = ioutil.ReadAll(io.NewSectionReader(r, start-windowSize, windowSize))
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700799 if err != nil {
800 return err
801 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700802 }
803
804 wg.Add(1)
Jeff Gaston175f34c2017-08-17 21:43:21 -0700805 go z.compressPartialFile(sr, dict, last, resultChan, wg)
Dan Willemsen017d8932016-08-04 15:43:03 -0700806 }
807
808 close(ze.futureReaders)
809
810 // Close the file handle after all readers are done
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700811 go func(wg *sync.WaitGroup, closer io.Closer) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700812 wg.Wait()
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700813 closer.Close()
Dan Willemsen017d8932016-08-04 15:43:03 -0700814 }(wg, r)
815 } else {
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700816 go func() {
817 z.compressWholeFile(ze, r, compressChan)
818 r.Close()
819 }()
Dan Willemsen017d8932016-08-04 15:43:03 -0700820 }
821
822 return nil
823}
824
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700825func (z *ZipWriter) crcFile(r io.Reader, ze *zipEntry, resultChan chan *zipEntry, wg *sync.WaitGroup) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700826 defer wg.Done()
Jeff Gaston175f34c2017-08-17 21:43:21 -0700827 defer z.cpuRateLimiter.Finish()
Dan Willemsen017d8932016-08-04 15:43:03 -0700828
829 crc := crc32.NewIEEE()
830 _, err := io.Copy(crc, r)
831 if err != nil {
832 z.errors <- err
833 return
834 }
835
836 ze.fh.CRC32 = crc.Sum32()
837 resultChan <- ze
838 close(resultChan)
839}
840
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700841func (z *ZipWriter) compressPartialFile(r io.Reader, dict []byte, last bool, resultChan chan io.Reader, wg *sync.WaitGroup) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700842 defer wg.Done()
843
844 result, err := z.compressBlock(r, dict, last)
845 if err != nil {
846 z.errors <- err
847 return
848 }
849
Jeff Gaston175f34c2017-08-17 21:43:21 -0700850 z.cpuRateLimiter.Finish()
851
Dan Willemsen017d8932016-08-04 15:43:03 -0700852 resultChan <- result
853}
854
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700855func (z *ZipWriter) compressBlock(r io.Reader, dict []byte, last bool) (*bytes.Buffer, error) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700856 buf := new(bytes.Buffer)
857 var fw *flate.Writer
858 var err error
859 if len(dict) > 0 {
860 // There's no way to Reset a Writer with a new dictionary, so
861 // don't use the Pool
862 fw, err = flate.NewWriterDict(buf, z.compLevel, dict)
863 } else {
864 var ok bool
865 if fw, ok = z.compressorPool.Get().(*flate.Writer); ok {
866 fw.Reset(buf)
867 } else {
868 fw, err = flate.NewWriter(buf, z.compLevel)
869 }
870 defer z.compressorPool.Put(fw)
871 }
872 if err != nil {
873 return nil, err
874 }
875
876 _, err = io.Copy(fw, r)
877 if err != nil {
878 return nil, err
879 }
880 if last {
881 fw.Close()
882 } else {
883 fw.Flush()
884 }
885
886 return buf, nil
887}
888
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700889func (z *ZipWriter) compressWholeFile(ze *zipEntry, r io.ReadSeeker, compressChan chan *zipEntry) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700890
Dan Willemsen017d8932016-08-04 15:43:03 -0700891 crc := crc32.NewIEEE()
Dan Willemsena8b55022017-03-15 21:49:26 -0700892 _, err := io.Copy(crc, r)
Colin Cross2fe66872015-03-30 17:20:39 -0700893 if err != nil {
Dan Willemsen017d8932016-08-04 15:43:03 -0700894 z.errors <- err
895 return
Colin Cross2fe66872015-03-30 17:20:39 -0700896 }
897
Dan Willemsena8b55022017-03-15 21:49:26 -0700898 ze.fh.CRC32 = crc.Sum32()
Colin Cross2fe66872015-03-30 17:20:39 -0700899
Dan Willemsen017d8932016-08-04 15:43:03 -0700900 _, err = r.Seek(0, 0)
Colin Cross2fe66872015-03-30 17:20:39 -0700901 if err != nil {
Dan Willemsen017d8932016-08-04 15:43:03 -0700902 z.errors <- err
903 return
Colin Cross2fe66872015-03-30 17:20:39 -0700904 }
905
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700906 readFile := func(reader io.ReadSeeker) ([]byte, error) {
907 _, err := reader.Seek(0, 0)
Nan Zhangf281bd82017-04-25 16:47:45 -0700908 if err != nil {
909 return nil, err
910 }
911
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700912 buf, err := ioutil.ReadAll(reader)
Nan Zhangf281bd82017-04-25 16:47:45 -0700913 if err != nil {
914 return nil, err
915 }
916
917 return buf, nil
918 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700919
Dan Willemsena8b55022017-03-15 21:49:26 -0700920 ze.futureReaders = make(chan chan io.Reader, 1)
Dan Willemsen017d8932016-08-04 15:43:03 -0700921 futureReader := make(chan io.Reader, 1)
922 ze.futureReaders <- futureReader
923 close(ze.futureReaders)
924
Nan Zhangf281bd82017-04-25 16:47:45 -0700925 if ze.fh.Method == zip.Deflate {
926 compressed, err := z.compressBlock(r, nil, true)
927 if err != nil {
928 z.errors <- err
929 return
930 }
931 if uint64(compressed.Len()) < ze.fh.UncompressedSize64 {
932 futureReader <- compressed
Nan Zhangf281bd82017-04-25 16:47:45 -0700933 } else {
934 buf, err := readFile(r)
935 if err != nil {
936 z.errors <- err
937 return
938 }
939 ze.fh.Method = zip.Store
940 futureReader <- bytes.NewReader(buf)
Nan Zhangf281bd82017-04-25 16:47:45 -0700941 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700942 } else {
Nan Zhangf281bd82017-04-25 16:47:45 -0700943 buf, err := readFile(r)
Dan Willemsen017d8932016-08-04 15:43:03 -0700944 if err != nil {
945 z.errors <- err
946 return
947 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700948 ze.fh.Method = zip.Store
949 futureReader <- bytes.NewReader(buf)
Dan Willemsen017d8932016-08-04 15:43:03 -0700950 }
Nan Zhangf281bd82017-04-25 16:47:45 -0700951
Jeff Gaston175f34c2017-08-17 21:43:21 -0700952 z.cpuRateLimiter.Finish()
953
Dan Willemsen017d8932016-08-04 15:43:03 -0700954 close(futureReader)
955
956 compressChan <- ze
957 close(compressChan)
Colin Cross2fe66872015-03-30 17:20:39 -0700958}
Colin Crosse19c7932015-04-24 15:08:38 -0700959
Colin Crosse5580972017-08-30 17:40:21 -0700960// writeDirectory annotates that dir is a directory created for the src file or directory, and adds
961// the directory entry to the zip file if directories are enabled.
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700962func (z *ZipWriter) writeDirectory(dir string, src string, emulateJar bool) error {
Jeff Gaston2d174132017-08-15 18:05:56 -0700963 // clean the input
Colin Crosse5580972017-08-30 17:40:21 -0700964 dir = filepath.Clean(dir)
Jeff Gaston2d174132017-08-15 18:05:56 -0700965
966 // discover any uncreated directories in the path
Sasha Smundak8eedba62020-11-16 19:00:27 -0800967 var zipDirs []string
Colin Crosse5580972017-08-30 17:40:21 -0700968 for dir != "" && dir != "." {
969 if _, exists := z.createdDirs[dir]; exists {
970 break
971 }
Jeff Gaston2d174132017-08-15 18:05:56 -0700972
Colin Crosse5580972017-08-30 17:40:21 -0700973 if prev, exists := z.createdFiles[dir]; exists {
974 return fmt.Errorf("destination %q is both a directory %q and a file %q", dir, src, prev)
975 }
976
977 z.createdDirs[dir] = src
Jeff Gaston2d174132017-08-15 18:05:56 -0700978 // parent directories precede their children
Colin Crosse5580972017-08-30 17:40:21 -0700979 zipDirs = append([]string{dir}, zipDirs...)
Jeff Gaston2d174132017-08-15 18:05:56 -0700980
Colin Crosse5580972017-08-30 17:40:21 -0700981 dir = filepath.Dir(dir)
Dan Willemsena59a3bc2016-08-03 17:47:23 -0700982 }
983
Colin Crosse5580972017-08-30 17:40:21 -0700984 if z.directories {
985 // make a directory entry for each uncreated directory
986 for _, cleanDir := range zipDirs {
Colin Cross635acc92017-09-12 22:50:46 -0700987 var dirHeader *zip.FileHeader
Colin Crosse19c7932015-04-24 15:08:38 -0700988
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700989 if emulateJar && cleanDir+"/" == jar.MetaDir {
Colin Cross635acc92017-09-12 22:50:46 -0700990 dirHeader = jar.MetaDirFileHeader()
991 } else {
992 dirHeader = &zip.FileHeader{
993 Name: cleanDir + "/",
994 }
995 dirHeader.SetMode(0700 | os.ModeDir)
Colin Crosse5580972017-08-30 17:40:21 -0700996 }
Jeff Gaston8edbb3a2017-08-22 20:05:28 -0700997
Colin Cross635acc92017-09-12 22:50:46 -0700998 dirHeader.SetModTime(z.time)
999
Colin Crosse5580972017-08-30 17:40:21 -07001000 ze := make(chan *zipEntry, 1)
1001 ze <- &zipEntry{
1002 fh: dirHeader,
1003 }
1004 close(ze)
1005 z.writeOps <- ze
Colin Crosse19c7932015-04-24 15:08:38 -07001006 }
Colin Crosse19c7932015-04-24 15:08:38 -07001007 }
1008
1009 return nil
1010}
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001011
Jeff Gastonc3bdc972017-10-12 12:18:19 -07001012func (z *ZipWriter) writeSymlink(rel, file string) error {
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001013 fileHeader := &zip.FileHeader{
1014 Name: rel,
1015 }
1016 fileHeader.SetModTime(z.time)
Colin Cross297d9bc2018-06-22 16:37:47 -07001017 fileHeader.SetMode(0777 | os.ModeSymlink)
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001018
Colin Cross05518bc2018-09-27 15:06:19 -07001019 dest, err := z.fs.Readlink(file)
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001020 if err != nil {
1021 return err
1022 }
1023
Colin Cross297d9bc2018-06-22 16:37:47 -07001024 fileHeader.UncompressedSize64 = uint64(len(dest))
1025 fileHeader.CRC32 = crc32.ChecksumIEEE([]byte(dest))
1026
Dan Willemsen017d8932016-08-04 15:43:03 -07001027 ze := make(chan *zipEntry, 1)
1028 futureReaders := make(chan chan io.Reader, 1)
1029 futureReader := make(chan io.Reader, 1)
1030 futureReaders <- futureReader
1031 close(futureReaders)
1032 futureReader <- bytes.NewBufferString(dest)
1033 close(futureReader)
1034
Dan Willemsen017d8932016-08-04 15:43:03 -07001035 ze <- &zipEntry{
1036 fh: fileHeader,
1037 futureReaders: futureReaders,
1038 }
1039 close(ze)
1040 z.writeOps <- ze
1041
1042 return nil
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001043}