merge

ZString.h

@@ -60,14 +60,18 @@ namespace coreutils
 
     ZString(const char *data, size_t length);
 
+    ZString(unsigned char *data, size_t length);
+
+    ///
     ///
-    /// Consructor providing a copy of a ZString.
     ///
 
     ZString(const ZString &zstring);
 
+    ZString(const unsigned char *data, size_t length);
+
     ///
-    /// Consructor from a string.
+    /// Consructor providing a copy of a ZString.
     ///
 
     ZString(std::string &string);
@@ -95,7 +99,8 @@ namespace coreutils
     friend std::ostream &operator+(std::ostream &os, const char *value);
 
     ///
-    ///
+    /// A friend method used to write the value of the ZString
+    /// to an ostream using the << syntax.
     ///
 
     bool operator<(const ZString &valuex) const;
@@ -298,7 +303,14 @@ namespace coreutils
     ZString readBlock(size_t size);
 
     ///
-    /// Return a pointer to the beginning of the ZString data.
+    ///
+    ///
+
+    int find(ZString comparator);
+
+    ///
+    /// Return a block of data as a ZString from the cursor location for
+    /// the number of bytes specified by size.
     ///
 
     char *getData();
@@ -362,6 +374,25 @@ namespace coreutils
 
     void nextChar();
 
+  protected:
+    char *data;
+    char *cursor;
+    size_t length;
+    char *cdata = NULL;
+    std::vector<ZString> list;
+
+    ///
+    ///
+    ///
+
+    bool boolValue();
+
+    ///
+    ///
+    ///
+
+    void nextChar();
+
   protected:
     char *data;
     char *cursor;