--- Compress-LZF/LZF.xs	2001/09/27 18:36:34	1.1
+++ Compress-LZF/LZF.xs	2002/04/10 14:11:48	1.11
@@ -10,6 +10,9 @@
 static STRLEN nolen_na;
 # define SvPV_nolen(sv) SvPV ((sv), nolen_na)
 #endif
+#if PATCHLEVEL < 6
+# define call_sv perl_call_sv
+#endif
 
 #include "lzf_c.c"
 #include "lzf_d.c"
@@ -18,8 +21,11 @@
 #define MAGIC_LO	0
 #define MAGIC_U		0 /* uncompressed data follows */
 #define MAGIC_C		1 /* compressed data follows */
-#define MAGIC_R		4 /* storable (reference, freeze) */
+#define MAGIC_undef	2 /* the special value undef */
 #define MAGIC_CR	3 /* storable (reference, freeze), compressed */
+#define MAGIC_R		4 /* storable (reference, freeze) */
+#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 */
 
 #define IN_RANGE(v,l,h) ((unsigned int)((unsigned)(v) - (unsigned)(l)) <= (unsigned)(h) - (unsigned)(l))
@@ -27,7 +33,7 @@
 static CV *storable_mstore, *storable_mretrieve;
 
 static SV *
-compress_sv (SV *data, char cprepend, char uprepend)
+compress_sv (SV *data, char cprepend, int uprepend)
 {
   STRLEN usize, csize;
   char *src = (char *)SvPV (data, usize);
@@ -87,14 +93,14 @@
         {
           SvCUR_set (ret, csize + skip);
         }
-      else if (!uprepend)
+      else if (uprepend < 0)
         {
           SvREFCNT_dec (ret);
           ret = SvREFCNT_inc (data);
         }
       else
         {
-          *dst++ = 0;
+          *dst++ = uprepend;
 
           Move ((void *)src, (void *)dst, usize, unsigned char);
 
@@ -187,7 +193,11 @@
 static void
 need_storable(void)
 {
+#if PATCHLEVEL < 6
+  perl_eval_pv ("require Storable;", 1);
+#else
   load_module (PERL_LOADMOD_NOIMPORT, newSVpv ("Storable", 0), Nullsv);
+#endif
 
   storable_mstore    = GvCV (gv_fetchpv ("Storable::mstore"   , TRUE, SVt_PVCV));
   storable_mretrieve = GvCV (gv_fetchpv ("Storable::mretrieve", TRUE, SVt_PVCV));
@@ -200,7 +210,7 @@
         SV *	data
         PROTOTYPE: $
         PPCODE:
-        XPUSHs (sv_2mortal (compress_sv (data, 0, 1)));
+        XPUSHs (sv_2mortal (compress_sv (data, 0, MAGIC_U)));
 
 void
 decompress(data)
@@ -218,11 +228,23 @@
         PROTOTYPE: $
         PPCODE:
 
-        if (SvROK (sv)) /* mstore */
+        SvGETMAGIC (sv);
+
+        if (!SvOK (sv))
+          XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
+        else if (SvTYPE(sv) != SVt_IV
+              && SvTYPE(sv) != SVt_NV
+              && SvTYPE(sv) != SVt_PV
+              && SvTYPE(sv) != SVt_PVMG+99999) /* mstore */
           {
+            int deref = !SvROK (sv);
+
             if (!storable_mstore)
               need_storable ();
 
+            if (deref)
+              sv = newRV_noinc (sv);
+
             PUSHMARK (SP);
             XPUSHs (sv);
             PUTBACK;
@@ -237,15 +259,18 @@
             if (SvPVX (sv)[0] != MAGIC_R)
               croak ("Storable format changed, need newer version of Compress::LZF");
 
+            if (deref)
+              SvPVX (sv)[0] = MAGIC_R_deref;
+
             if (ix) /* compress */
-              XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_CR, 0)));
-            else
-              XPUSHs (sv);
+              sv = sv_2mortal (compress_sv (sv, deref ? MAGIC_CR_deref : MAGIC_CR, -1));
+
+            XPUSHs (sv);
           }
-        else if (IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
-          XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 1))); /* need to prefix only */
+        else if (SvTYPE (sv) == SVt_PV && IN_RANGE (SvPVX (sv)[0], MAGIC_LO, MAGIC_HI))
+          XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, MAGIC_U))); /* need to prefix only */
         else if (ix == 2) /* compress always */
-          XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, 0)));
+          XPUSHs (sv_2mortal (compress_sv (sv, MAGIC_C, -1)));
         else /* don't compress */
           XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
 
@@ -254,12 +279,18 @@
 	SV *	sv
         PROTOTYPE: $
         PPCODE:
-        char hdr = SvPVX (sv)[0];
 
-        if (IN_RANGE (hdr, MAGIC_LO, MAGIC_HI))
+        int deref = 0;
+
+        SvGETMAGIC (sv);
+        if (SvPOK (sv) && IN_RANGE (SvPV_nolen (sv)[0], MAGIC_LO, MAGIC_HI))
           {
             switch (SvPVX (sv)[0])
               {
+                case MAGIC_undef:
+                  XPUSHs (sv_2mortal (NEWSV (0, 0)));
+                  break;
+
                 case MAGIC_U:
                   XPUSHs (sv_2mortal (decompress_sv (sv, 0)));
                   break;
@@ -268,9 +299,23 @@
                   XPUSHs (sv_2mortal (decompress_sv (sv, 1)));
                   break;
 
+                case MAGIC_R_deref:
+                  deref = 1;
+                  SvPVX (sv)[0] = MAGIC_R;
+                  goto handle_MAGIC_R;
+
+                case MAGIC_CR_deref:
+                  deref = 1;
                 case MAGIC_CR:
                   sv = sv_2mortal (decompress_sv (sv, 1)); /* mortal could be optimized */
+                  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?");
+
                 case MAGIC_R:
+                handle_MAGIC_R:
                   if (!storable_mstore)
                     need_storable ();
 
@@ -283,7 +328,15 @@
 
                   SPAGAIN;
 
-                  /*XPUSHs (POPs);*/
+                  if (deref)
+                    {
+                      SETs (sv_2mortal (SvREFCNT_inc (SvRV (TOPs))));
+
+                      if (SvPVX (sv)[0] == MAGIC_R)
+                        SvPVX (sv)[0] = MAGIC_R_deref;
+                    }
+                  else
+                    XPUSHs (POPs); /* this is a nop, hopefully */
 
                   break; 
 
@@ -292,4 +345,4 @@
               }
           }
         else
-          XPUSHs (sv_2mortal (SvREFCNT_inc (sv)));
+          XPUSHs (sv_2mortal (newSVsv (sv)));