ZipStream.st
author Stefan Vogel <sv@exept.de>
Mon, 19 May 2014 16:41:09 +0200
changeset 3283 836136cf9e8d
parent 2639 079d4b8fd8ee
child 3535 d62d6f27f07c
permissions -rw-r--r--
class: ZipStream comment/format in: #examples #initialize #readHeader changed: #writeHeader
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     1
"
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     2
 COPYRIGHT (c) 2002 by eXept Software AG
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
     3
	      All Rights Reserved
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     4
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     5
 This software is furnished under a license and may be used
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     6
 only in accordance with the terms of that license and with the
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     8
 be provided or otherwise made available to, or used by, any
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
     9
 other person.  No title to or ownership of the software is
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    10
 hereby transferred.
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    11
"
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    12
"{ Package: 'stx:libbasic2' }"
1044
c73aee830691 initial checkin
ca
parents:
diff changeset
    13
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
    14
CompressionStream subclass:#ZipStream
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1061
diff changeset
    15
	instanceVariableNames:''
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1061
diff changeset
    16
	classVariableNames:'Z_DEFLATED HEAD_OS_CODE HEAD_RESERVED HEAD_EXTRA_FIELD
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1061
diff changeset
    17
		HEAD_ORIG_NAME HEAD_COMMENT HEAD_CRC GZ_MAGIC_ID'
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1061
diff changeset
    18
	poolDictionaries:''
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1061
diff changeset
    19
	category:'System-Compress'
1044
c73aee830691 initial checkin
ca
parents:
diff changeset
    20
!
c73aee830691 initial checkin
ca
parents:
diff changeset
    21
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    22
!ZipStream primitiveDefinitions!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    23
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    24
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    25
/*
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    26
 * includes, defines, structure definitions
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    27
 * and typedefs come here.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    28
 */
1836
e9e1ba3735c6 Correct include path for zlib
Stefan Vogel <sv@exept.de>
parents: 1828
diff changeset
    29
#include "zlib.h"
e9e1ba3735c6 Correct include path for zlib
Stefan Vogel <sv@exept.de>
parents: 1828
diff changeset
    30
#include "zutil.h"
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    31
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
    32
typedef enum {
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    33
	  e_opmode_unspecified          /* processing done */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    34
	, e_opmode_deflate              /* running deflate */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    35
	, e_opmode_inflate              /* running inflate */
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
    36
} e_opmode;
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
    37
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    38
typedef struct {
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    39
	z_stream        stream;         /* pointer to the external in -stream */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    40
	Bytef *         in_ref;         /* size    of the external in -stream */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    41
	Bytef *         out_ref;        /* pointer to the external out-stream */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    42
	uLong           out_total;      /* size    of the external out-stream */
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    43
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    44
	e_opmode        op_mode;        /* current operational mode */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    45
	uLong           crc_32;         /* keeps the current crc */
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
    46
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    47
	Bytef           tail_buff[ 8 ]; /* store the tail in the read modus */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
    48
	uLong           tail_size;      /* to check the crc and data length */
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    49
} zstream_s;
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    50
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    51
%}
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    52
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
    53
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    54
!ZipStream class methodsFor:'documentation'!
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    55
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    56
copyright
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    57
"
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    58
 COPYRIGHT (c) 2002 by eXept Software AG
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
    59
	      All Rights Reserved
1308
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    60
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    61
 This software is furnished under a license and may be used
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    62
 only in accordance with the terms of that license and with the
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    63
 inclusion of the above copyright notice.   This software may not
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    64
 be provided or otherwise made available to, or used by, any
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    65
 other person.  No title to or ownership of the software is
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    66
 hereby transferred.
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    67
"
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    68
!
d7bea6d0b3b6 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1197
diff changeset
    69
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    70
documentation
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    71
"
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    72
    Zip compression and decompression (used in gzip and zip)
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    73
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    74
    [author:]
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
    75
	Claus Atzkern
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    76
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    77
    [instance variables:]
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    78
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    79
    [class variables:]
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    80
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    81
    [see also:]
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    82
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    83
"
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    84
!
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    85
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    86
examples
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    87
"
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
    88
                                                                [exBegin]
1847
5364b697ad8f better example
sr
parents: 1836
diff changeset
    89
    |compressedDataStream zipStream compressedData uncompressedData|
5364b697ad8f better example
sr
parents: 1836
diff changeset
    90
5364b697ad8f better example
sr
parents: 1836
diff changeset
    91
    compressedDataStream := #[] writeStream.
5364b697ad8f better example
sr
parents: 1836
diff changeset
    92
    zipStream := ZipStream writeOpenOn:compressedDataStream.
5364b697ad8f better example
sr
parents: 1836
diff changeset
    93
    zipStream nextPutAll:'hallo Welt'.
5364b697ad8f better example
sr
parents: 1836
diff changeset
    94
    zipStream close.
5364b697ad8f better example
sr
parents: 1836
diff changeset
    95
