--- deliantra/server/include/cfperl.h	2006/08/30 06:06:27	1.14
+++ deliantra/server/include/cfperl.h	2006/08/31 06:23:19	1.17
@@ -4,11 +4,37 @@
 #ifndef CFPERL_H__
 #define CFPERL_H__
 
+#include <cstdio>
+
+using namespace std;
+
+#include <EXTERN.h>
+#include <perl.h>
+
+#include "keyword.h"
+
+// optimisations/workaround for functions requiring my_perl in scope (anti-bloat)
+#undef localtime
+#undef srand48
+#undef drand48
+#undef srandom
+#undef readdir
+#undef getprotobyname
+#undef gethostbyname
+#undef ctime
+#undef strerror
+
+// perl bug #40256: perl does overwrite those with reentrant versions
+// but does not initialise their state structures.
+#undef random
+#undef crypt
+
 struct pl;
 struct object;
 struct mapstruct;
 
 void cfperl_init ();
+void cfperl_boot ();
 void cfperl_main ();
 
 // could have used templates, but a more traditional C api
@@ -82,7 +108,8 @@
 
 struct attachable_base
 {
-  void *self, *cb;    // CF+ perl self and callback
+  SV *self;
+  AV *cb;    // CF+ perl self and callback
   const char *attach; // generic extension attachment information
 
   void clear ();     // called when free'ing objects
@@ -91,7 +118,8 @@
 
   void attachable_init ()
   {
-    self = cb = 0;
+    self   = 0;
+    cb     = 0;
     attach = 0;
   }
 };
@@ -114,19 +142,12 @@
   }
 };
 
-struct object_freezethaw
-{
-  void *av;
-  FILE *fp;
-
-  operator FILE *() { return fp; }
-};
-
-struct object_freezer : object_freezethaw
+struct object_freezer
 {
-  void *filename;
+  AV *av;
+  SV *text;
 
-  object_freezer (const char *filename);
+  object_freezer ();
   ~object_freezer ();
 
   void put (attachable_base *ext);
@@ -136,10 +157,30 @@
   {
     put ((attachable_base *)obj);
   }
+
+  bool save (const char *filename);
+
+  operator bool () { return !!av; }
+};
+
+// compatibility support, should be removed when no longer needed
+int fprintf (object_freezer &freezer, const char *format, ...);
+int fputs (const char *s, object_freezer &freezer);
+
+// a single key-value line from a file
+struct token {
+   keyword k;
+   const char *v;
+
+   token (keyword k, const char *v = 0) : k(k), v(v) { }
 };
 
-struct object_thawer : object_freezethaw
+struct object_thawer
 {
+  AV *av;
+  FILE *fp;
+  char line[1024];
+
   object_thawer (const char *filename = 0);
   ~object_thawer ();
 
@@ -151,6 +192,10 @@
     if (av)
       get (subclass::get_dt (), (subclass *)obj, obj, oid);
   }
+
+  token get_token ();
+
+  operator FILE *() { return fp; }
 };
 
 #endif