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