Changeset 331 for EcnlProtoTool/trunk/ntshell/ntshell/core/ntshell.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/ntshell/ntshell/core/ntshell.c (modified) (9 diffs)

EcnlProtoTool/trunk/ntshell/ntshell/core/ntshell.c

@@ -33 +33 @@
 #include <string.h>
 #include "ntshell.h"
+#include "core/ntlibc.h"
 
 int ntshell_exit;
@@ -107 +108 @@
  * @param HANDLE A pointer of the handle.
  */
-#define PROMPT_WRITE(HANDLE)            SERIAL_WRITE((HANDLE), (HANDLE)->prompt, strlen((HANDLE)->prompt))
+#define PROMPT_WRITE(HANDLE)            SERIAL_WRITE((HANDLE), (HANDLE)->prompt, ntlibc_strlen((HANDLE)->prompt))
 
 /**
@@ -114 +115 @@
  * @param HANDLE A pointer of the handle.
  */
-#define PROMPT_NEWLINE(HANDLE)          SERIAL_WRITE((HANDLE), NTSHELL_PROMPT_NEWLINE, strlen(NTSHELL_PROMPT_NEWLINE))
+#define PROMPT_NEWLINE(HANDLE)          SERIAL_WRITE((HANDLE), NTSHELL_PROMPT_NEWLINE, ntlibc_strlen(NTSHELL_PROMPT_NEWLINE))
 
 /**
@@ -399 +400 @@
                                  * Found the suggestion.
                                  */
-                                int n = strlen((const char *)buf);
+                                int n = ntlibc_strlen((const char *)buf);
                                 VTSEND_ERASE_LINE(ntshell);
                                 VTSEND_CURSOR_HEAD(ntshell);
@@ -429 +430 @@
                          * Found the suggestion.
                          */
-                        int n = strlen((const char *)buf);
+                        int n = ntlibc_strlen((const char *)buf);
                         VTSEND_ERASE_LINE(ntshell);
                         VTSEND_CURSOR_HEAD(ntshell);
@@ -441 +442 @@
                          * Recall the previous input text string.
                          */
-                        int n = strlen(SUGGEST_SOURCE(ntshell));
+                        int n = ntlibc_strlen(SUGGEST_SOURCE(ntshell));
                         VTSEND_ERASE_LINE(ntshell);
                         VTSEND_CURSOR_HEAD(ntshell);
@@ -484 +485 @@
         UNUSED_VARIABLE(ch);
         text_editor_get_text(GET_EDITOR(ntshell), buf, sizeof(buf));
-        len = strlen((const char *)buf);
+        len = ntlibc_strlen((const char *)buf);
         VTSEND_CURSOR_HEAD(ntshell);
         PROMPT_WRITE(ntshell);
@@ -606 +607 @@
         p->func_callback = func_callback;
         p->extobj = extobj;
-        strcpy(p->prompt, NTSHELL_PROMPT_DEFAULT);
+        ntlibc_strcpy(p->prompt, NTSHELL_PROMPT_DEFAULT);
 
         p->vtrecv.user_data = p;
@@ -666 +667 @@
         }
 
-        strcpy(p->prompt, prompt);
+        ntlibc_strcpy(p->prompt, prompt);
 }