Changeset 331 for EcnlProtoTool/trunk/onigmo-6.1.3/src/regposix.c

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:

EcnlProtoTool/trunk/onigmo-6.1.3

Files:

• . (moved) (moved from EcnlProtoTool/trunk/onigmo-5.15.0 )
• src/regposix.c (modified) (10 diffs)

EcnlProtoTool/trunk/onigmo-6.1.3/src/regposix.c

@@ -4 +4 @@
 /*-
  * Copyright (c) 2002-2008  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011       K.Takata  <kentkt AT csc DOT jp>
+ * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
@@ -32 +32 @@
 #include "regint.h"
 #undef regex_t
-#include "onigposix.h"
+#include "onigmoposix.h"
 
 #define ONIG_C(reg)    ((onig_regex_t* )((reg)->onig))
@@ -116 +116 @@
     { ONIGERR_INVALID_CHAR_PROPERTY_NAME,                 REG_BADPAT },
     { ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION,         REG_EONIG_BADARG },
-    { ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT,               REG_EONIG_THREAD }
 
   };
@@ -136 +135 @@
 {
   int r, len;
-  OnigSyntaxType* syntax = OnigDefaultSyntax;
+  const OnigSyntaxType* syntax = OnigDefaultSyntax;
   OnigOptionType options;
 
@@ -170 +169 @@
   int r, i, len;
   UChar* end;
-  regmatch_t* pm;
+  OnigRegion* region = NULL;
   OnigOptionType options;
 
-  options = ONIG_OPTION_POSIX_REGION;
+  options = ONIG_OPTION_NONE;
   if ((posix_options & REG_NOTBOL) != 0) options |= ONIG_OPTION_NOTBOL;
   if ((posix_options & REG_NOTEOL) != 0) options |= ONIG_OPTION_NOTEOL;
 
-  if (nmatch == 0 || (reg->comp_options & REG_NOSUB) != 0) {
-    pm = (regmatch_t* )NULL;
+  if ((reg->comp_options & REG_NOSUB) != 0) {
     nmatch = 0;
   }
-  else if ((int )nmatch < ONIG_C(reg)->num_mem + 1) {
-    pm = (regmatch_t* )xmalloc(sizeof(regmatch_t)
-                               * (ONIG_C(reg)->num_mem + 1));
-    if (pm == NULL)
+  else if (nmatch != 0) {
+    region = onig_region_new();
+    if (region == NULL)
       return REG_ESPACE;
-  }
-  else {
-    pm = pmatch;
   }
 
@@ -194 +188 @@
   end = (UChar* )(str + len);
   r = (int )onig_search(ONIG_C(reg), (UChar* )str, end, (UChar* )str, end,
-                  (OnigRegion* )pm, options);
+                  region, options);
 
   if (r >= 0) {
     r = 0; /* Match */
-    if (pm != pmatch && pm != NULL) {
-      xmemcpy(pmatch, pm, sizeof(regmatch_t) * nmatch);
+    for (i = 0; i < (int )nmatch; i++) {
+      pmatch[i].rm_so = (regoff_t )region->beg[i];
+      pmatch[i].rm_eo = (regoff_t )region->end[i];
     }
   }
@@ -211 +206 @@
   }
 
-  if (pm != pmatch && pm != NULL)
-    xfree(pm);
+  if (region != NULL)
+    onig_region_free(region, 1);
 
 #if 0
@@ -238 +233 @@
     enc = ONIG_ENCODING_ASCII;
     break;
-#if 0
   case REG_POSIX_ENCODING_EUC_JP:
     enc = ONIG_ENCODING_EUC_JP;
@@ -245 +239 @@
     enc = ONIG_ENCODING_SJIS;
     break;
-#endif
   case REG_POSIX_ENCODING_UTF8:
     enc = ONIG_ENCODING_UTF8;
     break;
-#if 0
   case REG_POSIX_ENCODING_UTF16_BE:
     enc = ONIG_ENCODING_UTF16_BE;
@@ -256 +248 @@
     enc = ONIG_ENCODING_UTF16_LE;
     break;
-#endif
+
   default:
     return ;