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

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

@@ -4 +4 @@
 /*-
  * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
- * Copyright (c) 2011-2014  K.Takata  <kentkt AT csc DOT jp>
+ * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
@@ -32 +32 @@
 #include <stdio.h> /* for vsnprintf() */
 
-#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
 
 extern UChar*
@@ -66 +60 @@
   case ONIGERR_MATCH_STACK_LIMIT_OVER:
     p = "match-stack limit over"; break;
+  case ONIGERR_PARSE_DEPTH_LIMIT_OVER:
+    p = "parse depth limit over"; break;
   case ONIGERR_DEFAULT_ENCODING_IS_NOT_SET:
     p = "default multibyte-encoding is not set"; break;
@@ -180 +176 @@
   case ONIGERR_INVALID_COMBINATION_OF_OPTIONS:
     p = "invalid combination of options"; break;
-  case ONIGERR_OVER_THREAD_PASS_LIMIT_COUNT:
-    p = "over thread pass limit count"; break;
 
   default:
@@ -192 +186 @@
 static void sprint_byte(char* s, unsigned int v)
 {
-  sprintf(s, "%02x", (v & 0377));
+  xsnprintf(s, 3, "%02x", (v & 0377));
 }
 
 static void sprint_byte_with_x(char* s, unsigned int v)
 {
-  sprintf(s, "\\x%02x", (v & 0377));
+  xsnprintf(s, 5, "\\x%02x", (v & 0377));
 }
 
@@ -233 +227 @@
       }
 
-      p += enclen(enc, p);
+      p += enclen(enc, p, end);
       if (len >= buf_size) break;
     }
@@ -253 +247 @@
 
 extern int
-#ifdef HAVE_STDARG_PROTOTYPES
 onig_error_code_to_str(UChar* s, OnigPosition code, ...)
-#else
-onig_error_code_to_str(s, code, va_alist)
-  UChar* s;
-  OnigPosition code;
-  va_dcl
-#endif
 {
   UChar *p, *q;
@@ -269 +256 @@
   va_list vargs;
 
-  va_init_list(vargs, code);
+  va_start(vargs, code);
 
   switch (code) {
@@ -324 +311 @@
 }
 
-
 void
-#ifdef HAVE_STDARG_PROTOTYPES
-onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
-                           UChar* pat, UChar* pat_end, const UChar *fmt, ...)
-#else
-onig_snprintf_with_pattern(buf, bufsize, enc, pat, pat_end, fmt, va_alist)
-    UChar buf[];
-    int bufsize;
-    OnigEncoding enc;
-    UChar* pat;
-    UChar* pat_end;
-    const UChar *fmt;
-    va_dcl
-#endif
+onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
+                           UChar* pat, UChar* pat_end, const UChar *fmt, va_list args)
 {
   size_t need;
@@ -344 +319 @@
   UChar *p, *s, *bp;
   UChar bs[6];
-  va_list args;
-
-  va_init_list(args, fmt);
+
   n = xvsnprintf((char* )buf, bufsize, (const char* )fmt, args);
-  va_end(args);
 
   need = (pat_end - pat) * 4 + 4;
 
   if (n + need < (size_t )bufsize) {
-    strcat((char* )buf, ": /");
+    static const char sep[] = ": /";
+    memcpy((char* )buf + n, sep, sizeof(sep));
     s = buf + onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, buf);
 
     p = pat;
     while (p < pat_end) {
-      if (*p == '\\') {
-        *s++ = *p++;
-        len = enclen(enc, p);
-        while (len-- > 0) *s++ = *p++;
-      }
-      else if (*p == '/') {
-        *s++ = (unsigned char )'\\';
-        *s++ = *p++;
-      }
-      else if (ONIGENC_IS_MBC_HEAD(enc, p)) {
-        len = enclen(enc, p);
+      if (ONIGENC_IS_MBC_HEAD(enc, p, pat_end)) {
+        len = enclen(enc, p, pat_end);
         if (ONIGENC_MBC_MINLEN(enc) == 1) {
           while (len-- > 0) *s++ = *p++;
         }
-        else { /* for UTF16 */
+        else { /* for UTF16/32 */
           int blen;
 
@@ -383 +347 @@
         }
       }
+      else if (*p == '\\') {
+        *s++ = *p++;
+        len = enclen(enc, p, pat_end);
+        while (len-- > 0) *s++ = *p++;
+      }
+      else if (*p == '/') {
+        *s++ = (unsigned char )'\\';
+        *s++ = *p++;
+      }
       else if (!ONIGENC_IS_CODE_PRINT(enc, *p) &&
                !ONIGENC_IS_CODE_SPACE(enc, *p)) {
@@ -399 +372 @@
   }
 }
+
+#if 0 /* unused */
+void
+onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,
+                           UChar* pat, UChar* pat_end, const UChar *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  onig_vsnprintf_with_pattern(buf, bufsize, enc,
+          pat, pat_end, fmt, args);
+  va_end(args);
+}
+#endif