Regex done!

2 files changed, 12 insertions, 2 deletions

diff --git a/include/ReadJob.h b/include/ReadJob.h
index ae0eef7..7d4bfc7 100644
--- a/include/ReadJob.h
+++ b/include/ReadJob.h
@@ -8,13 +8,14 @@
 
 class ReadJob : public Task {
   public:
-      ReadJob(Handle *, Handle *);
+      ReadJob(Handle *, Handle *, const Regex & = empty);
       virtual ~ReadJob();
     virtual int Do() throw (GeneralException);
     virtual String GetName();
 
   private:
     Handle * s, * d;
+    const Regex * regex;
 };
 
 #else
diff --git a/include/Regex.h b/include/Regex.h
index 6786041..1fc7197 100644
--- a/include/Regex.h
+++ b/include/Regex.h
@@ -3,13 +3,22 @@
 #ifdef __cplusplus
 
 #include <Exceptions.h>
+#include <String.h>
+
+#include <regex.h>
 
 class Regex : public Base {
   public:
-
+      Regex(const String &, int = REG_EXTENDED | REG_ICASE, int = 0) throw (GeneralException);
+      ~Regex();
+    bool Match(const String &) const;
   private:
+    regex_t preg;
+    int eflags;
 };
 
+extern Regex empty, any;
+
 #else
 #error This only works with a C++ compiler
 #endif