Conversion code update (revised option definitions).

git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@789 6239d852-aaf2-0410-a92c-79f79f948069

4 files changed, 32 insertions, 20 deletions

diff --git a/src/pcre2.h b/src/pcre2.h
index ee2ffb7..e4c867b 100644
--- a/src/pcre2.h
+++ b/src/pcre2.h
@@ -182,12 +182,15 @@ ignored for pcre2_jit_match(). */
 
 /* Options for pcre2_pattern_convert(). */
 
-#define PCRE2_CONVERT_UTF             0x00000001u
-#define PCRE2_CONVERT_NO_UTF_CHECK    0x00000002u
-#define PCRE2_CONVERT_GLOB_BASIC      0x00000004u
-#define PCRE2_CONVERT_GLOB_BASH       0x00000008u
-#define PCRE2_CONVERT_POSIX_BASIC     0x00000010u
-#define PCRE2_CONVERT_POSIX_EXTENDED  0x00000020u
+#define PCRE2_CONVERT_UTF                    0x00000001u
+#define PCRE2_CONVERT_NO_UTF_CHECK           0x00000002u
+#define PCRE2_CONVERT_POSIX_BASIC            0x00000004u
+#define PCRE2_CONVERT_POSIX_EXTENDED         0x00000008u
+#define PCRE2_CONVERT_GLOB                   0x00000010u
+#define PCRE2_CONVERT_GLOB_NO_BACKSLASH      0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR       0x00000090u
+#define PCRE2_CONVERT_GLOB_BASIC             0x000000f0u
 
 /* Newline and \R settings, for use in compile contexts. The newline values
 must be kept in step with values set in config.h and both sets must all be
diff --git a/src/pcre2.h.in b/src/pcre2.h.in
index 2d90888..392dbe8 100644
--- a/src/pcre2.h.in
+++ b/src/pcre2.h.in
@@ -182,12 +182,15 @@ ignored for pcre2_jit_match(). */
 
 /* Options for pcre2_pattern_convert(). */
 
-#define PCRE2_CONVERT_UTF             0x00000001u
-#define PCRE2_CONVERT_NO_UTF_CHECK    0x00000002u
-#define PCRE2_CONVERT_GLOB_BASIC      0x00000004u
-#define PCRE2_CONVERT_GLOB_BASH       0x00000008u
-#define PCRE2_CONVERT_POSIX_BASIC     0x00000010u
-#define PCRE2_CONVERT_POSIX_EXTENDED  0x00000020u
+#define PCRE2_CONVERT_UTF                    0x00000001u
+#define PCRE2_CONVERT_NO_UTF_CHECK           0x00000002u
+#define PCRE2_CONVERT_POSIX_BASIC            0x00000004u
+#define PCRE2_CONVERT_POSIX_EXTENDED         0x00000008u
+#define PCRE2_CONVERT_GLOB                   0x00000010u
+#define PCRE2_CONVERT_GLOB_NO_BACKSLASH      0x00000030u
+#define PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR 0x00000050u
+#define PCRE2_CONVERT_GLOB_NO_STARSTAR       0x00000090u
+#define PCRE2_CONVERT_GLOB_BASIC             0x000000f0u
 
 /* Newline and \R settings, for use in compile contexts. The newline values
 must be kept in step with values set in config.h and both sets must all be
diff --git a/src/pcre2_convert.c b/src/pcre2_convert.c
index e2cb0b6..e539837 100644
--- a/src/pcre2_convert.c
+++ b/src/pcre2_convert.c
@@ -45,11 +45,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include "pcre2_internal.h"
 
-#define TYPE_OPTIONS (PCRE2_CONVERT_GLOB_BASIC|PCRE2_CONVERT_GLOB_BASH| \
+#define TYPE_OPTIONS (PCRE2_CONVERT_GLOB| \
   PCRE2_CONVERT_POSIX_BASIC|PCRE2_CONVERT_POSIX_EXTENDED)
 
 #define ALL_OPTIONS (PCRE2_CONVERT_UTF|PCRE2_CONVERT_NO_UTF_CHECK| \
-  TYPE_OPTIONS)
+  PCRE2_CONVERT_GLOB_NO_BACKSLASH|PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR| \
+  PCRE2_CONVERT_GLOB_NO_STARSTAR|TYPE_OPTIONS)
 
 #define DUMMY_BUFFER_SIZE 100
 
@@ -1128,15 +1129,17 @@ for (i = 0; i < 2; i++)
 
   switch(pattype)
     {
-    case PCRE2_CONVERT_GLOB_BASIC:
+    case PCRE2_CONVERT_GLOB:
     rc = convert_glob(pattype, pattern, plength, utf, use_buffer, use_length,
       bufflenptr, dummyrun, ccontext);
     break;
 
+/*
     case PCRE2_CONVERT_GLOB_BASH:
     rc = convert_glob_bash(options, pattern, plength, utf, use_buffer, use_length,
       bufflenptr, dummyrun, ccontext);
     break;
+*/     
 
     case PCRE2_CONVERT_POSIX_BASIC:
     case PCRE2_CONVERT_POSIX_EXTENDED:
diff --git a/src/pcre2test.c b/src/pcre2test.c
index 2cac41f..e4b4083 100644
--- a/src/pcre2test.c
+++ b/src/pcre2test.c
@@ -400,11 +400,14 @@ typedef struct convertstruct {
 } convertstruct;
 
 static convertstruct convertlist[] = {
-  { "glob_basic",     PCRE2_CONVERT_GLOB_BASIC },
-  { "glob_bash",      PCRE2_CONVERT_GLOB_BASH },
-  { "posix_basic",    PCRE2_CONVERT_POSIX_BASIC },
-  { "posix_extended", PCRE2_CONVERT_POSIX_EXTENDED },
-  { "unset",          CONVERT_UNSET }};
+  { "glob",              PCRE2_CONVERT_GLOB },
+  { "glob_basic",        PCRE2_CONVERT_GLOB_BASIC },
+  { "glob_no_backslash", PCRE2_CONVERT_GLOB_NO_BACKSLASH }, 
+  { "glob_no_starstar",  PCRE2_CONVERT_GLOB_NO_STARSTAR }, 
+  { "glob_no_wild_separator", PCRE2_CONVERT_GLOB_NO_WILD_SEPARATOR }, 
+  { "posix_basic",       PCRE2_CONVERT_POSIX_BASIC },
+  { "posix_extended",    PCRE2_CONVERT_POSIX_EXTENDED },
+  { "unset",             CONVERT_UNSET }};
 
 #define convertlistcount (sizeof(convertlist)/sizeof(convertstruct))