Changeset 331 for EcnlProtoTool/trunk/ntshell/ntshell/core

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/ntshell/ntshell/core

Files:

• ntlibc.c (modified) (3 diffs)
• ntlibc.h (modified) (2 diffs)
• ntshell.c (modified) (9 diffs)
• text_history.c (modified) (3 diffs)

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

@@ -57 +57 @@
 }
 
+int ntlibc_strlcpy(char *des, const char *src, int n)
+{
+        char *d = des, *e = &des[n];
+        const char *s = src;
+        while (*s && d < e) {
+                *d = *s;
+                d++;
+                s++;
+        }
+        *d++ = '\0';
+        return (int)d - (int)des;
+}
+
 char *ntlibc_strcat(char *des, const char *src)
 {
@@ -71 +84 @@
         *d = '\0';
         return des;
+}
+
+int ntlibc_strlcat(char *des, const char *src, int n)
+{
+        char *d = des, *e = &des[n];
+        const char *s = src;
+        while (*d && d < e) {
+                d++;
+        }
+        while (*s && d < e) {
+                *d = *s;
+                d++;
+                s++;
+        }
+        *d++ = '\0';
+        return (int)d - (int)des;
 }
 
@@ -223 +252 @@
 }
 
+unsigned long ntlibc_strtoul(const char *restrict nptr, char **restrict endptr, int base)
+{
+        int cnt;
+        int num = 0;
+        int ofs = 0;
+        int sign = 0;
+        int scnt = 0;
+        char *p = (char *)nptr;
+        while (*p != '\0') {
+                if (!ntlibc_isdigit(*p)) {
+                        if (*p == ' ') {
+                                ofs++;
+                        }
+                        if (*p == '+') {
+                                sign = 0;
+                                ofs++;
+                                if (scnt++ > 0) {
+                                        *endptr = p;
+                                        break;
+                                }
+                        }
+                        if (*p == '-') {
+                                sign = 1;
+                                ofs++;
+                                if (scnt++ > 0) {
+                                        *endptr = p;
+                                        break;
+                                }
+                        }
+                        *endptr = p;
+                        break;
+                }
+                p++;
+        }
+        for (cnt = ofs; (nptr[cnt] >= '0') && (nptr[cnt] <= '9'); cnt++) {
+                num = 10 * num + (nptr[cnt] - '0');
+        }
+        if (sign) {
+                return -num;
+        }
+        else {
+                return num;
+        }
+}
+
 char *ntlibc_strchr(const char *s, int c)
 {

EcnlProtoTool/trunk/ntshell/ntshell/core/ntlibc.h

@@ -40 +40 @@
 int ntlibc_strlen(const char *s);
 char *ntlibc_strcpy(char *des, const char *src);
+int ntlibc_strlcpy(char *des, const char *src, int n);
 char *ntlibc_strcat(char *des, const char *src);
+int ntlibc_strlcat(char *des, const char *src, int n);
 int ntlibc_strcmp(const char *s1, const char *s2);
 int ntlibc_stricmp(const char *s1, const char *s2);
@@ -50 +52 @@
 int ntlibc_tolower(int c);
 int ntlibc_atoi(const char *nptr);
+unsigned long ntlibc_strtoul(const char *__restrict nptr, char **__restrict endptr, int base);
 char *ntlibc_strchr(const char *s, int c);
 char *ntlibc_utoa(unsigned int value, char *s, int radix);

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);
 }
 

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

@@ -33 +33 @@
 #include <string.h>
 #include "text_history.h"
+#include "core/ntlibc.h"
 
 /**
@@ -145 +146 @@
         char *buf, const int siz)
 {
-        const int text_len = strlen((const char *)text);
+        const int text_len = ntlibc_strlen((const char *)text);
         int found = 0;
         int i;
@@ -151 +152 @@
                 int target = (p->rp + i) % TEXTHISTORY_DEPTH;
                 char *txtp = p->history + (TEXTHISTORY_MAXLEN * target);
-                const int target_len = strlen((const char *)txtp);
+                const int target_len = ntlibc_strlen((const char *)txtp);
                 int comp_len = (target_len < text_len) ? target_len : text_len;
-                if ((strncmp(
+                if ((ntlibc_strncmp(
                         (const char *)txtp,
                         (const char *)text, comp_len) == 0) && (comp_len > 0)) {
                         if (found == index) {
-                                if (siz <= strlen(txtp)) {
+                                if (siz <= ntlibc_strlen(txtp)) {
                                         return -1;
                                 }
-                                strcpy((char *)buf, (char *)txtp);
+                                ntlibc_strcpy((char *)buf, (char *)txtp);
                                 return 0;
                         }