5364b697ad8f better example
sr
parents: 1836
diff changeset
    96
    compressedData := compressedDataStream contents.
5364b697ad8f better example
sr
parents: 1836
diff changeset
    97
5364b697ad8f better example
sr
parents: 1836
diff changeset
    98
    zipStream := ZipStream readOpenOn:(compressedData readStream).
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
    99
1847
5364b697ad8f better example
sr
parents: 1836
diff changeset
   100
    zipStream notNil ifTrue:[
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   101
        |stream c|
1847
5364b697ad8f better example
sr
parents: 1836
diff changeset
   102
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   103
        stream := '' writeStream.
1847
5364b697ad8f better example
sr
parents: 1836
diff changeset
   104
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   105
        [ (c := zipStream nextOrNil) notNil ] whileTrue:[
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   106
            stream nextPut:c
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   107
        ].
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   108
        stream close.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   109
        uncompressedData := stream contents.
1847
5364b697ad8f better example
sr
parents: 1836
diff changeset
   110
    ].
5364b697ad8f better example
sr
parents: 1836
diff changeset
   111
    ^ uncompressedData
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   112
                                                                [exEnd]
1847
5364b697ad8f better example
sr
parents: 1836
diff changeset
   113
5364b697ad8f better example
sr
parents: 1836
diff changeset
   114
2489
9a520f4a1d6a changed: #examples
sr
parents: 2488
diff changeset
   115
                                                                [exBegin]
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   116
    |fstream zipStream c|
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   117
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   118
    fstream := FileStream newTemporary.
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   119
    zipStream := ZipStream writeOpenOn:fstream.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   120
    zipStream nextPutAll:'hallo Welt(1) - test....'.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   121
    zipStream cr.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   122
    zipStream nextPutAll:'hallo Welt(2) - test....'.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   123
    zipStream cr.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   124
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   125
    zipStream close. 
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   126
    fstream close.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   127
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   128
    fstream := fstream fileName readStream.
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   129
    zipStream := ZipStream readOpenOn:fstream.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   130
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   131
    Transcript showCR:zipStream contents.
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   132
2488
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   133
    zipStream close.
702fc73e1b3c added: #examples2
sr
parents: 2335
diff changeset
   134
    fstream close.
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   135
    fstream fileName delete.
2489
9a520f4a1d6a changed: #examples
sr
parents: 2488
diff changeset
   136
                                                                [exEnd]
9a520f4a1d6a changed: #examples
sr
parents: 2488
diff changeset
   137
9a520f4a1d6a changed: #examples
sr
parents: 2488
diff changeset
   138
"
1197
c86e858c2893 Documentation. Does not work yet.
Stefan Vogel <sv@exept.de>
parents: 1195
diff changeset
   139
