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