major cleanup, now handles nested multipart mime

1 files changed, 5 insertions, 4 deletions

diff --git a/tools/libskrewt.h b/tools/libskrewt.h
index 5ae6ece..34cdfd3 100644
--- a/tools/libskrewt.h
+++ b/tools/libskrewt.h
@@ -31,30 +31,31 @@ public:
   std::string content_type;
   std::list<std::string> delivered_to;
   int msgsize;
-  std::vector<std::string> bigbuf;
   int saw_blank_line;
   int recno;
-
   int maxsize;
   int error_exit;
   int mid_required;
+  std::vector<std::string> headerbuf;
+  std::vector<std::string> bigbuf;
+  xstr lookahead;
 
   // constructor
   skrewt()
   : spf_result(SPF_RESULT_INVALID),
     boundary("x-xx-x"), msgsize(0), saw_blank_line(0), recno(0),
     maxsize(1000*1000), error_exit(0), mid_required(0),
+    headerbuf(0), bigbuf(0),
     lookahead(1, "")
   {}
 
   xstr getRecord(std::istream& xin);
   xstr getLine(std::istream& xin);
   int headers(std::istream& xin);
-  int dump_headers(std::ostream& xout);
+  int dump_bigbuf(std::ostream& xout);
   int interstage();
   int body(std::istream& xin, std::ostream& xout);
   int krunch_rfrom();
-  xstr lookahead;
 };
 
 void parse_content(const std::string type_spec_line,