blob: f7313291c462b5ffd4cd8b2fefbc4fdc9f2f8e6c [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)
Colin Crosscaf4d4c2021-02-03 15:15:14 -0800175 for i := range arg.SourceFiles {
176 arg.SourceFiles[i] = pathtools.MatchEscape(arg.SourceFiles[i])
177 }
Colin Cross053fca12020-08-19 13:51:47 -0700178 b.fileArgs = append(b.fileArgs, arg)
179 return b
180}
181
Colin Crossfe945b42018-09-27 15:00:07 -0700182func (b *FileArgsBuilder) Error() error {
183 if b == nil {
184 return nil
185 }
186 return b.err
187}
188
189func (b *FileArgsBuilder) FileArgs() []FileArg {
190 if b == nil {
191 return nil
192 }
193 return b.fileArgs
194}
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700195
Colin Cross1d98ee22018-09-18 17:05:15 -0700196type IncorrectRelativeRootError struct {
197 RelativeRoot string
198 Path string
199}
200
201func (x IncorrectRelativeRootError) Error() string {
202 return fmt.Sprintf("path %q is outside relative root %q", x.Path, x.RelativeRoot)
203}
204
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700205type ZipWriter struct {
Colin Crosse5580972017-08-30 17:40:21 -0700206 time time.Time
207 createdFiles map[string]string
208 createdDirs map[string]string
209 directories bool
Colin Crosse19c7932015-04-24 15:08:38 -0700210
Dan Willemsen017d8932016-08-04 15:43:03 -0700211 errors chan error
212 writeOps chan chan *zipEntry
213
Jeff Gaston175f34c2017-08-17 21:43:21 -0700214 cpuRateLimiter *CPURateLimiter
215 memoryRateLimiter *MemoryRateLimiter
Dan Willemsen017d8932016-08-04 15:43:03 -0700216
217 compressorPool sync.Pool
218 compLevel int
Colin Cross05518bc2018-09-27 15:06:19 -0700219
Colin Cross4be8f9e2018-09-28 15:16:48 -0700220 followSymlinks pathtools.ShouldFollowSymlinks
221 ignoreMissingFiles bool
Colin Cross09f11052018-09-21 15:12:39 -0700222
Colin Cross4be8f9e2018-09-28 15:16:48 -0700223 stderr io.Writer
224 fs pathtools.FileSystem
Dan Willemsen017d8932016-08-04 15:43:03 -0700225}
226
227type zipEntry struct {
228 fh *zip.FileHeader
229
230 // List of delayed io.Reader
231 futureReaders chan chan io.Reader
Jeff Gaston175f34c2017-08-17 21:43:21 -0700232
233 // Only used for passing into the MemoryRateLimiter to ensure we
234 // release as much memory as much as we request
235 allocatedSize int64
Colin Cross2fe66872015-03-30 17:20:39 -0700236}
237
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700238type ZipArgs struct {
Colin Crossfe945b42018-09-27 15:00:07 -0700239 FileArgs []FileArg
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700240 OutputFilePath string
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700241 EmulateJar bool
Colin Cross9cb51db2019-06-17 14:12:41 -0700242 SrcJar bool
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700243 AddDirectoryEntriesToZip bool
244 CompressionLevel int
245 ManifestSourcePath string
246 NumParallelJobs int
247 NonDeflatedFiles map[string]bool
Colin Crossf83c1502017-11-10 13:11:02 -0800248 WriteIfChanged bool
Colin Cross09f11052018-09-21 15:12:39 -0700249 StoreSymlinks bool
Colin Cross4be8f9e2018-09-28 15:16:48 -0700250 IgnoreMissingFiles bool
Colin Cross09f11052018-09-21 15:12:39 -0700251
Colin Cross4be8f9e2018-09-28 15:16:48 -0700252 Stderr io.Writer
Colin Cross09f11052018-09-21 15:12:39 -0700253 Filesystem pathtools.FileSystem
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700254}
Colin Cross2fe66872015-03-30 17:20:39 -0700255
Nan Zhang674dd932018-01-26 18:30:36 -0800256const NOQUOTE = '\x00'
257
258func ReadRespFile(bytes []byte) []string {
259 var args []string
260 var arg []rune
261
262 isEscaping := false
263 quotingStart := NOQUOTE
264 for _, c := range string(bytes) {
265 switch {
266 case isEscaping:
267 if quotingStart == '"' {
268 if !(c == '"' || c == '\\') {
269 // '\"' or '\\' will be escaped under double quoting.
270 arg = append(arg, '\\')
271 }
272 }
273 arg = append(arg, c)
274 isEscaping = false
275 case c == '\\' && quotingStart != '\'':
276 isEscaping = true
277 case quotingStart == NOQUOTE && (c == '\'' || c == '"'):
278 quotingStart = c
279 case quotingStart != NOQUOTE && c == quotingStart:
280 quotingStart = NOQUOTE
281 case quotingStart == NOQUOTE && unicode.IsSpace(c):
282 // Current character is a space outside quotes
283 if len(arg) != 0 {
284 args = append(args, string(arg))
285 }
286 arg = arg[:0]
287 default:
288 arg = append(arg, c)
289 }
290 }
291
292 if len(arg) != 0 {
293 args = append(args, string(arg))
294 }
295
296 return args
297}
298
Sasha Smundak8eedba62020-11-16 19:00:27 -0800299func zipTo(args ZipArgs, w io.Writer) error {
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700300 if args.EmulateJar {
301 args.AddDirectoryEntriesToZip = true
Jeff Gaston8edbb3a2017-08-22 20:05:28 -0700302 }
303
Colin Cross09f11052018-09-21 15:12:39 -0700304 // Have Glob follow symlinks if they are not being stored as symlinks in the zip file.
305 followSymlinks := pathtools.ShouldFollowSymlinks(!args.StoreSymlinks)
306
Colin Cross05518bc2018-09-27 15:06:19 -0700307 z := &ZipWriter{
Colin Cross4be8f9e2018-09-28 15:16:48 -0700308 time: jar.DefaultTime,
309 createdDirs: make(map[string]string),
310 createdFiles: make(map[string]string),
311 directories: args.AddDirectoryEntriesToZip,
312 compLevel: args.CompressionLevel,
313 followSymlinks: followSymlinks,
314 ignoreMissingFiles: args.IgnoreMissingFiles,
315 stderr: args.Stderr,
316 fs: args.Filesystem,
Colin Cross2fe66872015-03-30 17:20:39 -0700317 }
Colin Cross05518bc2018-09-27 15:06:19 -0700318
319 if z.fs == nil {
320 z.fs = pathtools.OsFs
321 }
322
Colin Cross4be8f9e2018-09-28 15:16:48 -0700323 if z.stderr == nil {
324 z.stderr = os.Stderr
325 }
326
Nan Zhang9067b042017-03-17 14:04:43 -0700327 pathMappings := []pathMapping{}
Nan Zhang9067b042017-03-17 14:04:43 -0700328
Colin Crossd3216292018-09-14 15:06:31 -0700329 noCompression := args.CompressionLevel == 0
330
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700331 for _, fa := range args.FileArgs {
Colin Cross1d98ee22018-09-18 17:05:15 -0700332 var srcs []string
333 for _, s := range fa.SourceFiles {
334 s = strings.TrimSpace(s)
335 if s == "" {
336 continue
337 }
338
Colin Cross09f11052018-09-21 15:12:39 -0700339 globbed, _, err := z.fs.Glob(s, nil, followSymlinks)
Colin Cross1d98ee22018-09-18 17:05:15 -0700340 if err != nil {
341 return err
342 }
343 if len(globbed) == 0 {
Colin Cross4be8f9e2018-09-28 15:16:48 -0700344 err := &os.PathError{
345 Op: "lstat",
Colin Cross1d98ee22018-09-18 17:05:15 -0700346 Path: s,
347 Err: os.ErrNotExist,
348 }
Colin Cross4be8f9e2018-09-28 15:16:48 -0700349 if args.IgnoreMissingFiles {
Dan Willemsenedc934c2018-12-27 12:41:25 -0800350 fmt.Fprintln(z.stderr, "warning:", err)
Colin Cross4be8f9e2018-09-28 15:16:48 -0700351 } else {
352 return err
353 }
Colin Cross1d98ee22018-09-18 17:05:15 -0700354 }
355 srcs = append(srcs, globbed...)
356 }
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700357 if fa.GlobDir != "" {
Colin Cross1d98ee22018-09-18 17:05:15 -0700358 if exists, isDir, err := z.fs.Exists(fa.GlobDir); err != nil {
359 return err
Colin Cross4be8f9e2018-09-28 15:16:48 -0700360 } else if !exists && !args.IgnoreMissingFiles {
361 err := &os.PathError{
362 Op: "lstat",
Colin Cross1d98ee22018-09-18 17:05:15 -0700363 Path: fa.GlobDir,
364 Err: os.ErrNotExist,
365 }
Colin Cross4be8f9e2018-09-28 15:16:48 -0700366 if args.IgnoreMissingFiles {
Dan Willemsenedc934c2018-12-27 12:41:25 -0800367 fmt.Fprintln(z.stderr, "warning:", err)
Colin Cross4be8f9e2018-09-28 15:16:48 -0700368 } else {
369 return err
370 }
371 } else if !isDir && !args.IgnoreMissingFiles {
372 err := &os.PathError{
373 Op: "lstat",
Colin Cross1d98ee22018-09-18 17:05:15 -0700374 Path: fa.GlobDir,
375 Err: syscall.ENOTDIR,
376 }
Colin Cross4be8f9e2018-09-28 15:16:48 -0700377 if args.IgnoreMissingFiles {
Dan Willemsenedc934c2018-12-27 12:41:25 -0800378 fmt.Fprintln(z.stderr, "warning:", err)
Colin Cross4be8f9e2018-09-28 15:16:48 -0700379 } else {
380 return err
381 }
Colin Cross1d98ee22018-09-18 17:05:15 -0700382 }
Colin Cross09f11052018-09-21 15:12:39 -0700383 globbed, _, err := z.fs.Glob(filepath.Join(fa.GlobDir, "**/*"), nil, followSymlinks)
Colin Cross1d98ee22018-09-18 17:05:15 -0700384 if err != nil {
385 return err
386 }
387 srcs = append(srcs, globbed...)
Colin Cross7b10cf12017-08-30 14:12:21 -0700388 }
389 for _, src := range srcs {
Colin Crossb7c69112018-09-18 16:51:43 -0700390 err := fillPathPairs(fa, src, &pathMappings, args.NonDeflatedFiles, noCompression)
Colin Crossd3216292018-09-14 15:06:31 -0700391 if err != nil {
Colin Cross05518bc2018-09-27 15:06:19 -0700392 return err
Nan Zhang9067b042017-03-17 14:04:43 -0700393 }
394 }
395 }
396
Colin Cross9cb51db2019-06-17 14:12:41 -0700397 return z.write(w, pathMappings, args.ManifestSourcePath, args.EmulateJar, args.SrcJar, args.NumParallelJobs)
Colin Cross05518bc2018-09-27 15:06:19 -0700398}
399
Sasha Smundak8eedba62020-11-16 19:00:27 -0800400// Zip creates an output zip archive from given sources.
Colin Cross05518bc2018-09-27 15:06:19 -0700401func Zip(args ZipArgs) error {
402 if args.OutputFilePath == "" {
403 return fmt.Errorf("output file path must be nonempty")
404 }
405
Colin Crossf83c1502017-11-10 13:11:02 -0800406 buf := &bytes.Buffer{}
407 var out io.Writer = buf
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700408
Colin Crossf83c1502017-11-10 13:11:02 -0800409 if !args.WriteIfChanged {
410 f, err := os.Create(args.OutputFilePath)
411 if err != nil {
412 return err
413 }
414
415 defer f.Close()
416 defer func() {
417 if err != nil {
418 os.Remove(args.OutputFilePath)
419 }
420 }()
421
422 out = f
423 }
424
Sasha Smundak8eedba62020-11-16 19:00:27 -0800425 err := zipTo(args, out)
Colin Crossf83c1502017-11-10 13:11:02 -0800426 if err != nil {
427 return err
428 }
429
430 if args.WriteIfChanged {
431 err := pathtools.WriteFileIfChanged(args.OutputFilePath, buf.Bytes(), 0666)
432 if err != nil {
433 return err
434 }
435 }
436
437 return nil
Colin Cross2fe66872015-03-30 17:20:39 -0700438}
439
Colin Crossb7c69112018-09-18 16:51:43 -0700440func fillPathPairs(fa FileArg, src string, pathMappings *[]pathMapping,
Colin Crossd3216292018-09-14 15:06:31 -0700441 nonDeflatedFiles map[string]bool, noCompression bool) error {
442
Colin Crossb7c69112018-09-18 16:51:43 -0700443 var dest string
444
445 if fa.JunkPaths {
446 dest = filepath.Base(src)
447 } else {
448 var err error
449 dest, err = filepath.Rel(fa.SourcePrefixToStrip, src)
450 if err != nil {
451 return err
452 }
Colin Cross1d98ee22018-09-18 17:05:15 -0700453 if strings.HasPrefix(dest, "../") {
454 return IncorrectRelativeRootError{
455 Path: src,
456 RelativeRoot: fa.SourcePrefixToStrip,
457 }
458 }
Nan Zhang9067b042017-03-17 14:04:43 -0700459 }
Colin Crossb7c69112018-09-18 16:51:43 -0700460 dest = filepath.Join(fa.PathPrefixInZip, dest)
Nan Zhang9067b042017-03-17 14:04:43 -0700461
Nan Zhangf281bd82017-04-25 16:47:45 -0700462 zipMethod := zip.Deflate
Colin Crossd3216292018-09-14 15:06:31 -0700463 if _, found := nonDeflatedFiles[dest]; found || noCompression {
Nan Zhangf281bd82017-04-25 16:47:45 -0700464 zipMethod = zip.Store
465 }
466 *pathMappings = append(*pathMappings,
467 pathMapping{dest: dest, src: src, zipMethod: zipMethod})
Nan Zhang9067b042017-03-17 14:04:43 -0700468
469 return nil
470}
471
Jeff Gastona2976952017-08-22 17:51:25 -0700472func jarSort(mappings []pathMapping) {
Sasha Smundak8eedba62020-11-16 19:00:27 -0800473 sort.SliceStable(mappings, func(i int, j int) bool {
Jeff Gastona2976952017-08-22 17:51:25 -0700474 return jar.EntryNamesLess(mappings[i].dest, mappings[j].dest)
Sasha Smundak8eedba62020-11-16 19:00:27 -0800475 })
Jeff Gastona2976952017-08-22 17:51:25 -0700476}
477
Colin Cross9cb51db2019-06-17 14:12:41 -0700478func (z *ZipWriter) write(f io.Writer, pathMappings []pathMapping, manifest string, emulateJar, srcJar bool,
479 parallelJobs int) error {
480
Dan Willemsen017d8932016-08-04 15:43:03 -0700481 z.errors = make(chan error)
482 defer close(z.errors)
Colin Cross2fe66872015-03-30 17:20:39 -0700483
Dan Willemsen017d8932016-08-04 15:43:03 -0700484 // This channel size can be essentially unlimited -- it's used as a fifo
485 // queue decouple the CPU and IO loads. Directories don't require any
486 // compression time, but still cost some IO. Similar with small files that
487 // can be very fast to compress. Some files that are more difficult to
488 // compress won't take a corresponding longer time writing out.
489 //
490 // The optimum size here depends on your CPU and IO characteristics, and
491 // the the layout of your zip file. 1000 was chosen mostly at random as
492 // something that worked reasonably well for a test file.
493 //
494 // The RateLimit object will put the upper bounds on the number of
495 // parallel compressions and outstanding buffers.
496 z.writeOps = make(chan chan *zipEntry, 1000)
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700497 z.cpuRateLimiter = NewCPURateLimiter(int64(parallelJobs))
Jeff Gaston175f34c2017-08-17 21:43:21 -0700498 z.memoryRateLimiter = NewMemoryRateLimiter(0)
499 defer func() {
500 z.cpuRateLimiter.Stop()
501 z.memoryRateLimiter.Stop()
502 }()
Jeff Gastona2976952017-08-22 17:51:25 -0700503
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700504 if manifest != "" && !emulateJar {
Colin Cross635acc92017-09-12 22:50:46 -0700505 return errors.New("must specify --jar when specifying a manifest via -m")
Jeff Gastona2976952017-08-22 17:51:25 -0700506 }
507
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700508 if emulateJar {
Colin Cross635acc92017-09-12 22:50:46 -0700509 // manifest may be empty, in which case addManifest will fill in a default
510 pathMappings = append(pathMappings, pathMapping{jar.ManifestFile, manifest, zip.Deflate})
511
Jeff Gastona2976952017-08-22 17:51:25 -0700512 jarSort(pathMappings)
513 }
514
Dan Willemsen017d8932016-08-04 15:43:03 -0700515 go func() {
516 var err error
517 defer close(z.writeOps)
518
Nan Zhang9067b042017-03-17 14:04:43 -0700519 for _, ele := range pathMappings {
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700520 if emulateJar && ele.dest == jar.ManifestFile {
Jeff Gastoncef50b92017-08-23 15:41:35 -0700521 err = z.addManifest(ele.dest, ele.src, ele.zipMethod)
522 } else {
Colin Cross9cb51db2019-06-17 14:12:41 -0700523 err = z.addFile(ele.dest, ele.src, ele.zipMethod, emulateJar, srcJar)
Jeff Gastoncef50b92017-08-23 15:41:35 -0700524 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700525 if err != nil {
526 z.errors <- err
527 return
528 }
529 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700530 }()
531
532 zipw := zip.NewWriter(f)
533
534 var currentWriteOpChan chan *zipEntry
535 var currentWriter io.WriteCloser
536 var currentReaders chan chan io.Reader
537 var currentReader chan io.Reader
538 var done bool
539
540 for !done {
541 var writeOpsChan chan chan *zipEntry
542 var writeOpChan chan *zipEntry
543 var readersChan chan chan io.Reader
544
545 if currentReader != nil {
546 // Only read and process errors
547 } else if currentReaders != nil {
548 readersChan = currentReaders
549 } else if currentWriteOpChan != nil {
550 writeOpChan = currentWriteOpChan
551 } else {
552 writeOpsChan = z.writeOps
553 }
554
555 select {
556 case writeOp, ok := <-writeOpsChan:
557 if !ok {
558 done = true
559 }
560
561 currentWriteOpChan = writeOp
562
563 case op := <-writeOpChan:
564 currentWriteOpChan = nil
565
Colin Crossf83c1502017-11-10 13:11:02 -0800566 var err error
Dan Willemsen017d8932016-08-04 15:43:03 -0700567 if op.fh.Method == zip.Deflate {
568 currentWriter, err = zipw.CreateCompressedHeader(op.fh)
569 } else {
570 var zw io.Writer
Jeff Gastonc5eb66d2017-08-24 14:11:27 -0700571
572 op.fh.CompressedSize64 = op.fh.UncompressedSize64
573
574 zw, err = zipw.CreateHeaderAndroid(op.fh)
Dan Willemsen017d8932016-08-04 15:43:03 -0700575 currentWriter = nopCloser{zw}
576 }
577 if err != nil {
578 return err
579 }
580
581 currentReaders = op.futureReaders
582 if op.futureReaders == nil {
583 currentWriter.Close()
584 currentWriter = nil
585 }
Jeff Gaston175f34c2017-08-17 21:43:21 -0700586 z.memoryRateLimiter.Finish(op.allocatedSize)
Dan Willemsen017d8932016-08-04 15:43:03 -0700587
588 case futureReader, ok := <-readersChan:
589 if !ok {
590 // Done with reading
591 currentWriter.Close()
592 currentWriter = nil
593 currentReaders = nil
594 }
595
596 currentReader = futureReader
597
598 case reader := <-currentReader:
Colin Crossf83c1502017-11-10 13:11:02 -0800599 _, err := io.Copy(currentWriter, reader)
Dan Willemsen017d8932016-08-04 15:43:03 -0700600 if err != nil {
601 return err
602 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700603
604 currentReader = nil
605
Colin Crossf83c1502017-11-10 13:11:02 -0800606 case err := <-z.errors:
Colin Cross2fe66872015-03-30 17:20:39 -0700607 return err
608 }
609 }
610
Dan Willemsen017d8932016-08-04 15:43:03 -0700611 // One last chance to catch an error
612 select {
Colin Crossf83c1502017-11-10 13:11:02 -0800613 case err := <-z.errors:
Dan Willemsen017d8932016-08-04 15:43:03 -0700614 return err
615 default:
616 zipw.Close()
617 return nil
Colin Cross2fe66872015-03-30 17:20:39 -0700618 }
Colin Cross2fe66872015-03-30 17:20:39 -0700619}
620
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700621// imports (possibly with compression) <src> into the zip at sub-path <dest>
Colin Cross9cb51db2019-06-17 14:12:41 -0700622func (z *ZipWriter) addFile(dest, src string, method uint16, emulateJar, srcJar bool) error {
Dan Willemsen017d8932016-08-04 15:43:03 -0700623 var fileSize int64
Dan Willemsen10462b32017-03-15 19:02:51 -0700624 var executable bool
Dan Willemsen017d8932016-08-04 15:43:03 -0700625
Colin Cross09f11052018-09-21 15:12:39 -0700626 var s os.FileInfo
627 var err error
628 if z.followSymlinks {
629 s, err = z.fs.Stat(src)
630 } else {
631 s, err = z.fs.Lstat(src)
632 }
633
634 if err != nil {
Colin Cross4be8f9e2018-09-28 15:16:48 -0700635 if os.IsNotExist(err) && z.ignoreMissingFiles {
636 fmt.Fprintln(z.stderr, "warning:", err)
637 return nil
638 }
Dan Willemsena59a3bc2016-08-03 17:47:23 -0700639 return err
Colin Cross9cb51db2019-06-17 14:12:41 -0700640 }
641
642 createParentDirs := func(dest, src string) error {
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700643 if err := z.writeDirectory(filepath.Dir(dest), src, emulateJar); err != nil {
Colin Crosse5580972017-08-30 17:40:21 -0700644 return err
645 }
646
647 if prev, exists := z.createdDirs[dest]; exists {
648 return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src)
649 }
650 if prev, exists := z.createdFiles[dest]; exists {
651 return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src)
652 }
653
654 z.createdFiles[dest] = src
655
Colin Cross9cb51db2019-06-17 14:12:41 -0700656 return nil
657 }
658
659 if s.IsDir() {
660 if z.directories {
661 return z.writeDirectory(dest, src, emulateJar)
662 }
663 return nil
664 } else if s.Mode()&os.ModeSymlink != 0 {
665 err = createParentDirs(dest, src)
666 if err != nil {
667 return err
668 }
669
670 return z.writeSymlink(dest, src)
671 } else if s.Mode().IsRegular() {
672 r, err := z.fs.Open(src)
673 if err != nil {
674 return err
675 }
676
677 if srcJar && filepath.Ext(src) == ".java" {
678 // rewrite the destination using the package path if it can be determined
679 pkg, err := jar.JavaPackage(r, src)
680 if err != nil {
681 // ignore errors for now, leaving the file at in its original location in the zip
682 } else {
683 dest = filepath.Join(filepath.Join(strings.Split(pkg, ".")...), filepath.Base(src))
684 }
685
686 _, err = r.Seek(0, io.SeekStart)
687 if err != nil {
688 return err
689 }
Colin Crosse5580972017-08-30 17:40:21 -0700690 }
691
Dan Willemsen017d8932016-08-04 15:43:03 -0700692 fileSize = s.Size()
Dan Willemsen10462b32017-03-15 19:02:51 -0700693 executable = s.Mode()&0100 != 0
Colin Cross957cc4e2015-04-24 15:10:32 -0700694
Colin Cross9cb51db2019-06-17 14:12:41 -0700695 header := &zip.FileHeader{
696 Name: dest,
697 Method: method,
698 UncompressedSize64: uint64(fileSize),
699 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700700
Colin Cross9cb51db2019-06-17 14:12:41 -0700701 if executable {
702 header.SetMode(0700)
703 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700704
Colin Cross9cb51db2019-06-17 14:12:41 -0700705 err = createParentDirs(dest, src)
706 if err != nil {
707 return err
708 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700709
Colin Cross9cb51db2019-06-17 14:12:41 -0700710 return z.writeFileContents(header, r)
711 } else {
712 return fmt.Errorf("%s is not a file, directory, or symlink", src)
713 }
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700714}
715
Sasha Smundak8eedba62020-11-16 19:00:27 -0800716func (z *ZipWriter) addManifest(dest string, src string, _ uint16) error {
Colin Crosse5580972017-08-30 17:40:21 -0700717 if prev, exists := z.createdDirs[dest]; exists {
718 return fmt.Errorf("destination %q is both a directory %q and a file %q", dest, prev, src)
719 }
720 if prev, exists := z.createdFiles[dest]; exists {
721 return fmt.Errorf("destination %q has two files %q and %q", dest, prev, src)
722 }
723
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700724 if err := z.writeDirectory(filepath.Dir(dest), src, true); err != nil {
Colin Cross635acc92017-09-12 22:50:46 -0700725 return err
Jeff Gastoncef50b92017-08-23 15:41:35 -0700726 }
727
Colin Cross05518bc2018-09-27 15:06:19 -0700728 var contents []byte
729 if src != "" {
730 f, err := z.fs.Open(src)
731 if err != nil {
732 return err
733 }
734
735 contents, err = ioutil.ReadAll(f)
736 f.Close()
737 if err != nil {
738 return err
739 }
740 }
741
742 fh, buf, err := jar.ManifestFileContents(contents)
Colin Cross635acc92017-09-12 22:50:46 -0700743 if err != nil {
744 return err
Jeff Gastoncef50b92017-08-23 15:41:35 -0700745 }
746
Colin Cross635acc92017-09-12 22:50:46 -0700747 reader := &byteReaderCloser{bytes.NewReader(buf), ioutil.NopCloser(nil)}
748
749 return z.writeFileContents(fh, reader)
Jeff Gastoncef50b92017-08-23 15:41:35 -0700750}
751
Colin Cross05518bc2018-09-27 15:06:19 -0700752func (z *ZipWriter) writeFileContents(header *zip.FileHeader, r pathtools.ReaderAtSeekerCloser) (err error) {
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700753
754 header.SetModTime(z.time)
755
Dan Willemsen017d8932016-08-04 15:43:03 -0700756 compressChan := make(chan *zipEntry, 1)
757 z.writeOps <- compressChan
758
759 // Pre-fill a zipEntry, it will be sent in the compressChan once
760 // we're sure about the Method and CRC.
761 ze := &zipEntry{
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700762 fh: header,
Dan Willemsen10462b32017-03-15 19:02:51 -0700763 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700764
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700765 ze.allocatedSize = int64(header.UncompressedSize64)
Jeff Gaston175f34c2017-08-17 21:43:21 -0700766 z.cpuRateLimiter.Request()
767 z.memoryRateLimiter.Request(ze.allocatedSize)
Dan Willemsen017d8932016-08-04 15:43:03 -0700768
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700769 fileSize := int64(header.UncompressedSize64)
770 if fileSize == 0 {
771 fileSize = int64(header.UncompressedSize)
772 }
773
774 if header.Method == zip.Deflate && fileSize >= minParallelFileSize {
Dan Willemsen017d8932016-08-04 15:43:03 -0700775 wg := new(sync.WaitGroup)
776
777 // Allocate enough buffer to hold all readers. We'll limit
778 // this based on actual buffer sizes in RateLimit.
779 ze.futureReaders = make(chan chan io.Reader, (fileSize/parallelBlockSize)+1)
780
781 // Calculate the CRC in the background, since reading the entire
782 // file could take a while.
783 //
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700784 // We could split this up into chunks as well, but it's faster
Dan Willemsen017d8932016-08-04 15:43:03 -0700785 // than the compression. Due to the Go Zip API, we also need to
786 // know the result before we can begin writing the compressed
787 // data out to the zipfile.
788 wg.Add(1)
Jeff Gaston175f34c2017-08-17 21:43:21 -0700789 go z.crcFile(r, ze, compressChan, wg)
Dan Willemsen017d8932016-08-04 15:43:03 -0700790
791 for start := int64(0); start < fileSize; start += parallelBlockSize {
792 sr := io.NewSectionReader(r, start, parallelBlockSize)
793 resultChan := make(chan io.Reader, 1)
794 ze.futureReaders <- resultChan
795
Jeff Gaston175f34c2017-08-17 21:43:21 -0700796 z.cpuRateLimiter.Request()
Dan Willemsen017d8932016-08-04 15:43:03 -0700797
798 last := !(start+parallelBlockSize < fileSize)
799 var dict []byte
800 if start >= windowSize {
801 dict, err = ioutil.ReadAll(io.NewSectionReader(r, start-windowSize, windowSize))
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700802 if err != nil {
803 return err
804 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700805 }
806
807 wg.Add(1)
Jeff Gaston175f34c2017-08-17 21:43:21 -0700808 go z.compressPartialFile(sr, dict, last, resultChan, wg)
Dan Willemsen017d8932016-08-04 15:43:03 -0700809 }
810
811 close(ze.futureReaders)
812
813 // Close the file handle after all readers are done
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700814 go func(wg *sync.WaitGroup, closer io.Closer) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700815 wg.Wait()
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700816 closer.Close()
Dan Willemsen017d8932016-08-04 15:43:03 -0700817 }(wg, r)
818 } else {
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700819 go func() {
820 z.compressWholeFile(ze, r, compressChan)
821 r.Close()
822 }()
Dan Willemsen017d8932016-08-04 15:43:03 -0700823 }
824
825 return nil
826}
827
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700828func (z *ZipWriter) crcFile(r io.Reader, ze *zipEntry, resultChan chan *zipEntry, wg *sync.WaitGroup) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700829 defer wg.Done()
Jeff Gaston175f34c2017-08-17 21:43:21 -0700830 defer z.cpuRateLimiter.Finish()
Dan Willemsen017d8932016-08-04 15:43:03 -0700831
832 crc := crc32.NewIEEE()
833 _, err := io.Copy(crc, r)
834 if err != nil {
835 z.errors <- err
836 return
837 }
838
839 ze.fh.CRC32 = crc.Sum32()
840 resultChan <- ze
841 close(resultChan)
842}
843
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700844func (z *ZipWriter) compressPartialFile(r io.Reader, dict []byte, last bool, resultChan chan io.Reader, wg *sync.WaitGroup) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700845 defer wg.Done()
846
847 result, err := z.compressBlock(r, dict, last)
848 if err != nil {
849 z.errors <- err
850 return
851 }
852
Jeff Gaston175f34c2017-08-17 21:43:21 -0700853 z.cpuRateLimiter.Finish()
854
Dan Willemsen017d8932016-08-04 15:43:03 -0700855 resultChan <- result
856}
857
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700858func (z *ZipWriter) compressBlock(r io.Reader, dict []byte, last bool) (*bytes.Buffer, error) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700859 buf := new(bytes.Buffer)
860 var fw *flate.Writer
861 var err error
862 if len(dict) > 0 {
863 // There's no way to Reset a Writer with a new dictionary, so
864 // don't use the Pool
865 fw, err = flate.NewWriterDict(buf, z.compLevel, dict)
866 } else {
867 var ok bool
868 if fw, ok = z.compressorPool.Get().(*flate.Writer); ok {
869 fw.Reset(buf)
870 } else {
871 fw, err = flate.NewWriter(buf, z.compLevel)
872 }
873 defer z.compressorPool.Put(fw)
874 }
875 if err != nil {
876 return nil, err
877 }
878
879 _, err = io.Copy(fw, r)
880 if err != nil {
881 return nil, err
882 }
883 if last {
884 fw.Close()
885 } else {
886 fw.Flush()
887 }
888
889 return buf, nil
890}
891
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700892func (z *ZipWriter) compressWholeFile(ze *zipEntry, r io.ReadSeeker, compressChan chan *zipEntry) {
Dan Willemsen017d8932016-08-04 15:43:03 -0700893
Dan Willemsen017d8932016-08-04 15:43:03 -0700894 crc := crc32.NewIEEE()
Dan Willemsena8b55022017-03-15 21:49:26 -0700895 _, err := io.Copy(crc, r)
Colin Cross2fe66872015-03-30 17:20:39 -0700896 if err != nil {
Dan Willemsen017d8932016-08-04 15:43:03 -0700897 z.errors <- err
898 return
Colin Cross2fe66872015-03-30 17:20:39 -0700899 }
900
Dan Willemsena8b55022017-03-15 21:49:26 -0700901 ze.fh.CRC32 = crc.Sum32()
Colin Cross2fe66872015-03-30 17:20:39 -0700902
Dan Willemsen017d8932016-08-04 15:43:03 -0700903 _, err = r.Seek(0, 0)
Colin Cross2fe66872015-03-30 17:20:39 -0700904 if err != nil {
Dan Willemsen017d8932016-08-04 15:43:03 -0700905 z.errors <- err
906 return
Colin Cross2fe66872015-03-30 17:20:39 -0700907 }
908
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700909 readFile := func(reader io.ReadSeeker) ([]byte, error) {
910 _, err := reader.Seek(0, 0)
Nan Zhangf281bd82017-04-25 16:47:45 -0700911 if err != nil {
912 return nil, err
913 }
914
Jeff Gaston66dd6e52017-08-23 15:12:48 -0700915 buf, err := ioutil.ReadAll(reader)
Nan Zhangf281bd82017-04-25 16:47:45 -0700916 if err != nil {
917 return nil, err
918 }
919
920 return buf, nil
921 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700922
Dan Willemsena8b55022017-03-15 21:49:26 -0700923 ze.futureReaders = make(chan chan io.Reader, 1)
Dan Willemsen017d8932016-08-04 15:43:03 -0700924 futureReader := make(chan io.Reader, 1)
925 ze.futureReaders <- futureReader
926 close(ze.futureReaders)
927
Nan Zhangf281bd82017-04-25 16:47:45 -0700928 if ze.fh.Method == zip.Deflate {
929 compressed, err := z.compressBlock(r, nil, true)
930 if err != nil {
931 z.errors <- err
932 return
933 }
934 if uint64(compressed.Len()) < ze.fh.UncompressedSize64 {
935 futureReader <- compressed
Nan Zhangf281bd82017-04-25 16:47:45 -0700936 } else {
937 buf, err := readFile(r)
938 if err != nil {
939 z.errors <- err
940 return
941 }
942 ze.fh.Method = zip.Store
943 futureReader <- bytes.NewReader(buf)
Nan Zhangf281bd82017-04-25 16:47:45 -0700944 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700945 } else {
Nan Zhangf281bd82017-04-25 16:47:45 -0700946 buf, err := readFile(r)
Dan Willemsen017d8932016-08-04 15:43:03 -0700947 if err != nil {
948 z.errors <- err
949 return
950 }
Dan Willemsen017d8932016-08-04 15:43:03 -0700951 ze.fh.Method = zip.Store
952 futureReader <- bytes.NewReader(buf)
Dan Willemsen017d8932016-08-04 15:43:03 -0700953 }
Nan Zhangf281bd82017-04-25 16:47:45 -0700954
Jeff Gaston175f34c2017-08-17 21:43:21 -0700955 z.cpuRateLimiter.Finish()
956
Dan Willemsen017d8932016-08-04 15:43:03 -0700957 close(futureReader)
958
959 compressChan <- ze
960 close(compressChan)
Colin Cross2fe66872015-03-30 17:20:39 -0700961}
Colin Crosse19c7932015-04-24 15:08:38 -0700962
Colin Crosse5580972017-08-30 17:40:21 -0700963// writeDirectory annotates that dir is a directory created for the src file or directory, and adds
964// the directory entry to the zip file if directories are enabled.
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700965func (z *ZipWriter) writeDirectory(dir string, src string, emulateJar bool) error {
Jeff Gaston2d174132017-08-15 18:05:56 -0700966 // clean the input
Colin Crosse5580972017-08-30 17:40:21 -0700967 dir = filepath.Clean(dir)
Jeff Gaston2d174132017-08-15 18:05:56 -0700968
969 // discover any uncreated directories in the path
Sasha Smundak8eedba62020-11-16 19:00:27 -0800970 var zipDirs []string
Colin Crosse5580972017-08-30 17:40:21 -0700971 for dir != "" && dir != "." {
972 if _, exists := z.createdDirs[dir]; exists {
973 break
974 }
Jeff Gaston2d174132017-08-15 18:05:56 -0700975
Colin Crosse5580972017-08-30 17:40:21 -0700976 if prev, exists := z.createdFiles[dir]; exists {
977 return fmt.Errorf("destination %q is both a directory %q and a file %q", dir, src, prev)
978 }
979
980 z.createdDirs[dir] = src
Jeff Gaston2d174132017-08-15 18:05:56 -0700981 // parent directories precede their children
Colin Crosse5580972017-08-30 17:40:21 -0700982 zipDirs = append([]string{dir}, zipDirs...)
Jeff Gaston2d174132017-08-15 18:05:56 -0700983
Colin Crosse5580972017-08-30 17:40:21 -0700984 dir = filepath.Dir(dir)
Dan Willemsena59a3bc2016-08-03 17:47:23 -0700985 }
986
Colin Crosse5580972017-08-30 17:40:21 -0700987 if z.directories {
988 // make a directory entry for each uncreated directory
989 for _, cleanDir := range zipDirs {
Colin Cross635acc92017-09-12 22:50:46 -0700990 var dirHeader *zip.FileHeader
Colin Crosse19c7932015-04-24 15:08:38 -0700991
Jeff Gastonc3bdc972017-10-12 12:18:19 -0700992 if emulateJar && cleanDir+"/" == jar.MetaDir {
Colin Cross635acc92017-09-12 22:50:46 -0700993 dirHeader = jar.MetaDirFileHeader()
994 } else {
995 dirHeader = &zip.FileHeader{
996 Name: cleanDir + "/",
997 }
998 dirHeader.SetMode(0700 | os.ModeDir)
Colin Crosse5580972017-08-30 17:40:21 -0700999 }
Jeff Gaston8edbb3a2017-08-22 20:05:28 -07001000
Colin Cross635acc92017-09-12 22:50:46 -07001001 dirHeader.SetModTime(z.time)
1002
Colin Crosse5580972017-08-30 17:40:21 -07001003 ze := make(chan *zipEntry, 1)
1004 ze <- &zipEntry{
1005 fh: dirHeader,
1006 }
1007 close(ze)
1008 z.writeOps <- ze
Colin Crosse19c7932015-04-24 15:08:38 -07001009 }
Colin Crosse19c7932015-04-24 15:08:38 -07001010 }
1011
1012 return nil
1013}
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001014
Jeff Gastonc3bdc972017-10-12 12:18:19 -07001015func (z *ZipWriter) writeSymlink(rel, file string) error {
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001016 fileHeader := &zip.FileHeader{
1017 Name: rel,
1018 }
1019 fileHeader.SetModTime(z.time)
Colin Cross297d9bc2018-06-22 16:37:47 -07001020 fileHeader.SetMode(0777 | os.ModeSymlink)
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001021
Colin Cross05518bc2018-09-27 15:06:19 -07001022 dest, err := z.fs.Readlink(file)
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001023 if err != nil {
1024 return err
1025 }
1026
Colin Cross297d9bc2018-06-22 16:37:47 -07001027 fileHeader.UncompressedSize64 = uint64(len(dest))
1028 fileHeader.CRC32 = crc32.ChecksumIEEE([]byte(dest))
1029
Dan Willemsen017d8932016-08-04 15:43:03 -07001030 ze := make(chan *zipEntry, 1)
1031 futureReaders := make(chan chan io.Reader, 1)
1032 futureReader := make(chan io.Reader, 1)
1033 futureReaders <- futureReader
1034 close(futureReaders)
1035 futureReader <- bytes.NewBufferString(dest)
1036 close(futureReader)
1037
Dan Willemsen017d8932016-08-04 15:43:03 -07001038 ze <- &zipEntry{
1039 fh: fileHeader,
1040 futureReaders: futureReaders,
1041 }
1042 close(ze)
1043 z.writeOps <- ze
1044
1045 return nil
Dan Willemsena59a3bc2016-08-03 17:47:23 -07001046}