Large dos2unix commit...

1 files changed, 44 insertions, 44 deletions

diff --git a/lib/Regex.cc b/lib/Regex.cc
index 2a86db8..258d378 100644
--- a/lib/Regex.cc
+++ b/lib/Regex.cc
@@ -1,44 +1,44 @@
-#ifdef HAVE_CONFIG_H

-#include "config.h"

-#endif

-#include "Regex.h"

-#include "gettext.h"

-

-char t[1024];

-

-Regex empty("^$"), any(".*");

-

-Regex::Regex(const String & regex, int acflags, int aeflags) throw (GeneralException) : cflags(acflags), eflags(aeflags), pattern(regex.strdup()) {

-    int r;

-    

-    if ((r = regcomp(&preg, pattern, cflags | REG_NOSUB))) {

-	std::cerr << _("Error in regcomp:");

-	regerror(r, &preg, t, sizeof(t));

-	std::cerr << t << std::endl;

-	throw GeneralException(String(_("Regex \"")) + regex + _("\" failed to compile: ") + t + "\n");

-    }

-}

-

-Regex::Regex(const Regex & regex) : pattern(Base::strdup(pattern)) {

-    int r;

-    

-    if ((r = regcomp(&preg, pattern, cflags | REG_NOSUB))) {

-	printm(M_ERROR, _("Error in regcomp:"));

-	regerror(r, &preg, t, sizeof(t));

-	printm(M_ERROR, "%s\n", t);

-	throw GeneralException(String(_("Regex \"")) + pattern + _("\" failed to compile: ") + t + "\n");

-    }

-}

-

-Regex::~Regex() {

-    regfree(&preg);

-    free(pattern);

-}

-

-bool Regex::Match(const String & s) const {

-    if (regexec(&preg, s.to_charp(), 0, 0, eflags)) {

-	return false;

-    } else {

-	return true;

-    }

-}

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "Regex.h"
+#include "gettext.h"
+
+char t[1024];
+
+Regex empty("^$"), any(".*");
+
+Regex::Regex(const String & regex, int acflags, int aeflags) throw (GeneralException) : cflags(acflags), eflags(aeflags), pattern(regex.strdup()) {
+    int r;
+    
+    if ((r = regcomp(&preg, pattern, cflags | REG_NOSUB))) {
+	std::cerr << _("Error in regcomp:");
+	regerror(r, &preg, t, sizeof(t));
+	std::cerr << t << std::endl;
+	throw GeneralException(String(_("Regex \"")) + regex + _("\" failed to compile: ") + t + "\n");
+    }
+}
+
+Regex::Regex(const Regex & regex) : pattern(Base::strdup(pattern)) {
+    int r;
+    
+    if ((r = regcomp(&preg, pattern, cflags | REG_NOSUB))) {
+	printm(M_ERROR, _("Error in regcomp:"));
+	regerror(r, &preg, t, sizeof(t));
+	printm(M_ERROR, "%s\n", t);
+	throw GeneralException(String(_("Regex \"")) + pattern + _("\" failed to compile: ") + t + "\n");
+    }
+}
+
+Regex::~Regex() {
+    regfree(&preg);
+    free(pattern);
+}
+
+bool Regex::Match(const String & s) const {
+    if (regexec(&preg, s.to_charp(), 0, 0, eflags)) {
+	return false;
+    } else {
+	return true;
+    }
+}