Changeset 331 for EcnlProtoTool/trunk/onigmo-6.1.3/src/reggnu.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/reggnu.c (modified) (7 diffs)

EcnlProtoTool/trunk/onigmo-6.1.3/src/reggnu.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.
  *
@@ -31 +31 @@
 #include "regint.h"
 
-#ifndef ONIGGNU_H
-#include "oniggnu.h"
+#ifndef ONIGMOGNU_H
+# include "onigmognu.h"
 #endif
 
@@ -49 +49 @@
     UChar *p;
     UChar *s = (UChar* )string + startpos;
+    UChar *e = (UChar* )string + size;
 
     if (range > 0) {
-      p = onigenc_get_right_adjust_char_head(reg->enc, (UChar* )string, s);
+      p = onigenc_get_right_adjust_char_head(reg->enc, (UChar* )string, s, e);
     }
     else {
-      p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, (UChar* )string, s);
+      p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(reg->enc, (UChar* )string, s, e);
     }
     return (int )(p - (UChar* )string);
@@ -95 +96 @@
 }
 
-#ifdef USE_RECOMPILE_API
-extern int
-re_recompile_pattern(const char* pattern, int size, regex_t* reg, char* ebuf)
-{
-  int r;
-  OnigErrorInfo einfo;
-  OnigEncoding enc;
-
-  /* I think encoding and options should be arguments of this function.
-     But this is adapted to present re.c. (2002/11/29)
-   */
-  enc = OnigEncDefaultCharEncoding;
-
-  r = onig_recompile(reg, (UChar* )pattern, (UChar* )(pattern + size),
-                     reg->options, enc, OnigDefaultSyntax, &einfo);
-  if (r != ONIG_NORMAL) {
-    if (IS_NOT_NULL(ebuf))
-      (void )onig_error_code_to_str((UChar* )ebuf, r, &einfo);
-  }
-  return r;
-}
-#endif
-
 extern void
 re_free_pattern(regex_t* reg)
@@ -139 +117 @@
 re_set_casetable(const char* table)
 {
-  onigenc_set_default_caseconv_table((UChar* )table);
+  /* onigenc_set_default_caseconv_table((UChar* )table); */
 }
 
@@ -151 +129 @@
     enc = ONIG_ENCODING_ASCII;
     break;
-#if 0
   case RE_MBCTYPE_EUC:
     enc = ONIG_ENCODING_EUC_JP;
@@ -158 +135 @@
     enc = ONIG_ENCODING_SJIS;
     break;
-#endif
   case RE_MBCTYPE_UTF8:
     enc = ONIG_ENCODING_UTF8;