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