Changeset 331 for EcnlProtoTool/trunk/prototool/src/arduino.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

File:

• EcnlProtoTool/trunk/prototool/src/arduino.c (modified) (2 diffs)

EcnlProtoTool/trunk/prototool/src/arduino.c

@@ -4 +4 @@
 #include <stdio.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 #include "../llbruby.h"
 
@@ -544 +545 @@
         return 0;
 }
+
+unsigned int Utf8_to_Utf16(const char *src, int *code_size)
+{
+        int i;
+        unsigned int uc = 0;
+        unsigned char len = 0;
+
+        len = 0;
+        if ((src[0] & 0x80) == 0) { uc = src[0] & 0x7F; len = 0; }
+        else if ((src[0] & 0xE0) == 0xC0) { uc = src[0] & 0x1F; len = 1; }
+        else if ((src[0] & 0xF0) == 0xE0) { uc = src[0] & 0x0F; len = 2; }
+        else if ((src[0] & 0xF8) == 0xF0) { uc = src[0] & 0x07; len = 3; }
+        else if ((src[0] & 0xFC) == 0xF8) { uc = src[0] & 0x03; len = 4; }
+        else if ((src[0] & 0xFE) == 0xFC) { uc = src[0] & 0x01; len = 5; }
+
+        i = 1;
+        while ((i <= len) && ((src[i] & 0xC0) == 0x80)) {
+                uc = (uc << 6) | (src[i] & 0x3F);
+                i++;
+        }
+
+        //消費文字数設定
+        *code_size = i;
+
+        //現状、2バイト限定
+        return uc;
+}
+
+int bs_char_count(char *str, int pos)
+{
+        int num = 1, local_pos = pos;
+        char *c;
+
+        while (1) {
+                c = str + local_pos;
+
+                if ((*c & 0x80) != 0x80)
+                        return num;
+
+                if (((*c & 0xE0) == 0xC0) && (num == 2)) {
+                        return num;
+                }
+                else if (((*c & 0xF0) == 0xE0) && (num == 3)) {
+                        return num;
+                }
+                else if (((*c & 0xF8) == 0xF0) && (num == 4)) {
+                        return num;
+                }
+                else if (((*c & 0xFC) == 0xF8) && (num == 5)) {
+                        return num;
+                }
+                else if (((*c & 0xFE) == 0xFC) && (num == 6)) {
+                        return num;
+                }
+                else {
+                        if (local_pos > 0) {
+                                local_pos--;
+                                num++;
+                        }
+                        else
+                                return 0;
+                }
+        }
+
+        return 0;
+}