--- Compress-LZF/LZF.xs	2004/08/03 15:07:51	1.19
+++ Compress-LZF/LZF.xs	2006/07/07 15:47:10	1.20
@@ -27,12 +27,19 @@
 #define MAGIC_CR_deref	5 /* storable (NO reference, freeze), compressed */
 #define MAGIC_R_deref	6 /* storable (NO reference, freeze) */
 #define MAGIC_HI	7 /* room for one higher storable major */
+/* for historical reasons, MAGIC_undef + MAGIC_R and MAGIC_undef + MAGIC_R_deref are used, too */
 
 #define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
 
 static SV *serializer_package, *serializer_mstore, *serializer_mretrieve;
 static CV *storable_mstore, *storable_mretrieve;
 
+#if Size_t_size > 4
+# define MAX_LENGTH ((Size_t)0x80000000L)
+#else
+# define MAX_LENGTH ((Size_t) 0x8000000L)
+#endif
+
 static SV *
 compress_sv (SV *data, char cprepend, int uprepend)
 {
@@ -51,29 +58,29 @@
       if (cprepend)
         dst[skip++] = cprepend;
 
-      if (usize < 0x80)
+      if (usize <= 0x7f)
         {
           dst[skip++] = usize;
         }
-      else if (usize < 0x800) 
+      else if (usize <= 0x7ff) 
         {
           dst[skip++] = (( usize >>  6)         | 0xc0);
           dst[skip++] = (( usize        & 0x3f) | 0x80);
         }
-      else if (usize < 0x10000) 
+      else if (usize <= 0xffff) 
         {
           dst[skip++] = (( usize >> 12)         | 0xe0);
           dst[skip++] = (((usize >>  6) & 0x3f) | 0x80);
           dst[skip++] = (( usize        & 0x3f) | 0x80);
         }
-      else if (usize < 0x200000) 
+      else if (usize <= 0x1fffff) 
         {
           dst[skip++] = (( usize >> 18)         | 0xf0);
           dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
           dst[skip++] = (((usize >>  6) & 0x3f) | 0x80);
           dst[skip++] = (( usize        & 0x3f) | 0x80);
         }
-      else if (usize < 0x4000000) 
+      else if (usize <= 0x3ffffff) 
         {
           dst[skip++] = (( usize >> 24)         | 0xf8);
           dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
@@ -81,8 +88,17 @@
           dst[skip++] = (((usize >>  6) & 0x3f) | 0x80);
           dst[skip++] = (( usize        & 0x3f) | 0x80);
         }
+      else if (usize <= 0x7fffffff) 
+        {
+          dst[skip++] = (( usize >> 30)         | 0xfc);
+          dst[skip++] = (((usize >> 24) & 0x3f) | 0x80);
+          dst[skip++] = (((usize >> 18) & 0x3f) | 0x80);
+          dst[skip++] = (((usize >> 12) & 0x3f) | 0x80);
+          dst[skip++] = (((usize >>  6) & 0x3f) | 0x80);
+          dst[skip++] = (( usize        & 0x3f) | 0x80);
+        }
       else
-        croak ("compress can only compress up to %ld bytes", 0x4000000-1);
+        croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
 
       /* 11 bytes is the smallest compressible string */
       csize = usize < 11 ? 0 :
@@ -164,6 +180,16 @@
               usize = (usize << 6) | (*src++ & 0x3f);
               usize = (usize << 6) | (*src++ & 0x3f);
             }
+          else if (!(src[0] & 0x02))
+            {
+              csize -= 6;
+              usize =                 *src++ & 0x01;
+              usize = (usize << 6) | (*src++ & 0x3f);
+              usize = (usize << 6) | (*src++ & 0x3f);
+              usize = (usize << 6) | (*src++ & 0x3f);
+              usize = (usize << 6) | (*src++ & 0x3f);
+              usize = (usize << 6) | (*src++ & 0x3f);
+            }
           else
             croak ("compressed data corrupted (invalid length)");
                     
@@ -210,7 +236,7 @@
 
 BOOT:
         serializer_package   = newSVpv ("Storable", 0);
-        serializer_mstore    = newSVpv ("Storable::mstore", 0);
+        serializer_mstore    = newSVpv ("Storable::net_mstore", 0);
         serializer_mretrieve = newSVpv ("Storable::mretrieve", 0);
 
 void
@@ -280,11 +306,20 @@
 
             sv = POPs;
 
-            if (SvPVX (sv)[0] != MAGIC_R)
-              croak ("Storable format changed, need newer version of Compress::LZF");
+            if (SvPVX (sv)[0] == MAGIC_R)
+              {
+                if (deref)
+                  SvPVX (sv)[0] = MAGIC_R_deref;
+              }
+            else
+              {
+                char pfx[2];
+
+                pfx[0] = MAGIC_undef;
+                pfx[1] = deref ? MAGIC_R_deref : MAGIC_R;
 
-            if (deref)
-              SvPVX (sv)[0] = MAGIC_R_deref;
+                sv_insert (sv, 0, 0, pfx, 2);
+              }
 
             if (ix) /* compress */
               sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
@@ -309,16 +344,46 @@
 	SV *	sv
         PROTOTYPE: $
         PPCODE:
-
+{
+        STRLEN svlen;
         int deref = 0;
 
         SvGETMAGIC (sv);
-        if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))
+        if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
           {
+            redo:
+
             switch (SvPVX (sv)[0])
               {
                 case MAGIC_undef:
-                  XPUSHs (sv_2mortal (NEWSV (0, 0)));
+                  if (svlen <= 1)
+                    XPUSHs (sv_2mortal (NEWSV (0, 0)));
+                  else
+                    {
+                      if (SvPVX (sv)[1] == MAGIC_R_deref)
+                        deref = 1;
+                      else if (SvPVX (sv)[1] != MAGIC_R)
+                        croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
+
+                      sv_chop (sv, SvPVX (sv) + 2);
+
+                      if (!storable_mstore)
+                        need_storable ();
+
+                      PUSHMARK (SP);
+                      XPUSHs (sv);
+                      PUTBACK;
+
+                      if (1 != call_sv ((SV *)storable_mretrieve, G_SCALAR))
+                        croak ("Storable::mstore didn't return a single scalar");
+
+                      SPAGAIN;
+
+                      if (deref)
+                        SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
+                      else
+                        SETs (sv_2mortal (newSVsv (TOPs)));
+                    }
                   break;
 
                 case MAGIC_U:
@@ -341,8 +406,8 @@
                   if (deref)
                     if (SvPVX (sv)[0] == MAGIC_R_deref)
                       SvPVX (sv)[0] = MAGIC_R;
-                    else
-                      croak ("Compress::LZF::sthaw(): invalid data, maybe you need a newer version of Compress::LZF?");
+
+                  goto redo;
 
                 case MAGIC_R:
                 handle_MAGIC_R:
@@ -376,4 +441,5 @@
           }
         else
           XPUSHs (sv_2mortal (newSVsv (sv)));
+}