Changeset 331 for EcnlProtoTool/trunk/ntshell/ntshell/core/ntlibc.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/ntlibc.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)
 {