|
1047
|
1 |
'From Smalltalk/X, Version:4.1.4 on 20-jun-2002 at 06:09:31 am' !
|
|
|
2 |
|
|
1044
|
3 |
"{ Package: 'ca:Compress' }"
|
|
|
4 |
|
|
1050
|
5 |
Stream subclass:#ZipStream
|
|
|
6 |
instanceVariableNames:'onStream hitEOF binary readPosition writePosition readLimit isReadOpen inputBytes outputBytes zstream'
|
|
1047
|
7 |
classVariableNames:'Z_FINISH Z_NO_FLUSH Z_SYNC_FLUSH Z_FULL_FLUSH Z_DEFLATED
|
|
|
8 |
Z_DEFAULT_COMPRESSION Z_DEFAULT_LEVEL Z_BEST_COMPRESSION
|
|
|
9 |
Z_DEF_MEM_LEVEL Z_DEFAULT_STRATEGY Z_FILTERED Z_HUFFMAN_ONLY
|
|
|
10 |
HEAD_OS_CODE HEAD_RESERVED HEAD_EXTRA_FIELD HEAD_ORIG_NAME
|
|
|
11 |
HEAD_COMMENT HEAD_CRC GZ_MAGIC_ID'
|
|
|
12 |
poolDictionaries:''
|
|
|
13 |
category:'A-Compress'
|
|
1044
|
14 |
!
|
|
|
15 |
|
|
1045
|
16 |
!ZipStream primitiveDefinitions!
|
|
|
17 |
%{
|
|
|
18 |
|
|
|
19 |
/*
|
|
|
20 |
* includes, defines, structure definitions
|
|
|
21 |
* and typedefs come here.
|
|
|
22 |
*/
|
|
|
23 |
|
|
|
24 |
#include "compress/zlib.h"
|
|
|
25 |
#include "compress/zutil.h"
|
|
|
26 |
|
|
|
27 |
typedef struct {
|
|
1047
|
28 |
z_stream stream;
|
|
|
29 |
Bytef * in_ref;
|
|
|
30 |
uLong in_total;
|
|
1045
|
31 |
|
|
1047
|
32 |
Bytef * out_ref;
|
|
|
33 |
uLong out_total;
|
|
1045
|
34 |
|
|
1047
|
35 |
uLong crc_32;
|
|
1045
|
36 |
} zstream_s;
|
|
|
37 |
|
|
|
38 |
%}
|
|
|
39 |
! !
|
|
|
40 |
|
|
|
41 |
|
|
|
42 |
!ZipStream class methodsFor:'initialization'!
|
|
|
43 |
|
|
|
44 |
initialize
|
|
|
45 |
|varZ_NO_FLUSH varZ_SYNC_FLUSH varZ_FULL_FLUSH varZ_FINISH varZ_DEFLATED
|
|
|
46 |
varZ_DEFAULT_COMPRESSION varZ_BEST_COMPRESSION varZ_DEF_MEM_LEVEL
|
|
|
47 |
varZ_DEFAULT_STRATEGY varZ_FILTERED varZ_HUFFMAN_ONLY
|
|
|
48 |
varHEAD_OS_CODE
|
|
|
49 |
|
|
|
|
50 |
%{
|
|
|
51 |
varZ_NO_FLUSH = __MKSMALLINT( Z_NO_FLUSH );
|
|
|
52 |
varZ_SYNC_FLUSH = __MKSMALLINT( Z_SYNC_FLUSH );
|
|
|
53 |
varZ_FULL_FLUSH = __MKSMALLINT( Z_FULL_FLUSH );
|
|
|
54 |
varZ_FINISH = __MKSMALLINT( Z_FINISH );
|
|
|
55 |
|
|
|
56 |
varZ_DEFLATED = __MKSMALLINT( Z_DEFLATED );
|
|
|
57 |
|
|
|
58 |
varZ_DEFAULT_COMPRESSION = __MKSMALLINT( Z_DEFAULT_COMPRESSION );
|
|
|
59 |
varZ_BEST_COMPRESSION = __MKSMALLINT( Z_BEST_COMPRESSION );
|
|
|
60 |
|
|
|
61 |
varZ_DEF_MEM_LEVEL = __MKSMALLINT( DEF_MEM_LEVEL );
|
|
|
62 |
|
|
|
63 |
varZ_DEFAULT_STRATEGY = __MKSMALLINT( Z_DEFAULT_STRATEGY );
|
|
|
64 |
varZ_FILTERED = __MKSMALLINT( Z_FILTERED );
|
|
|
65 |
varZ_HUFFMAN_ONLY = __MKSMALLINT( Z_HUFFMAN_ONLY );
|
|
|
66 |
varHEAD_OS_CODE = __MKSMALLINT( OS_CODE );
|
|
|
67 |
%}.
|
|
|
68 |
|
|
|
69 |
Z_NO_FLUSH := varZ_NO_FLUSH.
|
|
|
70 |
Z_SYNC_FLUSH := varZ_SYNC_FLUSH.
|
|
|
71 |
Z_FULL_FLUSH := varZ_FULL_FLUSH.
|
|
|
72 |
Z_FINISH := varZ_FINISH.
|
|
|
73 |
|
|
|
74 |
Z_DEFLATED := varZ_DEFLATED.
|
|
|
75 |
|
|
|
76 |
Z_DEFAULT_COMPRESSION := varZ_DEFAULT_COMPRESSION.
|
|
|
77 |
Z_DEFAULT_LEVEL := 6.
|
|
|
78 |
Z_BEST_COMPRESSION := varZ_BEST_COMPRESSION.
|
|
|
79 |
|
|
|
80 |
Z_DEF_MEM_LEVEL := varZ_DEF_MEM_LEVEL.
|
|
|
81 |
|
|
|
82 |
Z_DEFAULT_STRATEGY := varZ_DEFAULT_STRATEGY.
|
|
|
83 |
Z_FILTERED := varZ_FILTERED.
|
|
|
84 |
Z_HUFFMAN_ONLY := varZ_HUFFMAN_ONLY.
|
|
|
85 |
|
|
|
86 |
HEAD_OS_CODE := varHEAD_OS_CODE.
|
|
|
87 |
|
|
|
88 |
HEAD_RESERVED := 16rE0. " bits 5..7: reserved "
|
|
|
89 |
HEAD_EXTRA_FIELD := 16r04. " bit 2 set: extra field present "
|
|
|
90 |
HEAD_ORIG_NAME := 16r08. " bit 3 set: original file name present "
|
|
|
91 |
HEAD_COMMENT := 16r10. " bit 4 set: file comment present "
|
|
|
92 |
HEAD_CRC := 16r02. " bit 1 set: header CRC present "
|
|
|
93 |
|
|
|
94 |
GZ_MAGIC_ID := #[ 16r1f 16r8b ]
|
|
|
95 |
|
|
|
96 |
! !
|
|
|
97 |
|
|
|
98 |
!ZipStream class methodsFor:'instance creation'!
|
|
|
99 |
|
|
1046
|
100 |
readOpenOn:aStream
|
|
1050
|
101 |
^ self basicNew readOpenOn:aStream
|
|
1046
|
102 |
!
|
|
|
103 |
|
|
1045
|
104 |
writeOpenOn:aStream
|
|
|
105 |
^ self writeOpenOn:aStream level:Z_DEFAULT_LEVEL
|
|
1047
|
106 |
memLevel:Z_DEF_MEM_LEVEL
|
|
|
107 |
strategy:Z_DEFAULT_STRATEGY.
|
|
1045
|
108 |
!
|
|
|
109 |
|
|
|
110 |
writeOpenOn:aStream level:level memLevel:memLevel strategy:strategy
|
|
|
111 |
|z|
|
|
|
112 |
|
|
1050
|
113 |
z := self basicNew.
|
|
1045
|
114 |
z writeOpenOn:aStream level:level memLevel:memLevel strategy:strategy.
|
|
|
115 |
^ z
|
|
|
116 |
! !
|
|
|
117 |
|
|
|
118 |
!ZipStream class methodsFor:'test'!
|
|
|
119 |
|
|
|
120 |
test
|
|
|
121 |
"
|
|
|
122 |
ZipStream test
|
|
|
123 |
"
|
|
1050
|
124 |
|original compressed contents in out zip|
|
|
1045
|
125 |
|
|
1050
|
126 |
original := 'smalltalk.rc' asFilename contentsOfEntireFile.
|
|
1045
|
127 |
|
|
1050
|
128 |
in := original readStream.
|
|
1045
|
129 |
|
|
1050
|
130 |
[ |b|
|
|
|
131 |
out := #[] writeStream.
|
|
|
132 |
zip := self writeOpenOn:out.
|
|
1045
|
133 |
|
|
1050
|
134 |
[in atEnd] whileFalse:[
|
|
|
135 |
(b := in next) ifNotNil:[zip nextPut:b]
|
|
|
136 |
]
|
|
1046
|
137 |
] valueNowOrOnUnwindDo:[ zip ifNotNil:[ zip close ] ].
|
|
1045
|
138 |
|
|
1050
|
139 |
compressed := out contents.
|
|
|
140 |
[ |b|
|
|
|
141 |
zip := self readOpenOn:(compressed readStream).
|
|
|
142 |
out := '' writeStream.
|
|
|
143 |
|
|
|
144 |
[ (b := zip next) notNil ] whileTrue:[ out nextPut:b ]
|
|
1045
|
145 |
|
|
1050
|
146 |
] valueNowOrOnUnwindDo:[
|
|
|
147 |
zip ifNotNil:[ zip close ].
|
|
|
148 |
contents := out contents.
|
|
1045
|
149 |
|
|
1050
|
150 |
Transcript showCR:(contents size).
|
|
|
151 |
Transcript showCR:(compressed size).
|
|
|
152 |
].
|
|
|
153 |
|
|
|
154 |
original = contents ifFalse:[
|
|
1047
|
155 |
self halt:'contents differs'.
|
|
1046
|
156 |
^ self
|
|
|
157 |
].
|
|
|
158 |
Transcript showCR:'OK'.
|
|
1047
|
159 |
!
|
|
1045
|
160 |
|
|
1047
|
161 |
testFile
|
|
|
162 |
"
|
|
|
163 |
ZipStream testFile
|
|
|
164 |
"
|
|
|
165 |
|fileContents in zip out gzipCmd|
|
|
|
166 |
|
|
|
167 |
fileContents := 'smalltalk.rc' asFilename contentsOfEntireFile.
|
|
|
168 |
|
|
|
169 |
in := fileContents readStream.
|
|
|
170 |
out := FileStream newFileNamed:'YYY.gz'.
|
|
|
171 |
out ifNil:[ ^ self ].
|
|
|
172 |
|
|
|
173 |
[ zip := self writeOpenOn:out.
|
|
|
174 |
|
|
|
175 |
[in atEnd] whileFalse:[ |buf|
|
|
|
176 |
buf := in nextAvailable:512.
|
|
|
177 |
buf do:[:n|
|
|
|
178 |
zip nextPut:n
|
|
|
179 |
]
|
|
|
180 |
].
|
|
|
181 |
] valueNowOrOnUnwindDo:[
|
|
|
182 |
zip ifNotNil:[ zip close ].
|
|
|
183 |
out close.
|
|
|
184 |
].
|
|
|
185 |
gzipCmd := 'gzip -dc YYY.gz > YYY; diff YYY smalltalk.rc'.
|
|
|
186 |
|
|
|
187 |
Transcript showCR:gzipCmd.
|
|
|
188 |
gzipCmd printCR.
|
|
1045
|
189 |
! !
|
|
|
190 |
|
|
|
191 |
!ZipStream methodsFor:'accessing'!
|
|
|
192 |
|
|
|
193 |
binary
|
|
|
194 |
"switch to binary mode - default is text
|
|
|
195 |
"
|
|
|
196 |
binary := true.
|
|
|
197 |
!
|
|
|
198 |
|
|
|
199 |
text
|
|
|
200 |
"switch to text mode - default is text
|
|
|
201 |
"
|
|
|
202 |
binary := false.
|
|
|
203 |
! !
|
|
|
204 |
|
|
|
205 |
!ZipStream methodsFor:'error handling'!
|
|
|
206 |
|
|
|
207 |
errorNotOpen
|
|
|
208 |
self zerror:( self class name , ' not open' ).
|
|
|
209 |
!
|
|
|
210 |
|
|
|
211 |
invalidArgument
|
|
|
212 |
self zerror:( 'invalid argument' ).
|
|
|
213 |
!
|
|
|
214 |
|
|
|
215 |
pastEnd
|
|
|
216 |
self zerror:( 'end of stream' ).
|
|
|
217 |
!
|
|
|
218 |
|
|
1050
|
219 |
zasByte:aByteOrChar
|
|
|
220 |
%{
|
|
|
221 |
int _theByte;
|
|
|
222 |
|
|
|
223 |
if( __isCharacter(aByteOrChar) )
|
|
|
224 |
_theByte = __intVal(__characterVal(aByteOrChar)) & 0xFF;
|
|
|
225 |
else
|
|
|
226 |
_theByte = __intVal( aByteOrChar );
|
|
|
227 |
|
|
|
228 |
if( (_theByte < 0) || (_theByte > 255) )
|
|
|
229 |
goto bad;
|
|
|
230 |
else
|
|
|
231 |
goto bad;
|
|
|
232 |
|
|
|
233 |
RETURN( __MKSMALLINT(_theByte) );
|
|
|
234 |
bad:;
|
|
|
235 |
%}.
|
|
|
236 |
self invalidArgument
|
|
|
237 |
!
|
|
|
238 |
|
|
1045
|
239 |
zerror:anErrorOrNumber
|
|
|
240 |
|
|
|
241 |
onStream := nil.
|
|
|
242 |
|
|
|
243 |
self zclose.
|
|
|
244 |
self error:( 'error: ', anErrorOrNumber printString ).
|
|
|
245 |
! !
|
|
|
246 |
|
|
|
247 |
!ZipStream methodsFor:'low level'!
|
|
|
248 |
|
|
1050
|
249 |
zset_avail_in:count
|
|
1047
|
250 |
%{
|
|
|
251 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
252 |
|
|
1050
|
253 |
if( (_zstreamObj != nil) && __isSmallInteger(count) )
|
|
1047
|
254 |
{
|
|
1050
|
255 |
int _count;
|
|
|
256 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
1049
|
257 |
|
|
1050
|
258 |
if( (_count = __intVal( count )) > 0 )
|
|
|
259 |
{
|
|
|
260 |
Bytef * _in_ref = _zstream->in_ref;
|
|
1049
|
261 |
|
|
1050
|
262 |
_zstream->stream.avail_in = _count;
|
|
|
263 |
_zstream->stream.next_in = _in_ref;
|
|
|
264 |
_zstream->crc_32 = crc32( _zstream->crc_32, _in_ref, _count );
|
|
|
265 |
} else {
|
|
|
266 |
_zstream->stream.avail_in = 0;
|
|
|
267 |
_zstream->stream.next_in = Z_NULL;
|
|
1047
|
268 |
}
|
|
1050
|
269 |
RETURN( self );
|
|
1047
|
270 |
}
|
|
|
271 |
%}.
|
|
|
272 |
zstream ifNil:[ self errorNotOpen ].
|
|
|
273 |
self invalidArguments.
|
|
|
274 |
!
|
|
|
275 |
|
|
1045
|
276 |
zclose
|
|
|
277 |
|
|
|
278 |
onStream := nil.
|
|
|
279 |
hitEOF := true.
|
|
|
280 |
zstream ifNil:[^ self].
|
|
|
281 |
|
|
|
282 |
%{
|
|
|
283 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
284 |
|
|
|
285 |
if( _zstreamObj != nil )
|
|
|
286 |
{
|
|
1047
|
287 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
1045
|
288 |
|
|
1047
|
289 |
__INST(zstream) = nil;
|
|
1045
|
290 |
|
|
1047
|
291 |
if( _zstream->stream.state != NULL )
|
|
|
292 |
{
|
|
|
293 |
if( __INST(isReadOpen) == true )
|
|
|
294 |
inflateEnd( & _zstream->stream );
|
|
|
295 |
else
|
|
|
296 |
deflateEnd( & _zstream->stream );
|
|
|
297 |
}
|
|
|
298 |
free( _zstream );
|
|
1045
|
299 |
}
|
|
|
300 |
%}.
|
|
|
301 |
zstream := nil.
|
|
|
302 |
!
|
|
|
303 |
|
|
|
304 |
zdeflate:aLevel
|
|
|
305 |
|errorNo|
|
|
|
306 |
|
|
|
307 |
errorNo := nil.
|
|
|
308 |
|
|
|
309 |
%{
|
|
|
310 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
311 |
|
|
|
312 |
if( (_zstreamObj != nil) && (__isSmallInteger(aLevel)) )
|
|
|
313 |
{
|
|
1050
|
314 |
int _errorNo, _level;
|
|
|
315 |
uLong _avout;
|
|
1047
|
316 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
|
317 |
|
|
1050
|
318 |
if( _zstream->stream.state == NULL )
|
|
|
319 |
{
|
|
|
320 |
/* processing finished */
|
|
|
321 |
_zstream->stream.avail_in = 0;
|
|
|
322 |
_zstream->stream.next_in = Z_NULL;
|
|
|
323 |
RETURN( nil );
|
|
|
324 |
}
|
|
|
325 |
_level = __intVal( aLevel );
|
|
|
326 |
_avout = _zstream->out_total;
|
|
|
327 |
_zstream->stream.avail_out = _avout;
|
|
|
328 |
_zstream->stream.next_out = _zstream->out_ref;
|
|
|
329 |
|
|
1047
|
330 |
_errorNo = deflate( & _zstream->stream, __intVal(aLevel) );
|
|
1045
|
331 |
|
|
1050
|
332 |
if( _errorNo == Z_STREAM_END )
|
|
1047
|
333 |
{
|
|
1050
|
334 |
_zstream->stream.avail_in = 0;
|
|
|
335 |
_zstream->stream.next_in = Z_NULL;
|
|
|
336 |
_errorNo = deflateEnd( & _zstream->stream );
|
|
1047
|
337 |
}
|
|
1045
|
338 |
|
|
1050
|
339 |
if( _errorNo == Z_OK )
|
|
|
340 |
{
|
|
|
341 |
if( (_zstream->stream.avail_out != _avout)
|
|
|
342 |
|| (_zstream->stream.avail_in != 0)
|
|
|
343 |
)
|
|
|
344 |
RETURN( true );
|
|
|
345 |
|
|
|
346 |
RETURN( false );
|
|
|
347 |
}
|
|
1047
|
348 |
errorNo = __MKSMALLINT( _errorNo );
|
|
1045
|
349 |
}
|
|
|
350 |
%}.
|
|
|
351 |
errorNo ifNil:[
|
|
1047
|
352 |
zstream ifNil:[self errorNotOpen].
|
|
|
353 |
self invalidArguments.
|
|
1045
|
354 |
].
|
|
|
355 |
self zerror:errorNo.
|
|
|
356 |
!
|
|
|
357 |
|
|
|
358 |
zdeflateInit:aLevel memLevel:memLevel strategy:strategy
|
|
|
359 |
|errorNo|
|
|
|
360 |
|
|
|
361 |
errorNo := nil.
|
|
|
362 |
|
|
|
363 |
%{
|
|
|
364 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
365 |
|
|
|
366 |
if( (_zstreamObj != nil)
|
|
|
367 |
&& __isSmallInteger(aLevel)
|
|
|
368 |
&& __isSmallInteger(memLevel)
|
|
|
369 |
&& __isSmallInteger(strategy)
|
|
|
370 |
)
|
|
|
371 |
{
|
|
1047
|
372 |
int _errorNo;
|
|
|
373 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
1045
|
374 |
|
|
1047
|
375 |
_errorNo = deflateInit2( & _zstream->stream
|
|
|
376 |
, __intVal( aLevel )
|
|
|
377 |
, Z_DEFLATED
|
|
|
378 |
, -MAX_WBITS
|
|
|
379 |
, __intVal( memLevel )
|
|
|
380 |
, __intVal( strategy )
|
|
|
381 |
);
|
|
1045
|
382 |
|
|
1047
|
383 |
if( _errorNo == Z_OK )
|
|
|
384 |
RETURN( self );
|
|
1045
|
385 |
|
|
1047
|
386 |
errorNo = __MKSMALLINT( _errorNo );
|
|
1045
|
387 |
}
|
|
|
388 |
%}.
|
|
|
389 |
errorNo ifNil:[
|
|
1047
|
390 |
zstream ifNil:[ self errorNotOpen ].
|
|
|
391 |
self invalidArguments .
|
|
1045
|
392 |
].
|
|
|
393 |
self zerror:errorNo.
|
|
|
394 |
!
|
|
|
395 |
|
|
1050
|
396 |
zflush
|
|
|
397 |
|count|
|
|
1045
|
398 |
|
|
1050
|
399 |
count := 0.
|
|
1045
|
400 |
|
|
|
401 |
%{
|
|
|
402 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
403 |
|
|
|
404 |
if( _zstreamObj != nil )
|
|
|
405 |
{
|
|
1050
|
406 |
uInt _count;
|
|
1047
|
407 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
1045
|
408 |
|
|
1050
|
409 |
_count = _zstream->out_total - _zstream->stream.avail_out;
|
|
1045
|
410 |
|
|
1050
|
411 |
if( _count == 0 )
|
|
1047
|
412 |
RETURN( __MKSMALLINT(0) );
|
|
1045
|
413 |
|
|
1050
|
414 |
_zstream->stream.avail_out = _zstream->out_total;
|
|
1047
|
415 |
_zstream->stream.next_out = _zstream->out_ref;
|
|
1045
|
416 |
|
|
1050
|
417 |
count = __MKSMALLINT( _count );
|
|
1045
|
418 |
}
|
|
|
419 |
%}.
|
|
|
420 |
zstream ifNil:[ self errorNotOpen ].
|
|
1050
|
421 |
self onStreamPutBytes:count from:outputBytes.
|
|
1045
|
422 |
!
|
|
|
423 |
|
|
|
424 |
zgetCrc32
|
|
|
425 |
|
|
|
426 |
%{
|
|
|
427 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
428 |
|
|
|
429 |
if( _zstreamObj != nil )
|
|
|
430 |
{
|
|
1047
|
431 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
|
432 |
RETURN ( __MKUINT(_zstream->crc_32) );
|
|
1045
|
433 |
}
|
|
|
434 |
%}.
|
|
|
435 |
self errorNotOpen
|
|
|
436 |
!
|
|
|
437 |
|
|
|
438 |
zgetTotalIn
|
|
|
439 |
%{
|
|
|
440 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
441 |
|
|
|
442 |
if( _zstreamObj != nil )
|
|
|
443 |
{
|
|
1047
|
444 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
|
445 |
RETURN ( __MKUINT(_zstream->stream.total_in) );
|
|
1045
|
446 |
}
|
|
|
447 |
%}.
|
|
|
448 |
self errorNotOpen
|
|
|
449 |
!
|
|
|
450 |
|
|
1050
|
451 |
zinflate
|
|
|
452 |
|errorNo|
|
|
|
453 |
|
|
|
454 |
errorNo := nil.
|
|
|
455 |
%{
|
|
|
456 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
457 |
|
|
|
458 |
if( _zstreamObj != nil )
|
|
|
459 |
{
|
|
|
460 |
int _errorNo, _count;
|
|
|
461 |
zstream_s * _zstream;
|
|
|
462 |
|
|
|
463 |
_zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
|
464 |
|
|
|
465 |
if( _zstream->stream.state == NULL )
|
|
|
466 |
{
|
|
|
467 |
/* processing finished */
|
|
|
468 |
_zstream->stream.avail_in = 0;
|
|
|
469 |
_zstream->stream.next_in = Z_NULL;
|
|
|
470 |
RETURN( nil );
|
|
|
471 |
}
|
|
|
472 |
if( _zstream->stream.avail_in == 0 )
|
|
|
473 |
RETURN( __MKSMALLINT (0) );
|
|
|
474 |
|
|
|
475 |
_zstream->stream.avail_out = _zstream->out_total;
|
|
|
476 |
_zstream->stream.next_out = _zstream->out_ref;
|
|
|
477 |
|
|
|
478 |
_errorNo = inflate( & _zstream->stream, Z_NO_FLUSH );
|
|
|
479 |
|
|
|
480 |
if( _errorNo == Z_STREAM_END )
|
|
|
481 |
_errorNo = inflateEnd( & _zstream->stream );
|
|
|
482 |
|
|
|
483 |
if( _errorNo == Z_OK )
|
|
|
484 |
{
|
|
|
485 |
_count = _zstream->out_total - _zstream->stream.avail_out;
|
|
|
486 |
RETURN( __MKSMALLINT (_count) );
|
|
|
487 |
}
|
|
|
488 |
errorNo = __MKSMALLINT( _errorNo );
|
|
|
489 |
}
|
|
|
490 |
%}.
|
|
|
491 |
errorNo ifNil:[ self errorNotOpen ].
|
|
|
492 |
self zerror:errorNo.
|
|
|
493 |
!
|
|
|
494 |
|
|
1045
|
495 |
zinflateInit
|
|
|
496 |
|errorNo|
|
|
|
497 |
|
|
|
498 |
errorNo := nil.
|
|
|
499 |
|
|
|
500 |
%{
|
|
|
501 |
OBJ _zstreamObj = __INST( zstream );
|
|
|
502 |
|
|
|
503 |
if( _zstreamObj != nil )
|
|
|
504 |
{
|
|
1047
|
505 |
int _errorNo;
|
|
|
506 |
zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
|
|
1045
|
507 |
|
|
1047
|
508 |
_errorNo = inflateInit2( & _zstream->stream, -MAX_WBITS );
|
|
1045
|
509 |
|
|
1047
|
510 |
if( _errorNo == Z_OK )
|
|
|
511 |
RETURN( self );
|
|
1045
|
512 |
|
|
1047
|
513 |
_zstream->stream.avail_in = 0;
|
|
|
514 |
errorNo = __MKSMALLINT( _errorNo );
|
|
1045
|
515 |
}
|
|
|
516 |
%}.
|
|
|
517 |
errorNo ifNil:[ self errorNotOpen ].
|
|
|
518 |
self zerror:errorNo.
|
|
|
519 |
!
|
|
1047
|
520 |
|
|
1045
|
521 |
zopen:aStream
|
|
|
522 |
|outTotal inTotal|
|
|
|
523 |
|
|
|
524 |
(onStream := aStream) ifNil:[ self pastEnd ].
|
|
|
525 |
|
|
1050
|
526 |
outputBytes := ExternalBytes unprotectedNew:512.
|
|
|
527 |
inputBytes := ExternalBytes unprotectedNew:512.
|
|
1045
|
528 |
outTotal := outputBytes size.
|
|
1050
|
529 |
readLimit := readPosition := writePosition := 0.
|
|
1045
|
530 |
inTotal := outputBytes size.
|
|
|
531 |
binary := false.
|
|
|
532 |
%{
|
|
|
533 |
zstream_s * _zstream = (zstream_s *) malloc( sizeof(zstream_s) );
|
|
|
534 |
|
|
|
535 |
if( _zstream )
|
|
|
536 |
{
|
|
1047
|
537 |
OBJ _zobj = __MKEXTERNALADDRESS( _zstream );
|
|
|
538 |
OBJ _outObj = __INST( outputBytes );
|
|
|
539 |
OBJ _inpObj = __INST( inputBytes );
|
|
1045
|
540 |
|
|
1047
|
541 |
zmemzero( _zstream, sizeof(zstream_s) );
|
|
1045
|
542 |
|
|
1047
|
543 |
_zstream->in_total = __intVal( inTotal );
|
|
|
544 |
_zstream->in_ref = (Bytef *) __externalBytesAddress( _inpObj );
|
|
|
545 |
_zstream->stream.next_in = Z_NULL;
|
|
|
546 |
_zstream->stream.avail_in = 0;
|
|
|
547 |
_zstream->stream.total_in = 0;
|
|
1045
|
548 |
|
|
1047
|
549 |
_zstream->out_total = __intVal( outTotal );
|
|
|
550 |
_zstream->out_ref = (Bytef *) __externalBytesAddress( _outObj );
|
|
|
551 |
_zstream->stream.next_out = _zstream->out_ref;
|
|
|
552 |
_zstream->stream.avail_out = _zstream->out_total;
|
|
|
553 |
_zstream->stream.total_out = 0;
|
|
1045
|
554 |
|
|
1047
|
555 |
_zstream->stream.zalloc = (alloc_func)0;
|
|
|
556 |
_zstream->stream.zfree = (free_func) 0;
|
|
|
557 |
_zstream->stream.opaque = (voidpf) 0;
|
|
1045
|
558 |
|
|
1047
|
559 |
_zstream->crc_32 = crc32( 0L, Z_NULL, 0 );
|
|
1045
|
560 |
|
|
1047
|
561 |
__INST (zstream) = _zobj;
|
|
|
562 |
__STORE(self, _zobj);
|
|
1045
|
563 |
}
|
|
|
564 |
%}.
|
|
|
565 |
zstream ifNil:[ self zerror:'cannot allocate zbuffer' ].
|
|
|
566 |
hitEOF := false.
|
|
|
567 |
! !
|
|
|
568 |
|
|
|
569 |
!ZipStream methodsFor:'private'!
|
|
|
570 |
|
|
|
571 |
onStreamPutBytes:count from:data
|
|
|
572 |
|
|
|
573 |
onStream ifNil:[ self errorNotOpen ].
|
|
|
574 |
onStream nextPutBytes:count from:data startingAt:1
|
|
|
575 |
!
|
|
|
576 |
|
|
|
577 |
onStreamPutLong:aLong
|
|
|
578 |
|bytes value|
|
|
|
579 |
|
|
|
580 |
bytes := ByteArray new:4.
|
|
|
581 |
value := aLong.
|
|
|
582 |
|
|
|
583 |
1 to:4 do:[:i|
|
|
1047
|
584 |
bytes at:i put:(value bitAnd:16rff).
|
|
|
585 |
value := value bitShift:-8.
|
|
1045
|
586 |
].
|
|
|
587 |
self onStreamPutBytes:(bytes size) from:bytes
|
|
|
588 |
!
|
|
|
589 |
|
|
|
590 |
onStreamReadBytesInto:data
|
|
|
591 |
|
|
|
592 |
onStream ifNil:[ self pastEnd ].
|
|
|
593 |
^ onStream nextBytes:(data size) into:data startingAt:1
|
|
|
594 |
! !
|
|
|
595 |
|
|
|
596 |
!ZipStream methodsFor:'private todo'!
|
|
|
597 |
|
|
|
598 |
readHeader
|
|
|
599 |
|method flags|
|
|
|
600 |
|
|
|
601 |
self isReadOpen ifFalse:[ self pastEnd ].
|
|
|
602 |
|
|
|
603 |
"Check the gzip magic id
|
|
|
604 |
"
|
|
|
605 |
GZ_MAGIC_ID do:[:b|
|
|
1047
|
606 |
onStream nextByte ~~ b ifTrue:[ self zerror:'version error' ]
|
|
1045
|
607 |
].
|
|
|
608 |
|
|
|
609 |
method := onStream nextByte.
|
|
|
610 |
method ~~ Z_DEFLATED ifTrue:[
|
|
1047
|
611 |
self zerror:'invalid method (not deflated)'
|
|
1045
|
612 |
].
|
|
|
613 |
|
|
|
614 |
flags := onStream nextByte.
|
|
|
615 |
(flags bitAnd:HEAD_RESERVED) ~~ 0 ifTrue:[
|
|
1047
|
616 |
self zerror:'wrong data format'
|
|
1045
|
617 |
].
|
|
|
618 |
|
|
|
619 |
"discard time, xflags and OS code
|
|
|
620 |
"
|
|
|
621 |
onStream skip:6.
|
|
|
622 |
|
|
|
623 |
(flags bitAnd:HEAD_EXTRA_FIELD) ~~ 0 ifTrue:[|len|
|
|
1047
|
624 |
"skip the extra field"
|
|
|
625 |
len := onStream nextByte + (onStream nextByte bitShift:8).
|
|
|
626 |
len timesRepeat:[ onStream nextByte ].
|
|
1045
|
627 |
].
|
|
|
628 |
|
|
|
629 |
(flags bitAnd:HEAD_ORIG_NAME) ~~ 0 ifTrue:[|b|
|
|
1047
|
630 |
"skip the original file name"
|
|
|
631 |
Transcript show:'header name: '.
|
|
|
632 |
[ (b := onStream nextByte) ~~ 0 ] whileTrue:[
|
|
|
633 |
Transcript show:(Character value:b)
|
|
|
634 |
].
|
|
|
635 |
Transcript cr.
|
|
1045
|
636 |
].
|
|
|
637 |
|
|
|
638 |
(flags bitAnd:HEAD_CRC) ~~ 0 ifTrue:[
|
|
1047
|
639 |
"skip the header crc"
|
|
|
640 |
onStream skip:2.
|
|
1045
|
641 |
].
|
|
|
642 |
|
|
|
643 |
!
|
|
|
644 |
|
|
|
645 |
writeHeader
|
|
|
646 |
|
|
|
647 |
self isWriteOpen ifFalse:[ self pastEnd ].
|
|
|
648 |
|
|
|
649 |
"write the gzip magic id
|
|
|
650 |
"
|
|
|
651 |
GZ_MAGIC_ID do:[:b| onStream nextPutByte:b ].
|
|
|
652 |
|
|
|
653 |
"write the method
|
|
|
654 |
"
|
|
|
655 |
onStream nextPutByte:Z_DEFLATED.
|
|
|
656 |
|
|
|
657 |
"write the flags
|
|
|
658 |
"
|
|
|
659 |
onStream nextPutByte:0.
|
|
|
660 |
|
|
|
661 |
"write time
|
|
|
662 |
"
|
|
|
663 |
4 timesRepeat:[ onStream nextPutByte:0 ].
|
|
|
664 |
|
|
|
665 |
"write xflags
|
|
|
666 |
"
|
|
|
667 |
onStream nextPutByte:0.
|
|
|
668 |
"write OS code
|
|
|
669 |
"
|
|
|
670 |
onStream nextPutByte:HEAD_OS_CODE.
|
|
|
671 |
|
|
|
672 |
! !
|
|
|
673 |
|
|
|
674 |
!ZipStream methodsFor:'queries'!
|
|
|
675 |
|
|
|
676 |
atEnd
|
|
|
677 |
^ hitEOF ~~ false
|
|
|
678 |
!
|
|
|
679 |
|
|
|
680 |
isBinary
|
|
|
681 |
"return true, if the stream is in binary (as opposed to text-) mode.
|
|
|
682 |
The default when created is false.
|
|
|
683 |
"
|
|
|
684 |
^ binary
|
|
|
685 |
!
|
|
|
686 |
|
|
|
687 |
isOpen
|
|
|
688 |
^ onStream notNil
|
|
|
689 |
!
|
|
|
690 |
|
|
|
691 |
isReadOpen
|
|
|
692 |
^ onStream notNil and:[isReadOpen == true]
|
|
|
693 |
!
|
|
|
694 |
|
|
|
695 |
isWriteOpen
|
|
|
696 |
^ onStream notNil and:[isReadOpen == false]
|
|
|
697 |
! !
|
|
|
698 |
|
|
|
699 |
!ZipStream methodsFor:'reading'!
|
|
|
700 |
|
|
|
701 |
contents
|
|
1050
|
702 |
|out b|
|
|
|
703 |
" claus "
|
|
1045
|
704 |
|
|
1050
|
705 |
out := (String new:1024) writeStream.
|
|
1049
|
706 |
|
|
1050
|
707 |
[ (b := self next) notNil ] whileTrue:[
|
|
|
708 |
out nextPut:b
|
|
|
709 |
].
|
|
|
710 |
^ out contents
|
|
1045
|
711 |
!
|
|
|
712 |
|
|
|
713 |
next
|
|
1050
|
714 |
"return the next element, a character or byte (textmode)
|
|
|
715 |
if there is more element, nil is returned
|
|
|
716 |
"
|
|
|
717 |
|byte|
|
|
1045
|
718 |
|
|
1050
|
719 |
self atEnd ifTrue:[^ nil].
|
|
1045
|
720 |
|
|
1050
|
721 |
readPosition == readLimit ifTrue:[
|
|
|
722 |
[ (readLimit := self zinflate) == 0 ] whileTrue:[ |n|
|
|
|
723 |
n := onStream nextBytes:(inputBytes size) into:inputBytes startingAt:1.
|
|
1045
|
724 |
|
|
1050
|
725 |
(n notNil and:[n > 0]) ifFalse:[
|
|
|
726 |
self pastEnd
|
|
|
727 |
].
|
|
|
728 |
self zset_avail_in:n.
|
|
|
729 |
].
|
|
|
730 |
readLimit ifNil:[
|
|
|
731 |
hitEOF := true.
|
|
|
732 |
^ nil
|
|
|
733 |
].
|
|
|
734 |
readPosition := 0.
|
|
1045
|
735 |
].
|
|
1050
|
736 |
readPosition := readPosition + 1.
|
|
|
737 |
byte := outputBytes at:readPosition.
|
|
1049
|
738 |
|
|
1050
|
739 |
binary ifTrue:[^ byte ].
|
|
|
740 |
^ Character value:byte
|
|
1045
|
741 |
! !
|
|
|
742 |
|
|
|
743 |
!ZipStream methodsFor:'startup & release'!
|
|
|
744 |
|
|
|
745 |
close
|
|
|
746 |
zstream ifNil:[^ self].
|
|
|
747 |
|
|
|
748 |
self isWriteOpen ifTrue:[
|
|
1050
|
749 |
self flush.
|
|
1047
|
750 |
|
|
1050
|
751 |
[ self zflush.
|
|
1047
|
752 |
self zdeflate:Z_FINISH
|
|
1050
|
753 |
] whileTrue.
|
|
1045
|
754 |
|
|
1047
|
755 |
self onStreamPutLong:(self zgetCrc32 ). " write crc "
|
|
|
756 |
self onStreamPutLong:(self zgetTotalIn). " write total size "
|
|
1045
|
757 |
].
|
|
|
758 |
self zclose.
|
|
|
759 |
!
|
|
|
760 |
|
|
|
761 |
readOpenOn:aStream
|
|
|
762 |
|
|
|
763 |
isReadOpen := true.
|
|
|
764 |
|
|
|
765 |
self zopen:aStream.
|
|
|
766 |
self zinflateInit.
|
|
|
767 |
self readHeader.
|
|
|
768 |
!
|
|
|
769 |
|
|
|
770 |
writeOpenOn:aStream level:level memLevel:memLevel strategy:strategy
|
|
|
771 |
|
|
|
772 |
isReadOpen := false.
|
|
|
773 |
|
|
|
774 |
self zopen:aStream.
|
|
|
775 |
self zdeflateInit:level memLevel:memLevel strategy:strategy.
|
|
|
776 |
self writeHeader.
|
|
|
777 |
! !
|
|
|
778 |
|
|
|
779 |
!ZipStream methodsFor:'writing'!
|
|
|
780 |
|
|
|
781 |
flush
|
|
1050
|
782 |
"flush the input and output buffer
|
|
1045
|
783 |
"
|
|
1050
|
784 |
|continue|
|
|
1045
|
785 |
|
|
1050
|
786 |
self isWriteOpen ifFalse:[ ^ self ].
|
|
1045
|
787 |
|
|
1050
|
788 |
self zset_avail_in:writePosition.
|
|
|
789 |
writePosition := 0.
|
|
|
790 |
continue := true.
|
|
1045
|
791 |
|
|
1050
|
792 |
[continue] whileTrue:[
|
|
|
793 |
self zflush.
|
|
|
794 |
continue := self zdeflate:Z_NO_FLUSH.
|
|
1047
|
795 |
].
|
|
|
796 |
!
|
|
1045
|
797 |
|
|
1050
|
798 |
nextPut:something
|
|
|
799 |
"write the argument, something
|
|
|
800 |
"
|
|
|
801 |
|byte|
|
|
|
802 |
|
|
|
803 |
byte := nil.
|
|
|
804 |
%{
|
|
|
805 |
int _bval;
|
|
|
806 |
|
|
|
807 |
if( __INST(isReadOpen) == false )
|
|
|
808 |
{
|
|
|
809 |
if( __INST(binary) != true )
|
|
|
810 |
{
|
|
|
811 |
if( ! __isCharacter(something) )
|
|
|
812 |
goto bad;
|
|
1047
|
813 |
|
|
1050
|
814 |
_bval = __intVal(__characterVal(something)) & 0xFF;
|
|
|
815 |
}
|
|
|
816 |
else if( __isSmallInteger(something) )
|
|
|
817 |
{
|
|
|
818 |
_bval = __intVal(something);
|
|
|
819 |
|
|
|
820 |
if( (_bval < 0) || (_bval > 255) )
|
|
|
821 |
goto bad;
|
|
|
822 |
}
|
|
|
823 |
else
|
|
|
824 |
goto bad;
|
|
|
825 |
|
|
|
826 |
byte = __MKSMALLINT( _bval );
|
|
|
827 |
}
|
|
|
828 |
bad: ;
|
|
|
829 |
%}.
|
|
|
830 |
byte ifNil:[self invalidArguments].
|
|
|
831 |
writePosition == inputBytes size ifTrue:[ self flush ].
|
|
|
832 |
writePosition := writePosition + 1.
|
|
|
833 |
inputBytes at:writePosition put:byte.
|
|
1045
|
834 |
!
|
|
|
835 |
|
|
|
836 |
nextPutByte:aByte
|
|
1050
|
837 |
"write a byte; works in both binary and text modes.
|
|
|
838 |
"
|
|
|
839 |
binary ifTrue:[
|
|
|
840 |
self nextPut:aByte.
|
|
|
841 |
] ifFalse:[
|
|
|
842 |
binary := true.
|
|
|
843 |
self nextPut:aByte.
|
|
|
844 |
binary := false.
|
|
1045
|
845 |
].
|
|
|
846 |
! !
|
|
1044
|
847 |
|
|
|
848 |
!ZipStream class methodsFor:'documentation'!
|
|
|
849 |
|
|
|
850 |
version
|
|
1050
|
851 |
^ '$Header: /cvs/stx/stx/libbasic2/ZipStream.st,v 1.7 2002-06-21 09:12:26 ca Exp $'
|
|
1044
|
852 |
! !
|
|
1047
|
853 |
ZipStream initialize!
|