ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Compress-LZF/LZF.xs
(Generate patch)

Comparing Compress-LZF/LZF.xs (file contents):
Revision 1.20 by root, Fri Jul 7 15:47:10 2006 UTC vs.
Revision 1.26 by root, Mon Sep 22 02:15:43 2008 UTC

1#include "EXTERN.h" 1#include "EXTERN.h"
2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5/* try to be compatible with older perls */ 5#define LZF_STANDALONE 1
6/* SvPV_nolen() macro first defined in 5.005_55 */ 6#define LZF_STATE_ARG 1
7/* this is slow, not threadsafe, but works */
8#include "patchlevel.h"
9#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55))
10static STRLEN nolen_na;
11# define SvPV_nolen(sv) SvPV ((sv), nolen_na)
12#endif
13#if PATCHLEVEL < 6
14# define call_sv perl_call_sv
15#endif
16 7
17#include "lzf_c.c" 8#include "lzf_c.c"
18#include "lzf_d.c" 9#include "lzf_d.c"
19 10
20/* we re-use the storable header for our purposes */ 11/* we re-use the storable header for our purposes */
… …
41#endif 32#endif
42 33
43static SV * 34static SV *
44compress_sv (SV *data, char cprepend, int uprepend) 35compress_sv (SV *data, char cprepend, int uprepend)
45{ 36{
37 LZF_STATE *state;
46 STRLEN usize, csize; 38 STRLEN usize, csize;
47 char *src = (char *)SvPV (data, usize); 39 char *src = (char *)SvPVbyte (data, usize);
48 40
49 if (usize) 41 if (usize)
50 { 42 {
51 SV *ret = NEWSV (0, usize + 1); 43 SV *ret = NEWSV (0, usize + 1);
52 unsigned char *dst; 44 unsigned char *dst;
… …
98 dst[skip++] = (( usize & 0x3f) | 0x80); 90 dst[skip++] = (( usize & 0x3f) | 0x80);
99 } 91 }
100 else 92 else
101 croak ("compress can only compress up to %ld bytes", 0x7fffffffL); 93 croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
102 94
95 New (0, state, 1, LZF_STATE);
96 if (!state)
97 croak ("Compress::LZF unable to allocate memory for compression state");
98
103 /* 11 bytes is the smallest compressible string */ 99 /* 11 bytes is the smallest compressible string */
104 csize = usize < 11 ? 0 : 100 csize = usize < 11 ? 0 :
105 lzf_compress (src, usize, 101 lzf_compress (src, usize, dst + skip, usize - skip, *state);
106 dst + skip, 102
107 usize - skip); 103 Safefree (state);
108 104
109 if (csize) 105 if (csize)
110 { 106 {
111 SvCUR_set (ret, csize + skip); 107 SvCUR_set (ret, csize + skip);
112 } 108 }
… …
132 128
133static SV * 129static SV *
134decompress_sv (SV *data, int skip) 130decompress_sv (SV *data, int skip)
135{ 131{
136 STRLEN usize, csize; 132 STRLEN usize, csize;
137 unsigned char *src = (unsigned char *)SvPV (data, csize) + skip; 133 unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
138 134
139 if (csize) 135 if (csize)
140 { 136 {
141 void *dst; 137 void *dst;
142 SV *ret; 138 SV *ret;
143 139
144 csize -= skip; 140 csize -= skip;
145 141
146 if (src[0]) 142 if (src[0])
147 { 143 {
148 if (!(src[0] & 0x80)) 144 if (!(src[0] & 0x80) && csize >= 1)
149 { 145 {
150 csize -= 1; 146 csize -= 1;
151 usize = *src++ & 0xff; 147 usize = *src++ & 0xff;
152 } 148 }
153 else if (!(src[0] & 0x20)) 149 else if (!(src[0] & 0x20) && csize >= 2)
154 { 150 {
155 csize -= 2; 151 csize -= 2;
156 usize = *src++ & 0x1f; 152 usize = *src++ & 0x1f;
157 usize = (usize << 6) | (*src++ & 0x3f); 153 usize = (usize << 6) | (*src++ & 0x3f);
158 } 154 }
159 else if (!(src[0] & 0x10)) 155 else if (!(src[0] & 0x10) && csize >= 3)
160 { 156 {
161 csize -= 3; 157 csize -= 3;
162 usize = *src++ & 0x0f; 158 usize = *src++ & 0x0f;
163 usize = (usize << 6) | (*src++ & 0x3f); 159 usize = (usize << 6) | (*src++ & 0x3f);
164 usize = (usize << 6) | (*src++ & 0x3f); 160 usize = (usize << 6) | (*src++ & 0x3f);
165 } 161 }
166 else if (!(src[0] & 0x08)) 162 else if (!(src[0] & 0x08) && csize >= 4)
167 { 163 {
168 csize -= 4; 164 csize -= 4;
169 usize = *src++ & 0x07; 165 usize = *src++ & 0x07;
170 usize = (usize << 6) | (*src++ & 0x3f); 166 usize = (usize << 6) | (*src++ & 0x3f);
171 usize = (usize << 6) | (*src++ & 0x3f); 167 usize = (usize << 6) | (*src++ & 0x3f);
172 usize = (usize << 6) | (*src++ & 0x3f); 168 usize = (usize << 6) | (*src++ & 0x3f);
173 } 169 }
174 else if (!(src[0] & 0x04)) 170 else if (!(src[0] & 0x04) && csize >= 5)
175 { 171 {
176 csize -= 5; 172 csize -= 5;
177 usize = *src++ & 0x03; 173 usize = *src++ & 0x03;
178 usize = (usize << 6) | (*src++ & 0x3f); 174 usize = (usize << 6) | (*src++ & 0x3f);
179 usize = (usize << 6) | (*src++ & 0x3f); 175 usize = (usize << 6) | (*src++ & 0x3f);
180 usize = (usize << 6) | (*src++ & 0x3f); 176 usize = (usize << 6) | (*src++ & 0x3f);
181 usize = (usize << 6) | (*src++ & 0x3f); 177 usize = (usize << 6) | (*src++ & 0x3f);
182 } 178 }
183 else if (!(src[0] & 0x02)) 179 else if (!(src[0] & 0x02) && csize >= 6)
184 { 180 {
185 csize -= 6; 181 csize -= 6;
186 usize = *src++ & 0x01; 182 usize = *src++ & 0x01;
187 usize = (usize << 6) | (*src++ & 0x3f); 183 usize = (usize << 6) | (*src++ & 0x3f);
188 usize = (usize << 6) | (*src++ & 0x3f); 184 usize = (usize << 6) | (*src++ & 0x3f);
189 usize = (usize << 6) | (*src++ & 0x3f); 185 usize = (usize << 6) | (*src++ & 0x3f);
190 usize = (usize << 6) | (*src++ & 0x3f); 186 usize = (usize << 6) | (*src++ & 0x3f);
191 usize = (usize << 6) | (*src++ & 0x3f); 187 usize = (usize << 6) | (*src++ & 0x3f);
192 } 188 }
193 else 189 else
190 croak ("compressed data corrupted (invalid length)");
191
192 if (!usize)
194 croak ("compressed data corrupted (invalid length)"); 193 croak ("compressed data corrupted (invalid length)");
195 194
196 ret = NEWSV (0, usize); 195 ret = NEWSV (0, usize);
197 SvPOK_only (ret); 196 SvPOK_only (ret);
198 dst = SvPVX (ret); 197 dst = SvPVX (ret);
199 198
200 if (lzf_decompress (src, csize, dst, usize) != usize) 199 if (lzf_decompress (src, csize, dst, usize) != usize)
200 {
201 SvREFCNT_dec (ret);
201 croak ("compressed data corrupted (size mismatch)", csize, skip, usize); 202 croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
203 }
202 } 204 }
203 else 205 else
204 { 206 {
205 usize = csize - 1; 207 usize = csize - 1;
206 ret = NEWSV (0, usize); 208 ret = NEWSV (0, usize | 1);
207 SvPOK_only (ret); 209 SvPOK_only (ret);
208 210
209 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char); 211 Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
210 } 212 }
211 213
… …
218} 220}
219 221
220static void 222static void
221need_storable(void) 223need_storable(void)
222{ 224{
223#if PATCHLEVEL < 6
224 char req[8192];
225 sprintf (req, "require %s;", SvPV_nolen (serializer_package));
226 perl_eval_pv (req, 1);
227#else
228 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv); 225 load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
229#endif
230 226
231 storable_mstore = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore ), TRUE, SVt_PVCV)); 227 storable_mstore = GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore ), TRUE, SVt_PVCV));
232 storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV)); 228 storable_mretrieve = GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
233} 229}
234 230
235MODULE = Compress::LZF PACKAGE = Compress::LZF 231MODULE = Compress::LZF PACKAGE = Compress::LZF
236 232
237BOOT: 233BOOT:
… …
278 SvGETMAGIC (sv); 274 SvGETMAGIC (sv);
279 275
280 if (!SvOK (sv)) 276 if (!SvOK (sv))
281 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */ 277 XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
282 else if (SvROK (sv) 278 else if (SvROK (sv)
279 || SvUTF8 (sv)
283 || (SvTYPE(sv) != SVt_IV 280 || (SvTYPE(sv) != SVt_IV
284 && SvTYPE(sv) != SVt_NV 281 && SvTYPE(sv) != SVt_NV
285 && SvTYPE(sv) != SVt_PV 282 && SvTYPE(sv) != SVt_PV
286 && SvTYPE(sv) != SVt_PVIV 283 && SvTYPE(sv) != SVt_PVIV
287 && SvTYPE(sv) != SVt_PVNV 284 && SvTYPE(sv) != SVt_PVNV
288 && SvTYPE(sv) != SVt_PVMG)) /* mstore */ 285 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
289 { 286 {
290 int deref = !SvROK (sv); 287 int deref = !SvROK (sv);
288 char *pv;
291 289
292 if (!storable_mstore) 290 if (!storable_mstore)
291 {
292 PUTBACK;
293 need_storable (); 293 need_storable ();
294 SPAGAIN;
295 }
294 296
295 if (deref) 297 if (deref)
296 sv = newRV_noinc (sv); 298 sv = newRV_noinc (sv);
297 299
298 PUSHMARK (SP); 300 PUSHMARK (SP);
… …
303 croak ("Storable::mstore didn't return a single scalar"); 305 croak ("Storable::mstore didn't return a single scalar");
304 306
305 SPAGAIN; 307 SPAGAIN;
306 308
307 sv = POPs; 309 sv = POPs;
310 pv = SvPV_nolen (sv);
308 311
309 if (SvPVX (sv)[0] == MAGIC_R) 312 if (*pv == MAGIC_R)
310 { 313 {
311 if (deref) 314 if (deref)
312 SvPVX (sv)[0] = MAGIC_R_deref; 315 *pv = MAGIC_R_deref;
313 } 316 }
314 else 317 else
315 { 318 {
316 char pfx[2]; 319 char pfx[2];
317 320
… …
347{ 350{
348 STRLEN svlen; 351 STRLEN svlen;
349 int deref = 0; 352 int deref = 0;
350 353
351 SvGETMAGIC (sv); 354 SvGETMAGIC (sv);
352 if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI)) 355 if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
353 { 356 {
354 redo: 357 redo:
355 358
356 switch (SvPVX (sv)[0]) 359 switch (SvPVX (sv)[0])
357 { 360 {
… …
366 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?"); 369 croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
367 370
368 sv_chop (sv, SvPVX (sv) + 2); 371 sv_chop (sv, SvPVX (sv) + 2);
369 372
370 if (!storable_mstore) 373 if (!storable_mstore)
374 {
375 PUTBACK;
371 need_storable (); 376 need_storable ();
377 SPAGAIN;
378 }
372 379
373 PUSHMARK (SP); 380 PUSHMARK (SP);
374 XPUSHs (sv); 381 XPUSHs (sv);
375 PUTBACK; 382 PUTBACK;
376 383
… …
410 goto redo; 417 goto redo;
411 418
412 case MAGIC_R: 419 case MAGIC_R:
413 handle_MAGIC_R: 420 handle_MAGIC_R:
414 if (!storable_mstore) 421 if (!storable_mstore)
422 {
423 PUTBACK;
415 need_storable (); 424 need_storable ();
425 SPAGAIN;
426 }
416 427
417 PUSHMARK (SP); 428 PUSHMARK (SP);
418 XPUSHs (sv); 429 XPUSHs (sv);
419 PUTBACK; 430 PUTBACK;
420 431

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines