From: glyn Date: Mon, 5 Oct 2015 15:18:32 +0000 (+0100) Subject: No need to escape standard characters. X-Git-Url: https://git.8kb.co.uk/?p=dataflex%2Fdfregex;a=commitdiff_plain;h=HEAD No need to escape standard characters. --- diff --git a/README.md b/README.md index f560778..25d0770 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ -POSIX Regex functions for DataFlex 3.2 --------------------------------------- - -Requires: -* DataFlex 3.1c onwards -* GCC or compatible compiler like MinGW -* GNU regex libraries for windows - http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex - -I created this because despite VDF (Visual Dataflex) users being able to leverage -vbscript.dll in Windows via COM to do regex operations, it seems that Console Mode -users are out of luck. - -Despite being GNU libraries, this is intended to be used on Microsoft Windows -using the DataFlex external_function import. No doubt if you're using DataFlex -on Unix you can get these to work with minimal modifications. +POSIX Regex functions for DataFlex 3.2 +-------------------------------------- + +Requires: + DataFlex 3.1c onwards + GCC or compatible compiler like MinGW + GNU regex libraries for windows + http://sourceforge.net/projects/mingw/files/Other/UserContributed/regex + +I created this because despite VDF (Visual Dataflex) users being able to leverage +vbscript.dll in Windows via COM to do regex operations, it seems that Console Mode +users are out of luck. + +Despite being GNU libraries, this is intended to be used on Microsoft Windows +using the DataFlex external_function import. No doubt if you're using DataFlex +on Unix you can get these to work with minimal modifications. diff --git a/bin/dfregex.dll b/bin/dfregex.dll index dd1766f..68cc21d 100644 Binary files a/bin/dfregex.dll and b/bin/dfregex.dll differ diff --git a/src/c/gnuregex.c b/src/c/gnuregex.c index 611c990..409d4dd 100644 --- a/src/c/gnuregex.c +++ b/src/c/gnuregex.c @@ -30,7 +30,7 @@ static char * quote_output(char *str) { /* Check for characters that need quoting */ for (ptr = str; *ptr; ptr++) { char ch = *ptr; - if (ch == '\"' || ch =='\\' || ch == '\{' || ch == ',') { + if (ch == '"' || ch =='\\' || ch == '{' || ch == ',') { do_quote = 1; break; } diff --git a/src/c/libdfregex.a b/src/c/libdfregex.a index 575172c..9be8358 100644 Binary files a/src/c/libdfregex.a and b/src/c/libdfregex.a differ