! !
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   140
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   141
!ZipStream class methodsFor:'initialization'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   142
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   143
initialize
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   144
    "setup class attributes derived from the library"
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   145
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   146
    |z_deflated os_code|
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   147
%{
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   148
    z_deflated = __MKSMALLINT( Z_DEFLATED );
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   149
    os_code    = __MKSMALLINT( OS_CODE );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   150
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   151
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   152
    Z_DEFLATED            := z_deflated.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   153
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   154
    HEAD_OS_CODE          := os_code.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   155
    HEAD_RESERVED         := 16rE0.     " bits 5..7:  reserved "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   156
    HEAD_EXTRA_FIELD      := 16r04.     " bit 2 set:  extra field present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   157
    HEAD_ORIG_NAME        := 16r08.     " bit 3 set:  original file name present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   158
    HEAD_COMMENT          := 16r10.     " bit 4 set:  file comment present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   159
    HEAD_CRC              := 16r02.     " bit 1 set:  header CRC present "
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   160
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   161
    GZ_MAGIC_ID           := #[ 16r1f 16r8b ]
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   162
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   163
2006
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   164
!ZipStream class methodsFor:'instance creation'!
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   165
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   166
readOpenAsZipStreamOn:aStream
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   167
    "open to read data compressed from stream,
2006
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   168
     the default readOpenOn: will open ZipStream as gzip stream"
2196
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   169
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   170
    ^ self
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   171
        readOpenAsZipStreamOn:aStream
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   172
        suppressHeaderAndChecksum:(self defaultSuppressHeaderAndChecksum)    
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   173
!
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   174
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   175
readOpenAsZipStreamOn:aStream suppressHeaderAndChecksum:aBoolean
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   176
    "open to read data compressed from stream,
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   177
     the default readOpenOn: will open ZipStream as gzip stream"
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   178
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   179
    ^ self basicNew
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   180
        streamOpenWithMode:#readonly
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   181
        on:aStream
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   182
        suppressHeaderAndChecksum:aBoolean
2006
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   183
!
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   184
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   185
writeOpenAsZipStreamOn:aStream
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   186
    "open to write data compressed to stream,
2006
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   187
     the default writeOpenOn: will open ZipStream as gzip stream"
2196
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   188
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   189
    ^ self
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   190
        writeOpenAsZipStreamOn:aStream
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   191
        suppressHeaderAndChecksum:(self defaultSuppressHeaderAndChecksum)    
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   192
!
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   193
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   194
writeOpenAsZipStreamOn:aStream suppressHeaderAndChecksum:aBoolean
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   195
    "open to write data compressed to stream,
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   196
     the default writeOpenOn: will open ZipStream as gzip stream"
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   197
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   198
    ^ self basicNew
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   199
        streamOpenWithMode:#writeonly
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   200
        on:aStream
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   201
        suppressHeaderAndChecksum:aBoolean
2006
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   202
! !
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   203
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   204
!ZipStream class methodsFor:'ZipInterface compatibility - compress/uncompress'!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   205
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   206
compress: aUncompressedByteArray into: aCompressedByteArray
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   207
    ^ self flatBytesIn: aUncompressedByteArray
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   208
		  from: 1
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   209
		    to: (aUncompressedByteArray size)
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   210
		  into: aCompressedByteArray
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   211
	    doCompress: true.
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   212
!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   213
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   214
flatBytesIn:bytesIn from:start to:stop into:bytesOut doCompress:doCompress
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   215
    "compress or uncompress the bytesIn buffer into the bytesOut buffer; returns
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   216
     the un/compressed size; on error an exception is raised
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   217
    "
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   218
    |errorNr size|
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   219
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   220
     size := stop - start + 1.
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   221
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   222
     (    (start between:1 and:stop)
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   223
      and:[size > 0
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   224
      and:[bytesIn  size >= stop
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   225
      and:[bytesOut size >  0]]]
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   226
     ) ifFalse:[
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   227
        ^ self error:'invalid argument size'
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   228
    ].
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   229
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   230
%{
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   231
    char *  __bytesIn  = 0;
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   232
    uLong   __countIn  = 0;
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   233
    char *  __bytesOut = 0;
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   234
    uLong   __countOut = 0;
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   235
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   236
    if( (__isSmallInteger(start)) && (__isSmallInteger(stop)) && (__isSmallInteger(size)) )
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   237
    {
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   238
        __countIn = __intVal( size );
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   239
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   240
        if (__isBytes(bytesIn)) {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   241
            __bytesIn = __ByteArrayInstPtr(bytesIn)->ba_element;
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   242
        } else {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   243
            if (__isStringLike(bytesIn)) {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   244
                __bytesIn = __stringVal( bytesIn );
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   245
            }
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   246
        }
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   247
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   248
        if (__isBytes(bytesOut)) {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   249
            __bytesOut = __ByteArrayInstPtr(bytesOut)->ba_element;
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   250
            __countOut = __byteArraySize( bytesOut );
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   251
        } else {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   252
            if (__isString(bytesOut)) {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   253
                __bytesOut = __stringVal( bytesOut );
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   254
                __countOut = __stringSize( bytesOut );
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   255
            }
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   256
        }
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   257
    }
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   258
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   259
    if( __bytesOut && __bytesIn )
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   260
    {
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   261
        int __result = Z_OK;
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   262
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   263
        __bytesIn += (__intVal( start)) - 1;
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   264
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   265
        if( doCompress == true )
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   266
            __result   = compress  ( (Byte *) __bytesOut, & __countOut, (Byte *) __bytesIn, __countIn );
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   267
        else
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   268
            __result   = uncompress( (Byte *) __bytesOut, & __countOut, (Byte *) __bytesIn, __countIn );
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   269
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   270
        if( __result == Z_OK )
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   271
            { RETURN(__MKSMALLINT(__countOut)); }
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   272
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   273
        errorNr = __MKSMALLINT( __result );
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   274
    }
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   275
%}.
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   276
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   277
    errorNr isNil ifTrue:[ ^ self error:'invalid arguments' ].
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   278
    errorNr ==  1 ifTrue:[ ^ self error:'stream at end' ].
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   279
    errorNr == -3 ifTrue:[ ^ self error:'input data are corrupted' ].
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   280
    errorNr == -4 ifTrue:[ ^ self error:'not enough memory' ].
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   281
    errorNr == -5 ifTrue:[ ^ self error:'not enough memory in the output stream' ].
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   282
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   283
    self error:('compressing error: ', errorNr printString).
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   284
!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   285
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   286
uncompress: aCompressedByteArray into: aUncompressedByteArray
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   287
    ^ self flatBytesIn: aCompressedByteArray
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   288
		  from: 1
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   289
		    to: (aCompressedByteArray size)
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   290
		  into: aUncompressedByteArray
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   291
	    doCompress: false.
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   292
! !
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   293
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   294
!ZipStream class methodsFor:'ZipInterface compatibility - crc'!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   295
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   296
crc32Add:aCharacterOrByte crc:crc
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   297
    "Update a running crc waCharacterOrByte
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   298
     and return the updated crc "
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   299
%{
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   300
    if( (__isInteger(crc)))     {
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   301
	char __byte;
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   302
	uLong  __crc;
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   303
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   304
	if (__isCharacter(aCharacterOrByte)) {
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   305
	    __byte = __smallIntegerVal(__characterVal(aCharacterOrByte));
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   306
	} else if (__isSmallInteger(aCharacterOrByte)) {
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   307
	    __byte = __intVal(aCharacterOrByte);
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   308
	} else{
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   309
	    goto err;
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   310
	}
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   311
2190
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   312
	__crc  = __unsignedLongIntVal( crc );
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   313
	__crc = crc32(__crc, (Byte *) &__byte, 1 );
6c3f9241753a fixed stream processing
Claus Gittinger <cg@exept.de>
parents: 2178
diff changeset
   314
	RETURN( __MKUINT(__crc) );
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   315
    }
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   316
err:;
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   317
%}.
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   318
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   319
    ^ self error:'invalid argument'
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   320
!
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   321
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   322
crc32BytesIn:bytesIn
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   323
    "compute crc with the bytes buf[1.. bytesIn size]
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   324
     and return the crc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   325
    "
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   326
    ^ self crc32BytesIn:bytesIn from:1
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   327
!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   328
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   329
crc32BytesIn:bytesIn crc:aCrc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   330
    "Update a running crc with the bytes buf[1.. bytesIn size]
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   331
     and return the updated
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   332
    "
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   333
    ^ self crc32BytesIn:bytesIn from:1 crc:aCrc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   334
!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   335
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   336
crc32BytesIn:bytesIn from:start
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   337
    "compute crc with the bytes buf[start.. bytesIn size]
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   338
     and return the crc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   339
    "
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   340
    ^ self crc32BytesIn:bytesIn from:start to:(bytesIn size)
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   341
!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   342
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   343
crc32BytesIn:bytesIn from:start crc:aCrc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   344
    "Update a running crc with the bytes buf[start.. bytesIn size]
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   345
     and return the updated
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   346
    "
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   347
    ^ self crc32BytesIn:bytesIn from:start to:(bytesIn size) crc:aCrc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   348
!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   349
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   350
crc32BytesIn:bytesIn from:start to:stop
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   351
    "compute crc with the bytes buf[start.. stop]
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   352
     and return the crc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   353
    "
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   354
    ^ self crc32BytesIn:bytesIn from:start to:stop crc:0
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   355
!
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   356
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   357
crc32BytesIn:bytesIn from:start to:stop crc:crc
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   358
    "Update a running crc with the bytes buf[start.. stop]
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   359
     and return the updated crc"
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   360
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   361
%{
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   362
    if (__isInteger(crc) && __isSmallInteger(start) && __isSmallInteger(stop)) {
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   363
        char * __bytes  = 0;
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   364
        unsigned int __size;
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   365
        uLong  __crc  = __unsignedLongIntVal( crc );
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   366
        uInt   __start = __intVal( start );
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   367
        uInt   __stop = __intVal( stop );
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   368
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   369
        if (__isBytes(bytesIn)) {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   370
            __bytes = __byteArrayVal(bytesIn);
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   371
            __size = __byteArraySize(bytesIn);
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   372
        } else if (__isStringLike(bytesIn)) {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   373
            __bytes = __stringVal(bytesIn);
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   374
            __size = __stringSize(bytesIn);
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   375
        } else {
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   376
            goto err;
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   377
        }
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   378
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   379
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   380
        if (__start < 1 || __start > __size) goto err;
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   381
        if (__stop < 1 || __stop > __size) goto err;
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   382
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   383
        __size = __stop - __start + 1;
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   384
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   385
        __bytes += __start - 1;
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   386
        __crc = crc32(__crc, (Byte *) __bytes, __size );
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   387
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   388
        RETURN( __MKUINT(__crc) );
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   389
    }
2178
f6f0d919aed2 Fix windows compilation bug in 1.31
Stefan Vogel <sv@exept.de>
parents: 2177
diff changeset
   390
err:;
1439
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   391
%}.
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   392
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   393
    ^ self error:'invalid argument size'
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   394
! !
134b4620d6d0 add ZipInterface compatibility used by SEL MDT Application
ab
parents: 1308
diff changeset
   395
2639
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   396
!ZipStream class methodsFor:'queries'!
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   397
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   398
maxDistanceCodes
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   399
    ^ 30
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   400
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   401
    "Created: / 11-09-2011 / 17:11:36 / cg"
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   402
!
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   403
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   404
maxLiteralCodes
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   405
    ^ 286
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   406
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   407
    "Created: / 11-09-2011 / 17:11:15 / cg"
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   408
! !
Claus Gittinger <cg@exept.de>
parents: 2489
diff changeset
   409
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   410
!ZipStream methodsFor:'low level'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   411
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   412
zclose
1052
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   413
    "low level close of the zip stream
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   414
    "
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   415
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   416
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   417
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   418
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   419
    {
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   420
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   421
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   422
	__INST(zstream) = nil;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   423
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   424
	if( _zstream->stream.state != NULL )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   425
	{
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   426
	    if( _zstream->op_mode == e_opmode_inflate )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   427
		inflateEnd( & _zstream->stream );
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   428
	    else
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   429
		deflateEnd( & _zstream->stream );
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   430
	}
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   431
	free( _zstream );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   432
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   433
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   434
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   435
1057
9df4a60df0ef *** empty log message ***
ca
parents: 1056
diff changeset
   436
zdeflate
1570
b6dd9a871cc2 Fix typo
Stefan Vogel <sv@exept.de>
parents: 1565
diff changeset
   437
    "low level - deflate"
b6dd9a871cc2 Fix typo
Stefan Vogel <sv@exept.de>
parents: 1565
diff changeset
   438
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   439
    |errorNo|
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   440
    errorNo := nil.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   441
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   442
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   443
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   444
1056
44871623590b *** empty log message ***
ca
parents: 1054
diff changeset
   445
    if( _zstreamObj != nil )
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   446
    {
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   447
	int         _errorNo, _action;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   448
	uLong       _bfsize;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   449
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1047
1cd99e473c08 *** empty log message ***
ca
parents: 1046
diff changeset
   450
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   451
	if( _zstream->op_mode != e_opmode_deflate )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   452
	    RETURN( false );
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   453
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   454
	_bfsize = _zstream->out_total;
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   455
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   456
	if( _zstream->stream.state == NULL )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   457
	{
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   458
	    /* processing finished; write crc_32 and the total size
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   459
	    */
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   460
	    uLong   v, i;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   461
	    Bytef * p = _zstream->out_ref;
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   462
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   463
	    v = _zstream->crc_32;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   464
	    for( i = 0; i < 4; ++i ) { p[i] = v & 0xff; v >>= 8; }
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   465
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   466
	    v = _zstream->stream.total_in;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   467
	    for( i = 4; i < 8; ++i ) { p[i] = v & 0xff; v >>= 8; }
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   468
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   469
	    _zstream->op_mode          = e_opmode_unspecified;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   470
	    _zstream->stream.avail_in  = 0;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   471
	    _zstream->stream.next_in   = Z_NULL;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   472
	    _zstream->stream.avail_out = _bfsize - 8;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   473
	    RETURN( true );
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   474
	}
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   475
	_zstream->stream.avail_out = _bfsize;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   476
	_zstream->stream.next_out  = _zstream->out_ref;
1056
44871623590b *** empty log message ***
ca
parents: 1054
diff changeset
   477
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   478
	_action  = (__INST(hitEOF) == true) ? Z_FINISH : Z_NO_FLUSH;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   479
	_errorNo = deflate( & _zstream->stream, _action );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   480
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   481
	if( _errorNo == Z_STREAM_END )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   482
	{
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   483
	    _zstream->stream.avail_in = 0;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   484
	    _zstream->stream.next_in  = Z_NULL;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   485
	    _errorNo = deflateEnd( & _zstream->stream );
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   486
	}
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   487
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   488
	if( _errorNo == Z_OK )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   489
	{
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   490
	    if( _zstream->stream.avail_out == 0 )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   491
	      RETURN( true );
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   492
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   493
	    RETURN( false );
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   494
	}
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   495
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   496
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   497
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   498
    errorNo ifNil:[
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   499
	zstream ifNil:[self errorNotOpen].
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   500
	self invalidArgument.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   501
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   502
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   503
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   504
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   505
zdeflateInit
1570
b6dd9a871cc2 Fix typo
Stefan Vogel <sv@exept.de>
parents: 1565
diff changeset
   506
    "low level - deflateInit"
b6dd9a871cc2 Fix typo
Stefan Vogel <sv@exept.de>
parents: 1565
diff changeset
   507
2193
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   508
    |errorNo level windowBits|
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   509
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   510
    errorNo := nil.
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   511
    level   := BlockSize.
2193
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   512
    windowBits := self zget_windowBits.
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   513
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   514
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   515
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   516
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   517
    if( (_zstreamObj != nil) && __isSmallInteger(level) )
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   518
    {
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   519
	int         _errorNo;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   520
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   521
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   522
	_zstream->op_mode = e_opmode_deflate;
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   523
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   524
	_errorNo = deflateInit2( & _zstream->stream
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   525
			       , __intVal( level )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   526
			       , Z_DEFLATED
2193
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   527
			       , __intVal( windowBits )
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   528
			       , DEF_MEM_LEVEL
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   529
			       , Z_DEFAULT_STRATEGY
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   530
			       );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   531
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   532
	if( _errorNo == Z_OK )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   533
	    RETURN( self );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   534
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   535
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   536
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   537
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   538
    errorNo ifNil:[
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   539
	zstream ifNil:[ self errorNotOpen ].
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   540
	self invalidArgument .
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   541
    ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   542
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   543
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   544
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   545
zget_avail_out
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   546
    "low level - get the number of available out bytes
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   547
    "
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   548
%{
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   549
    OBJ _zstreamObj = __INST( zstream );
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   550
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   551
    if( _zstreamObj != nil )
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   552
    {
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   553
	uInt        _count;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   554
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   555
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   556
	_count = _zstream->out_total - _zstream->stream.avail_out;
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   557
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   558
	RETURN( __MKSMALLINT (_count) );
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   559
    }
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   560
%}.
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   561
    self errorNotOpen.
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   562
!
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   563
2193
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   564
zget_windowBits
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   565
    "answer the bits used for inflateInit2 or deflateInit2...
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   566
    a negative WindowBits value suppresses the zlib header and the checksum..."
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   567
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   568
    |windowBits|
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   569
%{
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   570
    windowBits = __MKSMALLINT( MAX_WBITS );
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   571
%}.
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   572
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   573
    self isHeaderAndChecksumSuppressed ifTrue:[
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   574
	"/ undocumented feature.....
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   575
	^ windowBits negated
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   576
    ].
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   577
    ^ windowBits
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   578
!
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   579
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   580
zinflate
1052
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   581
    "low level - inflate
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   582
    "
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   583
    |errorNo tailError|
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   584
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   585
    tailError := nil.
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   586
    errorNo   := nil.
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   587
%{
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   588
    OBJ _zstreamObj = __INST( zstream );
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   589
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   590
    if( _zstreamObj != nil )
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   591
    {
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   592
	int         _errorNo, _count;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   593
	zstream_s * _zstream;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   594
	int         _avail_in;
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   595
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   596
	_zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   597
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   598
	if( _zstream->op_mode != e_opmode_inflate )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   599
	    RETURN( nil );
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   600
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   601
	_avail_in = _zstream->stream.avail_in;
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   602
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   603
	if( _zstream->stream.state == NULL )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   604
	{
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   605
	    /* processing finished : check crc and data length */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   606
	    Bytef * _next_in;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   607
	    Bytef * _buff;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   608
	    uLong   _tnum;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   609
	    int     _i;
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   610
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   611
	    _next_in   = _zstream->stream.next_in;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   612
	    _buff = _zstream->tail_buff;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   613
	    _tnum = _zstream->tail_size;
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   614
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   615
	    while( (_avail_in > 0) && (_tnum < 8) )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   616
	    {
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   617
	       _buff[_tnum] = * _next_in;
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   618
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   619
		++_next_in;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   620
		++_tnum;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   621
		--_avail_in;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   622
	    }
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   623
	    _zstream->tail_size = _tnum;
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   624
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   625
	    if( _tnum < 8 )                     /* test whether tail is read */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   626
		RETURN( __MKSMALLINT (0) );     /* need more data */
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   627
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   628
	    /* compute and check crc */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   629
	    for( _tnum = 0, _i = 4; --_i >= 0; _tnum = (_tnum << 8) + _buff[_i] );
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   630
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   631
	    if( _tnum != _zstream->crc_32 )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   632
		{ tailError = __MKSMALLINT( 1 ); goto badTail; }
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   633
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   634
	    /* compute and check data length */
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   635
	    for( _tnum = 0, _i = 8; --_i >= 4; _tnum = (_tnum << 8) + _buff[_i] );
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   636
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   637
	    if( _zstream->stream.total_out != _tnum )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   638
		{ tailError = __MKSMALLINT( 2 ); goto badTail; }
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   639
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   640
	    _zstream->op_mode = e_opmode_unspecified;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   641
	    RETURN( nil );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   642
	}
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   643
	if( _avail_in == 0 )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   644
	    RETURN( __MKSMALLINT (0) );
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   645
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   646
	_zstream->stream.avail_out = _zstream->out_total;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   647
	_zstream->stream.next_out  = _zstream->out_ref;
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   648
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   649
	_errorNo = inflate( & _zstream->stream, Z_NO_FLUSH );
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   650
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   651
	if( _errorNo == Z_STREAM_END )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   652
	    _errorNo = inflateEnd( & _zstream->stream );
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   653
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   654
	if( _errorNo == Z_OK )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   655
	{
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   656
	    _count = _zstream->out_total - _zstream->stream.avail_out;
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   657
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   658
	    if( _count > 0 )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   659
		_zstream->crc_32 = crc32( _zstream->crc_32, _zstream->out_ref, _count );
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   660
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   661
	    RETURN( __MKSMALLINT (_count) );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   662
	}
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   663
	errorNo = __MKSMALLINT( _errorNo );
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   664
    }
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   665
badTail:;
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   666
%}.
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   667
    errorNo ifNil:[
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   668
	tailError ifNotNil:[
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   669
	    tailError == 1 ifTrue:[
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   670
		self zerror:'invalid compressed data--crc error'
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   671
	    ].
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   672
	    self zerror:'invalid compressed data--length error'
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   673
	].
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   674
	self errorNotOpen
1061
be824dc5e0e7 *** empty log message ***
ca
parents: 1060
diff changeset
   675
    ].
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   676
    self zerror:errorNo.
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   677
!
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   678
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   679
zinflateInit
1052
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   680
    "low level - inflateInit
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   681
    "
2193
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   682
    |errorNo windowBits|
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   683
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   684
    errorNo := nil.
2193
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   685
    windowBits := self zget_windowBits.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   686
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   687
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   688
    OBJ _zstreamObj = __INST( zstream );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   689
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   690
    if( _zstreamObj != nil )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   691
    {
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   692
	int         _errorNo;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   693
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   694
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   695
	_zstream->op_mode = e_opmode_inflate;
2193
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   696
	_errorNo = inflateInit2 ( & _zstream->stream
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   697
				, __intVal( windowBits )
db70507b21ba suppress header & checksum configurable
ca
parents: 2190
diff changeset
   698
				);
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   699
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   700
	if( _errorNo == Z_OK )
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   701
	    RETURN( self );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   702
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   703
	_zstream->stream.avail_in = 0;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   704
	errorNo = __MKSMALLINT( _errorNo );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   705
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   706
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   707
    errorNo ifNil:[ self errorNotOpen ].
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   708
    self zerror:errorNo.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   709
!
1047
1cd99e473c08 *** empty log message ***
ca
parents: 1046
diff changeset
   710
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   711
zopen
1052
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   712
    "low level - opens the zip stream
055841c03c8a *** empty log message ***
ca
parents: 1051
diff changeset
   713
    "
1051
4f18d73427bb *** empty log message ***
ca
parents: 1050
diff changeset
   714
    |outTotal|
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   715
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   716
    outTotal := outputBytes size.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   717
%{
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   718
    zstream_s * _zstream = (zstream_s *) malloc( sizeof(zstream_s) );
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   719
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   720
    if( _zstream )
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   721
    {
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   722
	OBJ     _zobj   = __MKEXTERNALADDRESS( _zstream );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   723
	OBJ     _outObj = __INST( outputBytes );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   724
	OBJ     _inpObj = __INST( inputBytes  );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   725
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   726
	zmemzero( _zstream, sizeof(zstream_s) );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   727
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   728
	_zstream->in_ref           = (Bytef *) __externalBytesAddress( _inpObj );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   729
	_zstream->stream.next_in   = Z_NULL;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   730
	_zstream->stream.avail_in  = 0;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   731
	_zstream->stream.total_in  = 0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   732
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   733
	_zstream->out_total        = __intVal( outTotal );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   734
	_zstream->out_ref          = (Bytef *) __externalBytesAddress( _outObj );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   735
	_zstream->stream.next_out  = _zstream->out_ref;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   736
	_zstream->stream.avail_out = _zstream->out_total;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   737
	_zstream->stream.total_out = 0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   738
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   739
	_zstream->stream.zalloc    = (alloc_func)0;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   740
	_zstream->stream.zfree     = (free_func) 0;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   741
	_zstream->stream.opaque    = (voidpf)    0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   742
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   743
	_zstream->crc_32           = crc32( 0L, Z_NULL, 0 );
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   744
	_zstream->op_mode          = e_opmode_unspecified;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   745
	_zstream->tail_size        = 0;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   746
1195
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   747
	__INST (zstream) = _zobj;
9d887847d1b6 Add BZipStream and ZipStream
Stefan Vogel <sv@exept.de>
parents: 1193
diff changeset
   748
	__STORE(self, _zobj);
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   749
    }
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   750
%}.
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   751
!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   752
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   753
zset_avail_in:count
1570
b6dd9a871cc2 Fix typo
Stefan Vogel <sv@exept.de>
parents: 1565
diff changeset
   754
    "set the 'avail_in' and compute the crc"
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   755
%{
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   756
    OBJ _zstreamObj = __INST( zstream );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   757
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   758
    if( (_zstreamObj != nil) && __isSmallInteger(count) )
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   759
    {
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   760
	int         _count;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   761
	zstream_s * _zstream = (zstream_s *) __externalBytesAddress( _zstreamObj );
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   762
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   763
	if( (_count = __intVal( count )) > 0 )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   764
	{
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   765
	    Bytef * _in_ref = _zstream->in_ref;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   766
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   767
	    _zstream->stream.avail_in = _count;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   768
	    _zstream->stream.next_in  = _in_ref;
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   769
1828
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   770
	    if( _zstream->op_mode == e_opmode_deflate )
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   771
		_zstream->crc_32 = crc32( _zstream->crc_32, _in_ref, _count );
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   772
	} else {
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   773
	    _zstream->stream.avail_in = 0;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   774
	    _zstream->stream.next_in  = Z_NULL;
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   775
	}
47cd819e24af *** empty log message ***
ca
parents: 1619
diff changeset
   776
	RETURN( self );
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   777
    }
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   778
%}.
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   779
    zstream ifNil:[ self errorNotOpen ].
1570
b6dd9a871cc2 Fix typo
Stefan Vogel <sv@exept.de>
parents: 1565
diff changeset
   780
    self invalidArgument.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   781
! !
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   782
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   783
!ZipStream methodsFor:'startup & release'!
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   784
2196
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   785
openWithMode:aMode on:aStream suppressHeaderAndChecksum:aBoolean
2006
0ad76801137e add instance creation methods to allow to open the ZipStream as
ab
parents: 1847
diff changeset
   786
    "open stream and write or check gzip header"
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   787
2196
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   788
    super
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   789
        openWithMode:aMode
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   790
        on:aStream
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   791
        suppressHeaderAndChecksum:aBoolean.
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   792
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1061
diff changeset
   793
    self isReadable ifTrue:[
2196
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   794
        "Check for the gzip magic id"
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   795
        self readHeader
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   796
    ] ifFalse:[
2196
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   797
        "write the gzip magic id"
9eecfefd08aa suppressHeaderAndChecksum is configurable
ca
parents: 2193
diff changeset
   798
        self writeHeader
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   799
    ].
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   800
!
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   801
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   802
readHeader
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   803
    "Check for the gzip magic id"
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   804
    |flags|
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   805
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   806
    GZ_MAGIC_ID do:[:b|
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   807
        onStream nextByte ~~ b ifTrue:[ self zerror:'version error' ]
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   808
    ].
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   809
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   810
    onStream nextByte ~~ Z_DEFLATED ifTrue:[
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   811
        self zerror:'invalid method (not deflated)'
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   812
    ].
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   813
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   814
    flags := onStream nextByte.
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   815
    (flags bitAnd:HEAD_RESERVED) ~~ 0 ifTrue:[
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   816
        self zerror:'wrong data format'
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   817
    ].
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   818
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   819
    "discard time, xflags and OS code"
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   820
    onStream skip:6.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   821
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   822
    (flags bitAnd:HEAD_EXTRA_FIELD) ~~ 0 ifTrue:[|len|
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   823
        "skip the extra field"
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   824
        len := onStream nextByte + (onStream nextByte bitShift:8).
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   825
        len timesRepeat:[ onStream nextByte ].
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   826
    ].
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   827
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   828
    (flags bitAnd:HEAD_ORIG_NAME) ~~ 0 ifTrue:[
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   829
        |b|
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   830
        "skip the original file name"
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   831
        [ (b := onStream nextByte) ~~ 0 ] whileTrue.
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   832
    ].
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   833
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   834
    (flags bitAnd:HEAD_CRC) ~~ 0 ifTrue:[
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   835
        "skip the header crc"
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   836
        onStream skip:2.
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   837
    ].
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   838
!
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   839
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   840
writeHeader
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   841
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   842
    "write the gzip magic id"      
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   843
    onStream nextPutBytes:GZ_MAGIC_ID.
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   844
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   845
    "write the method"
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   846
    onStream nextPutByte:Z_DEFLATED.
1050
b7e7d51e0a9f *** empty log message ***
ca
parents: 1049
diff changeset
   847
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   848
    onStream nextPutBytes:#[
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   849
                0                    "write the flags"  
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   850
                0 0 0 0              "write time"
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   851
                0                    "write xflags"
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   852
            ].
1059
b47e4eff5543 *** empty log message ***
ca
parents: 1058
diff changeset
   853
2019
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   854
    "write OS code"
4a33a6715a51 refactored
Claus Gittinger <cg@exept.de>
parents: 2006
diff changeset
   855
    onStream nextPutByte:HEAD_OS_CODE.
1045
6f093ef80063 *** empty log message ***
ca
parents: 1044
diff changeset
   856
! !
1044
c73aee830691 initial checkin
ca
parents:
diff changeset
   857
c73aee830691 initial checkin
ca
parents:
diff changeset
   858
!ZipStream class methodsFor:'documentation'!
c73aee830691 initial checkin
ca
parents:
diff changeset
   859
c73aee830691 initial checkin
ca
parents:
diff changeset
   860
version
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   861
    ^ '$Header: /cvs/stx/stx/libbasic2/ZipStream.st,v 1.41 2014-05-19 14:41:09 stefan Exp $'
2335
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   862
!
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   863
609923563c1d change __isString() to __isStringLike() in primitive code
Stefan Vogel <sv@exept.de>
parents: 2196
diff changeset
   864
version_CVS
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   865
    ^ '$Header: /cvs/stx/stx/libbasic2/ZipStream.st,v 1.41 2014-05-19 14:41:09 stefan Exp $'
1044
c73aee830691 initial checkin
ca
parents:
diff changeset
   866
! !
1193
7688148ec90c Code formatting & clean up
Stefan Vogel <sv@exept.de>
parents: 1061
diff changeset
   867
3283
836136cf9e8d class: ZipStream
Stefan Vogel <sv@exept.de>
parents: 2639
diff changeset
   868
1047
1cd99e473c08 *** empty log message ***
ca
parents: 1046
diff changeset
   869
ZipStream initialize!