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

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

@@ -1 +1 @@
 /**********************************************************************
-  regposerr.c - Oniguruma (regular expression library)
+  regposerr.c - Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
@@ -29 +30 @@
 
 #include "config.h"
-#include "onigposix.h"
+#include "onigmoposix.h"
+#include <string.h>
 
-#ifdef HAVE_STRING_H
-# include <string.h>
+#if defined(__GNUC__)
+# define ARG_UNUSED  __attribute__ ((unused))
 #else
-# include <strings.h>
+# define ARG_UNUSED
 #endif
 
-#if defined(__GNUC__)
-#  define ARG_UNUSED  __attribute__ ((unused))
+#if defined(_WIN32) && !defined(__GNUC__)
+# define xsnprintf   sprintf_s
+# define xstrncpy(dest,src,size)   strncpy_s(dest,size,src,_TRUNCATE)
 #else
-#  define ARG_UNUSED
+# define xsnprintf   snprintf
+# define xstrncpy    strncpy
 #endif
 
@@ -65 +69 @@
   "invalid wide char value",                 /* REG_EONIG_BADWC    */
   "invalid argument",                        /* REG_EONIG_BADARG   */
-  "multi-thread error"                       /* REG_EONIG_THREAD   */
 };
 
@@ -87 +90 @@
   }
   else {
-    sprintf(tbuf, "undefined error code (%d)", posix_ecode);
+    xsnprintf(tbuf, sizeof(tbuf), "undefined error code (%d)", posix_ecode);
     s = tbuf;
   }
@@ -94 +97 @@
 
   if (buf != NULL && size > 0) {
-    strncpy(buf, s, size - 1);
+    xstrncpy(buf, s, size - 1);
     buf[size - 1] = '\0';
   }