MdeModulePkg RegularExpressionDxe: Update Oniguruma to 6.9.0

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / Oniguruma / regposix.c

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c
index 299b88c6cc20f1d2c63ef2b25afe6b56ab86de3e..54d456424d7040c17c91852b107b7085eac13173 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regposix.c
@@ -2,11 +2,9 @@
   regposix.c - Oniguruma (regular expression library)\r
 **********************************************************************/\r
 /*-\r
- * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
+ * Copyright (c) 2002-2018  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>\r
  * All rights reserved.\r
  *\r
- * (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
- *\r
  * Redistribution and use in source and binary forms, with or without\r
  * modification, are permitted provided that the following conditions\r
  * are met:\r
@@ -42,7 +40,7 @@
   if (ONIGENC_MBC_MINLEN(enc) == 1) { \\r
     UChar* tmps = (UChar* )(s); \\r
     while (*tmps != 0) tmps++; \\r
-    len = (int)(tmps - (UChar* )(s)); \\r
+    len = (int )(tmps - (UChar* )(s));\\r
   } \\r
   else { \\r
     len = onigenc_str_bytelen_null(enc, (UChar* )s); \\r
@@ -60,8 +58,10 @@ onig2posix_error_code(int code)
   static const O2PERR o2p[] = {\r
     { ONIG_MISMATCH,                                      REG_NOMATCH },\r
     { ONIG_NO_SUPPORT_CONFIG,                             REG_EONIG_INTERNAL },\r
+    { ONIG_ABORT,                                         REG_EONIG_INTERNAL },\r
     { ONIGERR_MEMORY,                                     REG_ESPACE  },\r
     { ONIGERR_MATCH_STACK_LIMIT_OVER,                     REG_EONIG_INTERNAL },\r
+    { ONIGERR_RETRY_LIMIT_IN_MATCH_OVER,                  REG_EONIG_INTERNAL },\r
     { ONIGERR_TYPE_BUG,                                   REG_EONIG_INTERNAL },\r
     { ONIGERR_PARSER_BUG,                                 REG_EONIG_INTERNAL },\r
     { ONIGERR_STACK_BUG,                                  REG_EONIG_INTERNAL },\r
@@ -69,6 +69,7 @@ onig2posix_error_code(int code)
     { ONIGERR_UNEXPECTED_BYTECODE,                        REG_EONIG_INTERNAL },\r
     { ONIGERR_DEFAULT_ENCODING_IS_NOT_SETTED,             REG_EONIG_BADARG },\r
     { ONIGERR_SPECIFIED_ENCODING_CANT_CONVERT_TO_WIDE_CHAR, REG_EONIG_BADARG },\r
+    { ONIGERR_FAIL_TO_INITIALIZE,                         REG_EONIG_INTERNAL },\r
     { ONIGERR_INVALID_ARGUMENT,                           REG_EONIG_BADARG },\r
     { ONIGERR_END_PATTERN_AT_LEFT_BRACE,                  REG_EBRACE  },\r
     { ONIGERR_END_PATTERN_AT_LEFT_BRACKET,                REG_EBRACK  },\r
@@ -115,9 +116,17 @@ onig2posix_error_code(int code)
     { ONIGERR_NEVER_ENDING_RECURSION,                     REG_BADPAT },\r
     { ONIGERR_GROUP_NUMBER_OVER_FOR_CAPTURE_HISTORY,      REG_BADPAT },\r
     { ONIGERR_INVALID_CHAR_PROPERTY_NAME,                 REG_BADPAT },\r
+    { ONIGERR_INVALID_IF_ELSE_SYNTAX,                     REG_BADPAT },\r
+    { ONIGERR_INVALID_ABSENT_GROUP_PATTERN,               REG_BADPAT },\r
+    { ONIGERR_INVALID_ABSENT_GROUP_GENERATOR_PATTERN,     REG_BADPAT },\r
+    { ONIGERR_INVALID_CALLOUT_PATTERN,                    REG_BADPAT },\r
+    { ONIGERR_INVALID_CALLOUT_NAME,                       REG_BADPAT },\r
+    { ONIGERR_UNDEFINED_CALLOUT_NAME,                     REG_BADPAT },\r
+    { ONIGERR_INVALID_CALLOUT_BODY,                       REG_BADPAT },\r
+    { ONIGERR_INVALID_CALLOUT_TAG_NAME,                   REG_BADPAT },\r
+    { ONIGERR_INVALID_CALLOUT_ARG,                        REG_BADPAT },\r
     { ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION,         REG_EONIG_BADARG },\r
-    { ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT,               REG_EONIG_THREAD }\r
-\r
+    { ONIGERR_LIBRARY_IS_NOT_INITIALIZED,                 REG_EONIG_INTERNAL }\r
   };\r
 \r
   int i;\r
@@ -241,11 +250,10 @@ reg_set_encoding(int mb_code)
   case REG_POSIX_ENCODING_UTF16_LE:\r
     enc = ONIG_ENCODING_UTF16_LE;\r
     break;\r
-\r
-  default:\r
-    return;\r
   }\r
 \r
+  onig_initialize(&enc, 1);\r
+\r
   onigenc_set_default_encoding(enc);\r
 }\r
 \r