ZipStream.st
author ca
Wed, 19 Jun 2002 17:04:58 +0200
changeset 1046 79d5f461a3ad
parent 1045 6f093ef80063
child 1047 1cd99e473c08
permissions -rw-r--r--
*** empty log message ***
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1044
c73aee830691 initial checkin
ca
parents:
diff changeset
     1
"{ Package: 'ca:Compress' }"
c73aee830691 initial checkin
ca
parents:
diff changeset
     2
c73aee830691 initial checkin
ca
parents:
diff changeset
     3
Object subclass:#ZipStream
c73aee830691 initial checkin
ca
parents:
diff changeset
     4
	instanceVariableNames:'onStream hitEOF binary isReadOpen inputBytes outputBytes zstream'
c73aee830691 initial checkin
ca
parents:
diff changeset
     5
	classVariableNames:'Z_FINISH Z_NO_FLUSH Z_SYNC_FLUSH Z_FULL_FLUSH Z_DEFLATED
c73aee830691 initial checkin
ca
parents:
diff changeset
     6
		Z_DEFAULT_COMPRESSION Z_DEFAULT_LEVEL Z_BEST_COMPRESSION
c73aee830691 initial checkin
ca
parents:
diff changeset
     7
		Z_DEF_MEM_LEVEL Z_DEFAULT_STRATEGY Z_FILTERED Z_HUFFMAN_ONLY
c73aee830691 initial checkin
ca
parents:
diff changeset
     8
		HEAD_OS_CODE HEAD_RESERVED HEAD_EXTRA_FIELD HEAD_ORIG_NAME
c73aee830691 initial checkin
ca
parents:
diff changeset
     9
		HEAD_COMMENT HEAD_CRC GZ_MAGIC_ID'
c73aee830691 initial checkin
ca
parents:
diff changeset
    10
	poolDictionaries:''
c73aee830691 initial checkin
ca
parents:
diff changeset
    11
	category:'A-Compress'
c73aee830691 initial checkin
ca
parents:
diff changeset
    12
!
c73aee830691 initial checkin
ca
parents:
diff changeset
    13
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    14
!ZipStream primitiveDefinitions!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    15
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    16
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    17
/*
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    18
 * includes, defines, structure definitions
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    19
 * and typedefs come here.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    20
 */
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    21
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    22
#include "compress/zlib.h"
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    23
#include "compress/zutil.h"
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    24
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    25
typedef struct {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
    26
	z_stream        stream;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
    27
	Bytef *         in_ref;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
    28
	uLong           in_total;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    29
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
    30
	Bytef *         out_ref;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
    31
	uLong           out_used;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
    32
	uLong           out_total;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    33
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
    34
	uLong           crc_32;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    35
} zstream_s;
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    36
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    37
%}
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    38
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    39
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    40
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    41
!ZipStream class methodsFor:'initialization'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    42
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    43
initialize
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    44
    |varZ_NO_FLUSH varZ_SYNC_FLUSH varZ_FULL_FLUSH varZ_FINISH varZ_DEFLATED
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    45
     varZ_DEFAULT_COMPRESSION varZ_BEST_COMPRESSION  varZ_DEF_MEM_LEVEL
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    46
     varZ_DEFAULT_STRATEGY varZ_FILTERED varZ_HUFFMAN_ONLY
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    47
     varHEAD_OS_CODE
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    48
    |
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    49
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    50
    varZ_NO_FLUSH            = __MKSMALLINT( Z_NO_FLUSH );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    51
    varZ_SYNC_FLUSH          = __MKSMALLINT( Z_SYNC_FLUSH );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    52
    varZ_FULL_FLUSH          = __MKSMALLINT( Z_FULL_FLUSH );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    53
    varZ_FINISH              = __MKSMALLINT( Z_FINISH );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    54
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    55
    varZ_DEFLATED            = __MKSMALLINT( Z_DEFLATED );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    56
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    57
    varZ_DEFAULT_COMPRESSION = __MKSMALLINT( Z_DEFAULT_COMPRESSION );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    58
    varZ_BEST_COMPRESSION    = __MKSMALLINT( Z_BEST_COMPRESSION  );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    59
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    60
    varZ_DEF_MEM_LEVEL       = __MKSMALLINT( DEF_MEM_LEVEL );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    61
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    62
    varZ_DEFAULT_STRATEGY    = __MKSMALLINT( Z_DEFAULT_STRATEGY );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    63
    varZ_FILTERED            = __MKSMALLINT( Z_FILTERED );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    64
    varZ_HUFFMAN_ONLY        = __MKSMALLINT( Z_HUFFMAN_ONLY );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    65
    varHEAD_OS_CODE          = __MKSMALLINT( OS_CODE );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    66
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    67
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    68
    Z_NO_FLUSH            := varZ_NO_FLUSH.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    69
    Z_SYNC_FLUSH          := varZ_SYNC_FLUSH.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    70
    Z_FULL_FLUSH          := varZ_FULL_FLUSH.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    71
    Z_FINISH              := varZ_FINISH.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    72
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    73
    Z_DEFLATED            := varZ_DEFLATED.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    74
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    75
    Z_DEFAULT_COMPRESSION := varZ_DEFAULT_COMPRESSION.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    76
    Z_DEFAULT_LEVEL       := 6.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    77
    Z_BEST_COMPRESSION    := varZ_BEST_COMPRESSION.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    78
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    79
    Z_DEF_MEM_LEVEL       := varZ_DEF_MEM_LEVEL.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    80
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    81
    Z_DEFAULT_STRATEGY    := varZ_DEFAULT_STRATEGY.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    82
    Z_FILTERED            := varZ_FILTERED.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    83
    Z_HUFFMAN_ONLY        := varZ_HUFFMAN_ONLY.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    84
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    85
    HEAD_OS_CODE          := varHEAD_OS_CODE.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    86
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    87
    HEAD_RESERVED         := 16rE0.     " bits 5..7:  reserved "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    88
    HEAD_EXTRA_FIELD      := 16r04.     " bit 2 set:  extra field present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    89
    HEAD_ORIG_NAME        := 16r08.     " bit 3 set:  original file name present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    90
    HEAD_COMMENT          := 16r10.     " bit 4 set:  file comment present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    91
    HEAD_CRC              := 16r02.     " bit 1 set:  header CRC present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    92
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    93
    GZ_MAGIC_ID           := #[ 16r1f 16r8b ]
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    94
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    95
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    96
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    97
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    98
!ZipStream class methodsFor:'instance creation'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    99
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   100
readOpenOn:aStream
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   101
    ^ self new readOpenOn:aStream
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   102
!
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   103
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   104
writeOpenOn:aStream
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   105
    ^ self writeOpenOn:aStream level:Z_DEFAULT_LEVEL
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   106
			    memLevel:Z_DEF_MEM_LEVEL
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   107
			    strategy:Z_DEFAULT_STRATEGY.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   108
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   109
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   110
writeOpenOn:aStream level:level memLevel:memLevel strategy:strategy
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   111
    |z|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   112
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   113
    z := self new.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   114
    z writeOpenOn:aStream level:level memLevel:memLevel strategy:strategy.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   115
  ^ z
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   116
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   117
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   118
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   119
!ZipStream class methodsFor:'test'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   120
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   121
test
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   122
"
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   123
ZipStream test
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   124
"
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   125
   |fileContents compContents uncompContents in zip out|
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   126
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   127
   fileContents := 'smalltalk.rc' asFilename contentsOfEntireFile.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   128
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   129
   in  := fileContents readStream.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   130
   out := #[] writeStream.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   131
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   132
   [ zip := self writeOpenOn:out.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   133
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   134
     [in atEnd] whileFalse:[ |buf|
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   135
	buf := in nextAvailable:512.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   136
	zip nextPutAll:buf.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   137
     ].
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   138
   ] valueNowOrOnUnwindDo:[ zip ifNotNil:[ zip close ] ].
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   139
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   140
   compContents := out contents.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   141
   in := compContents readStream.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   142
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   143
   [ zip := self readOpenOn:in.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   144
     uncompContents := zip contents.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   145
   ] valueNowOrOnUnwindDo:[ zip ifNotNil:[ zip close ] ].
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   146
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   147
   fileContents = uncompContents ifFalse:[
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   148
	self halt:'contents differs'.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   149
      ^ self
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   150
   ].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   151
   Transcript showCR:'uncompressed size: ', fileContents size printString.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   152
   Transcript showCR:'compressed   size: ', compContents size printString.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   153
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   154
   Transcript showCR:'OK'.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   155
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   156
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   157
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   158
!ZipStream methodsFor:'accessing'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   159
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   160
binary
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   161
    "switch to binary mode - default is text
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   162
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   163
    binary := true.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   164
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   165
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   166
text
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   167
    "switch to text mode - default is text
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   168
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   169
    binary := false.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   170
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   171
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   172
!ZipStream methodsFor:'error handling'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   173
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   174
errorNotOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   175
    self zerror:( self class name , ' not open' ).
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   176
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   177
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   178
invalidArgument
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   179
    self zerror:( 'invalid argument' ).
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   180
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   181
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   182
pastEnd
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   183
    self zerror:( 'end of stream' ).
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   184
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   185
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   186
zerror:anErrorOrNumber
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   187
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   188
    onStream := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   189
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   190
    self zclose.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   191
    self error:( 'error: ', anErrorOrNumber printString ).
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   192
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   193
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   194
!ZipStream methodsFor:'low level'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   195
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   196
zclose
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   197
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   198
    onStream := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   199
    hitEOF   := true.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   200
    zstream ifNil:[^ self].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   201
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   202
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   203
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   204
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   205
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   206
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   207
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   208
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   209
	__INST(zstream) = nil;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   210
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   211
	if( _zstream->stream.state != NULL )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   212
	{
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   213
	    if( __INST(isReadOpen) == true )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   214
		inflateEnd( & _zstream->stream );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   215
	    else
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   216
		deflateEnd( & _zstream->stream );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   217
	}
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   218
	free( _zstream );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   219
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   220
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   221
    zstream := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   222
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   223
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   224
zdeflate:aLevel
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   225
    |errorNo|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   226
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   227
    errorNo := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   228
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   229
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   230
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   231
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   232
    if( (_zstreamObj != nil) && (__isSmallInteger(aLevel)) )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   233
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   234
	int _errorNo, _level;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   235
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   236
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   237
	_level   = __intVal( aLevel );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   238
	_errorNo = deflate( & _zstream->stream, __intVal(aLevel) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   239
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   240
	if( _errorNo == Z_STREAM_END ) RETURN( true  );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   241
	if( _errorNo == Z_OK )         RETURN( false );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   242
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   243
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   244
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   245
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   246
    errorNo ifNil:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   247
	zstream ifNil:[self errorNotOpen].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   248
	self invalidArguments.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   249
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   250
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   251
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   252
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   253
zdeflateEnd
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   254
    |errorNo|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   255
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   256
    errorNo := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   257
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   258
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   259
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   260
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   261
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   262
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   263
	int         _errorNo;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   264
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   265
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   266
	_errorNo = deflateEnd( & _zstream->stream );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   267
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   268
	if( _errorNo == Z_OK )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   269
	    RETURN( self );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   270
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   271
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   272
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   273
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   274
    errorNo ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   275
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   276
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   277
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   278
zdeflateInit:aLevel memLevel:memLevel strategy:strategy
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   279
    |errorNo|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   280
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   281
    errorNo := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   282
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   283
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   284
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   285
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   286
    if(   (_zstreamObj != nil)
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   287
       && __isSmallInteger(aLevel)
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   288
       && __isSmallInteger(memLevel)
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   289
       && __isSmallInteger(strategy)
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   290
      )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   291
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   292
	int         _errorNo;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   293
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   294
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   295
	_errorNo = deflateInit2( & _zstream->stream
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   296
			       , __intVal( aLevel )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   297
			       , Z_DEFLATED
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   298
			       , -MAX_WBITS
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   299
			       , __intVal( memLevel )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   300
			       , __intVal( strategy )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   301
			       );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   302
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   303
	if( _errorNo == Z_OK )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   304
	    RETURN( self );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   305
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   306
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   307
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   308
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   309
    errorNo ifNil:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   310
	zstream ifNil:[ self errorNotOpen ].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   311
	self invalidArguments .
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   312
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   313
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   314
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   315
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   316
zflush:forced
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   317
    |len|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   318
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   319
    len := 0.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   320
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   321
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   322
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   323
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   324
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   325
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   326
	uInt        _max, _len;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   327
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   328
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   329
	_max = _zstream->out_total;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   330
	_len = _max - _zstream->stream.avail_out;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   331
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   332
	if( (_len == 0) || ((forced == false) && (_len != _max)) )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   333
	    RETURN( __MKSMALLINT(0) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   334
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   335
	_zstream->stream.avail_out = _max;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   336
	_zstream->stream.next_out  = _zstream->out_ref;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   337
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   338
	len = __MKSMALLINT( _len );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   339
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   340
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   341
    zstream ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   342
    self onStreamPutBytes:len from:outputBytes.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   343
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   344
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   345
zgetAvailableOutBufferInto:inBytes startingAt:start
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   346
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   347
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   348
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   349
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   350
    if( (_zstreamObj != nil) && __isSmallInteger(start) )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   351
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   352
	char *      _bytes;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   353
	zstream_s * _zstream;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   354
	int         _count, _offs, _bsize;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   355
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   356
	if (__isBytes (inBytes)) {
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   357
	    _bytes = __ByteArrayInstPtr(inBytes)->ba_element;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   358
	    _bsize = __byteArraySize( inBytes );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   359
	} else if ( __isString(inBytes) ) {
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   360
	    _bytes = __stringVal( inBytes );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   361
	    _bsize = __stringSize( inBytes );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   362
	} else
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   363
	    goto bad;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   364
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   365
	_zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   366
	_count   = _zstream->out_used - _zstream->stream.avail_out;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   367
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   368
	_zstream->stream.avail_out = _zstream->out_used = 0;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   369
	_zstream->stream.next_out  = Z_NULL;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   370
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   371
	if( _count < 1 ) { RETURN( __MKSMALLINT(0) ); }
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   372
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   373
	_offs = __intVal( start ) - 1;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   374
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   375
	if( (_count + _offs) <= _bsize )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   376
	{
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   377
	    zmemcpy( (Bytef *) & _bytes[_offs], _zstream->out_ref, _count );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   378
	    RETURN ( __MKSMALLINT(_count) );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   379
	}
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   380
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   381
bad:;
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   382
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   383
    zstream ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   384
    self invalidArguments .
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   385
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   386
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   387
zgetCrc32
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   388
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   389
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   390
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   391
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   392
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   393
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   394
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   395
	RETURN ( __MKUINT(_zstream->crc_32) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   396
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   397
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   398
    self errorNotOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   399
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   400
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   401
zgetTotalIn
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   402
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   403
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   404
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   405
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   406
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   407
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   408
	RETURN ( __MKUINT(_zstream->stream.total_in) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   409
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   410
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   411
    self errorNotOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   412
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   413
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   414
zinflate
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   415
    |errorNo|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   416
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   417
    errorNo := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   418
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   419
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   420
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   421
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   422
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   423
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   424
	int _errorNo;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   425
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   426
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   427
	_errorNo = inflate( & _zstream->stream, Z_NO_FLUSH );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   428
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   429
	if( _errorNo == Z_STREAM_END )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   430
	{
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   431
	    __INST(hitEOF) = true;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   432
	    _errorNo = inflateEnd( & _zstream->stream );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   433
	}
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   434
	if( _errorNo == Z_OK )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   435
	    RETURN( self );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   436
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   437
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   438
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   439
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   440
    errorNo ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   441
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   442
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   443
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   444
zinflateInit
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   445
    |errorNo|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   446
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   447
    errorNo := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   448
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   449
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   450
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   451
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   452
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   453
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   454
	int         _errorNo;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   455
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   456
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   457
	_errorNo = inflateInit2( & _zstream->stream, -MAX_WBITS );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   458
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   459
	if( _errorNo == Z_OK )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   460
	    RETURN( self );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   461
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   462
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   463
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   464
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   465
    errorNo ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   466
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   467
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   468
zinputAvailable
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   469
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   470
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   471
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   472
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   473
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   474
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   475
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   476
	if( _zstream->stream.avail_in != 0 )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   477
	    RETURN( true );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   478
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   479
	RETURN( false );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   480
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   481
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   482
    self errorNotOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   483
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   484
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   485
zinputPosition:count
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   486
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   487
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   488
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   489
    if( (_zstreamObj != nil) && __isSmallInteger(count) )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   490
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   491
	int         _count;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   492
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   493
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   494
	_count = __intVal( count );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   495
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   496
	if( _count < 0 )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   497
	{
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   498
	    _zstream->stream.next_in  = Z_NULL;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   499
	    _count = 0;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   500
	}
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   501
	else
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   502
	    _zstream->stream.next_in  = _zstream->in_ref;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   503
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   504
	_zstream->stream.avail_in = _count;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   505
	RETURN( __MKSMALLINT (_count) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   506
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   507
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   508
    zstream ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   509
    self invalidArguments .
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   510
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   511
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   512
znextPutBytes:count from:inBytes startingAt:start
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   513
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   514
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   515
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   516
    if( (_zstreamObj != nil) && __bothSmallInteger(count, start) )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   517
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   518
	int         _count, _offs, _bsize;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   519
	char      * _bytes;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   520
	Bytef     * _in_ref;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   521
	zstream_s * _zstream;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   522
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   523
	_zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   524
	_in_ref  = _zstream->in_ref;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   525
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   526
	if( (_count = __intVal (count)) <= 0 )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   527
	{
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   528
	    uInt _b;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   529
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   530
	    if( _count < 0 ) goto bad;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   531
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   532
	    if( __isCharacter(inBytes) )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   533
		_b = __intVal(__characterVal(inBytes)) & 0xFF;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   534
	    else if( __isSmallInteger(inBytes) )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   535
	    {
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   536
		_b = __intVal( inBytes );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   537
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   538
		if( (_b < 0) || (_b > 255) ) goto bad;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   539
	    }
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   540
	    else
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   541
		{ RETURN(__MKSMALLINT (0) ); }
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   542
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   543
	    _in_ref[0] = (Byte) _b;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   544
	    _zstream->stream.avail_in = 1;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   545
	    _zstream->stream.next_in  = _in_ref;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   546
	    _zstream->crc_32 = crc32( _zstream->crc_32, _in_ref, 1 );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   547
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   548
	    RETURN(__MKSMALLINT (1) );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   549
	}
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   550
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   551
	if( (_offs = __intVal (start) - 1) < 0 )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   552
	    goto bad;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   553
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   554
	if (__isBytes (inBytes)) {
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   555
	    _bytes = __ByteArrayInstPtr(inBytes)->ba_element;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   556
	    _bsize = __byteArraySize( inBytes );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   557
	}
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   558
	else if (__isString(inBytes)) {
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   559
	    _bytes = __stringVal ( inBytes );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   560
	    _bsize = __stringSize( inBytes );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   561
	} else
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   562
	    goto bad;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   563
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   564
	if( (_count + _offs) < _bsize )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   565
	{
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   566
	    if(_count > _zstream->in_total )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   567
		_count = _zstream->in_total;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   568
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   569
	    _zstream->stream.avail_in = _count;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   570
	    _zstream->stream.next_in  = _in_ref;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   571
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   572
	    zmemcpy( _in_ref, (Bytef *) & _bytes[_offs], _count );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   573
	    _zstream->crc_32 = crc32( _zstream->crc_32, _in_ref, _count );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   574
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   575
	    RETURN( __MKSMALLINT (_count) );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   576
	}
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   577
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   578
bad:;
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   579
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   580
    zstream ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   581
    self invalidArguments.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   582
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   583
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   584
zopen:aStream
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   585
    |outTotal inTotal|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   586
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   587
    (onStream := aStream) ifNil:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   588
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   589
    outputBytes := ExternalBytes unprotectedNew:8192.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   590
    outTotal    := outputBytes size.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   591
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   592
    inputBytes  := ExternalBytes unprotectedNew:8192.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   593
    inTotal     := outputBytes size.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   594
    binary      := false.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   595
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   596
    zstream_s * _zstream = (zstream_s *) malloc( sizeof(zstream_s) );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   597
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   598
    if( _zstream )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   599
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   600
	OBJ     _zobj   = __MKEXTERNALADDRESS( _zstream );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   601
	OBJ     _outObj = __INST( outputBytes );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   602
	OBJ     _inpObj = __INST( inputBytes  );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   603
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   604
	zmemzero( _zstream, sizeof(zstream_s) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   605
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   606
	_zstream->in_total         = __intVal( inTotal );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   607
	_zstream->in_ref           = (Bytef *) __externalBytesAddress( _inpObj );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   608
	_zstream->stream.next_in   = Z_NULL;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   609
	_zstream->stream.avail_in  = 0;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   610
	_zstream->stream.total_in  = 0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   611
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   612
	_zstream->out_used         = 0;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   613
	_zstream->out_total        = __intVal( outTotal );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   614
	_zstream->out_ref          = (Bytef *) __externalBytesAddress( _outObj );
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   615
	_zstream->stream.next_out  = _zstream->out_ref;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   616
	_zstream->stream.avail_out = _zstream->out_total;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   617
	_zstream->stream.total_out = 0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   618
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   619
	_zstream->stream.zalloc    = (alloc_func)0;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   620
	_zstream->stream.zfree     = (free_func) 0;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   621
	_zstream->stream.opaque    = (voidpf)    0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   622
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   623
	_zstream->crc_32           = crc32( 0L, Z_NULL, 0 );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   624
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   625
	__INST (zstream) = _zobj;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   626
	__STORE(self, _zobj);
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   627
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   628
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   629
    zstream ifNil:[ self zerror:'cannot allocate zbuffer' ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   630
    hitEOF := false.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   631
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   632
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   633
zoutputLimit:count
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   634
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   635
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   636
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   637
    if( (_zstreamObj != nil) && __isSmallInteger(count) )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   638
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   639
	int         _usedSz;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   640
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   641
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   642
	_usedSz = __intVal (count);
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   643
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   644
	if( _usedSz > 0 )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   645
	{
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   646
	    if( _usedSz > _zstream->out_total )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   647
		_usedSz = _zstream->out_total;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   648
	}
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   649
	else
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   650
	    _usedSz = 0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   651
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   652
	_zstream->stream.next_out  = _zstream->out_ref;
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   653
	_zstream->stream.avail_out = _zstream->out_used = _usedSz;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   654
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   655
	RETURN( __MKSMALLINT(_usedSz) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   656
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   657
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   658
    zstream ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   659
    self invalidArguments .
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   660
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   661
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   662
zoutputLimitReached
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   663
    "returns true if the write limit is reached; must flush the buffer
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   664
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   665
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   666
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   667
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   668
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   669
    {
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   670
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   671
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   672
	if( _zstream->stream.avail_out == 0 )
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   673
	    RETURN( true );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   674
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   675
	RETURN( false );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   676
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   677
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   678
    self errorNotOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   679
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   680
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   681
!ZipStream methodsFor:'private'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   682
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   683
onStreamPutBytes:count from:data
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   684
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   685
    onStream ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   686
    onStream nextPutBytes:count from:data startingAt:1
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   687
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   688
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   689
onStreamPutLong:aLong
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   690
    |bytes value|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   691
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   692
    bytes := ByteArray new:4.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   693
    value := aLong.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   694
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   695
    1 to:4 do:[:i|
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   696
	bytes at:i put:(value bitAnd:16rff).
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   697
	value := value bitShift:-8.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   698
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   699
    self onStreamPutBytes:(bytes size) from:bytes
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   700
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   701
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   702
onStreamReadBytesInto:data
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   703
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   704
    onStream ifNil:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   705
  ^ onStream nextBytes:(data size) into:data startingAt:1
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   706
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   707
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   708
!ZipStream methodsFor:'private todo'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   709
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   710
readHeader
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   711
    |method flags|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   712
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   713
    self isReadOpen ifFalse:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   714
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   715
    "Check the gzip magic id
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   716
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   717
    GZ_MAGIC_ID do:[:b|
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   718
	onStream nextByte ~~ b ifTrue:[ self zerror:'version error' ]
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   719
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   720
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   721
    method := onStream nextByte.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   722
    method ~~ Z_DEFLATED ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   723
	self zerror:'invalid method (not deflated)'
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   724
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   725
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   726
    flags := onStream nextByte.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   727
    (flags bitAnd:HEAD_RESERVED) ~~ 0 ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   728
	self zerror:'wrong data format'
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   729
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   730
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   731
    "discard time, xflags and OS code
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   732
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   733
    onStream skip:6.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   734
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   735
    (flags bitAnd:HEAD_EXTRA_FIELD) ~~ 0 ifTrue:[|len|
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   736
	"skip the extra field"
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   737
	len := onStream nextByte + (onStream nextByte bitShift:8).
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   738
	len timesRepeat:[ onStream nextByte ].
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   739
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   740
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   741
    (flags bitAnd:HEAD_ORIG_NAME) ~~ 0 ifTrue:[|b|
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   742
	"skip the original file name"
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   743
	Transcript show:'header name: '.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   744
	[ (b := onStream nextByte) ~~ 0 ] whileTrue:[
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   745
	    Transcript show:(Character value:b)
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   746
	].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   747
	Transcript cr.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   748
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   749
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   750
    (flags bitAnd:HEAD_CRC) ~~ 0 ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   751
	"skip the header crc"
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   752
	onStream skip:2.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   753
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   754
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   755
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   756
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   757
writeHeader
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   758
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   759
    self isWriteOpen ifFalse:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   760
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   761
    "write the gzip magic id
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   762
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   763
    GZ_MAGIC_ID do:[:b| onStream nextPutByte:b ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   764
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   765
    "write the method
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   766
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   767
    onStream nextPutByte:Z_DEFLATED.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   768
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   769
    "write the flags
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   770
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   771
    onStream nextPutByte:0.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   772
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   773
    "write time
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   774
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   775
    4 timesRepeat:[ onStream nextPutByte:0 ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   776
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   777
    "write xflags
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   778
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   779
    onStream nextPutByte:0.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   780
    "write OS code
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   781
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   782
    onStream nextPutByte:HEAD_OS_CODE.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   783
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   784
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   785
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   786
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   787
!ZipStream methodsFor:'queries'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   788
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   789
atEnd
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   790
    ^ hitEOF ~~ false
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   791
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   792
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   793
isBinary
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   794
    "return true, if the stream is in binary (as opposed to text-) mode.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   795
     The default when created is false.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   796
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   797
    ^ binary
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   798
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   799
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   800
isOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   801
    ^ onStream notNil
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   802
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   803
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   804
isReadOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   805
    ^ onStream notNil and:[isReadOpen == true]
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   806
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   807
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   808
isWriteOpen
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   809
    ^ onStream notNil and:[isReadOpen == false]
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   810
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   811
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   812
!ZipStream methodsFor:'reading'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   813
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   814
contents
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   815
   |out buf bsz|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   816
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   817
   self isReadOpen ifFalse:[self pastEnd].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   818
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   819
   bsz := inputBytes size.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   820
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   821
   binary ifFalse:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   822
	out := (String new:bsz) writeStream.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   823
	buf := String new:bsz.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   824
   ] ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   825
	out := (ByteArray new:bsz) writeStream.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   826
	buf := ByteArray new:bsz.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   827
   ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   828
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   829
   [self atEnd ] whileFalse:[ |n|
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   830
	n := self nextAvailableBytes:bsz into:buf startingAt:1.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   831
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   832
	n ~~ 0 ifTrue:[
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   833
	    out nextPutAll:buf startingAt:1 to:n
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   834
	]
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   835
   ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   836
   ^ out contents
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   837
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   838
"
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   839
   |gzFile zip contents|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   840
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   841
   gzFile := FileStream readonlyFileNamed:'/home/ca/C/Compress/zlib-1.1.4/Test/YYY.gz'.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   842
   [
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   843
     zip := self new readOpenOn:gzFile.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   844
     contents := zip contents.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   845
   ] valueNowOrOnUnwindDo:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   846
	zip ifNotNil:[ zip close ].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   847
	gzFile close.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   848
   ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   849
   ^ contents
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   850
"
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   851
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   852
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   853
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   854
next
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   855
    |b|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   856
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   857
    b := self nextByte.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   858
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   859
    b ifNotNil:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   860
	binary ifTrue:[^ b ].
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   861
      ^ Character value:b
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   862
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   863
    ^ nil
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   864
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   865
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   866
next:count
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   867
    ^ self nextAvailable:count
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   868
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   869
nextAvailable:count
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   870
    |n buffer|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   871
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   872
    self isReadOpen ifFalse:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   873
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   874
    binary ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   875
	buffer := ByteArray uninitializedNew:count
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   876
    ] ifFalse:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   877
	buffer := String new:count
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   878
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   879
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   880
    n := self nextAvailableBytes:count into:buffer startingAt:1.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   881
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   882
    n == 0 ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   883
	binary ifTrue:[
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   884
	    ^ #[]
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   885
	].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   886
	^ ''
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   887
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   888
    n ~~ count ifTrue:[ ^ buffer copyTo:n ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   889
  ^ buffer.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   890
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   891
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   892
nextAvailableBytes:count into:buffer startingAt:start
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   893
    |eoStream|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   894
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   895
    self isReadOpen ifFalse:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   896
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   897
    (self zoutputLimit:count) < 0 ifTrue:[^ 0].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   898
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   899
    eoStream := false.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   900
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   901
    [ self atEnd or:[self zoutputLimitReached] ] whileFalse:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   902
	self zinputAvailable ifFalse:[ |n|
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   903
	    n := self onStreamReadBytesInto:inputBytes.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   904
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   905
	    n == 0 ifTrue:[
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   906
		eoStream ifTrue:[ self pastEnd ].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   907
		eoStream := true.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   908
	    ].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   909
	    self zinputPosition:n.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   910
	].
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   911
	self zinflate.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   912
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   913
    ^ self zgetAvailableOutBufferInto:buffer startingAt:start.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   914
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   915
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   916
nextByte
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   917
    |buff size|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   918
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   919
    buff := ByteArray new:1.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   920
    size := self nextAvailableBytes:1 into:buff startingAt:1.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   921
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   922
    size ~~ 0 ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   923
	^ buff at:1
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   924
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   925
    ^ nil
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   926
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   927
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   928
!ZipStream methodsFor:'startup & release'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   929
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   930
close
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   931
    zstream ifNil:[^ self].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   932
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   933
    self isWriteOpen ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   934
	[   self zflush:true.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   935
	    self zdeflate:Z_FINISH
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   936
	] whileFalse.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   937
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   938
	self zflush:true.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   939
	self zdeflateEnd.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   940
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   941
	self onStreamPutLong:(self zgetCrc32  ).    " write crc "
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   942
	self onStreamPutLong:(self zgetTotalIn).    " write total size "
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   943
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   944
    self zclose.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   945
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   946
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   947
readOpenOn:aStream
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   948
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   949
    isReadOpen := true.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   950
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   951
    self zopen:aStream.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   952
    self zinflateInit.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   953
    self readHeader.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   954
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   955
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   956
writeOpenOn:aStream level:level memLevel:memLevel strategy:strategy
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   957
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   958
    isReadOpen := false.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   959
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   960
    self zopen:aStream.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   961
    self zdeflateInit:level memLevel:memLevel strategy:strategy.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   962
    self writeHeader.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   963
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   964
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   965
!ZipStream methodsFor:'writing'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   966
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   967
flush
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   968
    "force flush output
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   969
    "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   970
    self flush:true
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   971
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   972
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   973
flush:forced
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   974
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   975
    self isWriteOpen ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   976
	self zflush:forced
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   977
    ] ifFalse:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   978
	onStream ifNil:[self pastEnd]
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   979
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   980
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   981
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   982
nextPut:aCharacter
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   983
    |count|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   984
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   985
    self isWriteOpen ifFalse:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   986
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   987
    count := self znextPutBytes:0 from:aCharacter startingAt:0.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   988
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   989
    [
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   990
	self zflush:false.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   991
	self zdeflate:Z_NO_FLUSH.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
   992
	self zinputAvailable
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   993
    ] whileTrue.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   994
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   995
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   996
nextPutByte:aByte
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   997
    self nextPut:aByte.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   998
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   999
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1000
nextPutAll:buffer
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1001
    |count offset|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1002
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1003
    count  := buffer size.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1004
    offset := 1.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1005
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1006
    [ count > 0 ] whileTrue:[ |n|
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1007
	n := self nextPutBytes:count from:buffer startingAt:offset.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1008
	offset := offset + n.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1009
	count  := count  - n.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1010
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1011
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1012
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1013
nextPutBytes:count from:inBytes startingAt:start
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1014
    |n|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1015
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1016
    self isWriteOpen ifFalse:[ self pastEnd ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1017
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1018
    n := self znextPutBytes:count from:inBytes startingAt:start.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1019
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1020
    n ~~ 0 ifTrue:[
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1021
	[
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1022
	    self zflush:false.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1023
	    self zdeflate:Z_NO_FLUSH.
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1024
	    self zinputAvailable
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1025
	] whileTrue.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1026
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1027
    ^ n
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
  1028
! !
1044
c73aee830691 initial checkin
ca
parents:
diff changeset
  1029
c73aee830691 initial checkin
ca
parents:
diff changeset
  1030
!ZipStream class methodsFor:'documentation'!
c73aee830691 initial checkin
ca
parents:
diff changeset
  1031
c73aee830691 initial checkin
ca
parents:
diff changeset
  1032
version
1046
79d5f461a3ad *** empty log message ***
ca
parents: 1045
diff changeset
  1033
    ^ '$Header: /cvs/stx/stx/libbasic2/ZipStream.st,v 1.3 2002-06-19 15:04:58 ca Exp $'
1044
c73aee830691 initial checkin
ca
parents:
diff changeset
  1034
! !