Changeset 331 for EcnlProtoTool/trunk/ntshell/ntshell/util

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/util

Files:

• ntopt.c (modified) (3 diffs)
• ntopt.h (modified) (1 diff)
• ntstdio.c (modified) (6 diffs)
• ntstdio.h (modified) (1 diff)

EcnlProtoTool/trunk/ntshell/ntshell/util/ntopt.c

@@ -131 +131 @@
         int argc;
         char argv[NTOPT_TEXT_MAXLEN];
-        char *argvp[NTOPT_TEXT_MAXARGS];
+        char *argvp[1 + NTOPT_TEXT_MAXARGS];
         int i;
         int total;
@@ -146 +146 @@
         for (i = 0; i < argc; i++) {
                 int len;
-                argvp[i] = ntopt_get_text(
+                argvp[i + 1] = ntopt_get_text(
                         str, i, p, NTOPT_TEXT_MAXLEN - total, &len);
                 if (total + len + 1 < NTOPT_TEXT_MAXLEN) {
@@ -156 +156 @@
                 }
         }
+        argvp[0] = (char *)argc;
 
-        return func(argc, &argvp[0], extobj);
+        return func((long *)&argvp[0], extobj);
 }

EcnlProtoTool/trunk/ntshell/ntshell/util/ntopt.h

@@ -55 +55 @@
  * @return A return value.
  */
-typedef int (*NTOPT_CALLBACK)(int argc, char **argv, void *extobj);
+typedef int (*NTOPT_CALLBACK)(long *args, void *extobj);
 
 #ifdef __cplusplus

EcnlProtoTool/trunk/ntshell/ntshell/util/ntstdio.c

@@ -241 +241 @@
 
         if (handle->xo) {
-                handle->xo((unsigned char)c);
+                handle->xo(handle, (unsigned char)c);
         }
         handle->pos++;
@@ -266 +266 @@
 void ntstdio_fputs(ntstdio_t *handle, NTSTDIO_XO xo, const char *str)
 {
-        void(*pf)(unsigned char);
+        NTSTDIO_XO pf;
 
         /* Save current output device */
@@ -314 +314 @@
         int result;
         va_list arp;
-        void(*pf)(unsigned char);
+        NTSTDIO_XO pf;
 
         /* Save current output device */
@@ -334 +334 @@
         extern void shell_exit(int cd);
 
-        int c = handle->xi();
+        int c = handle->xi(handle);
         if (handle->option & NTSTDIO_OPTION_LF_CR) {
                 if (c == '\r')
@@ -362 +362 @@
         for (;;) {
                 /* Get a char from the incoming stream */
-                c = handle->xi();
+                c = handle->xi(handle);
                 if (!c) {
                         /* End of stream */
@@ -398 +398 @@
 int ntstdio_fgets(ntstdio_t *handle, NTSTDIO_XI xi, char *buf, int len)
 {
-        unsigned char(*pf)(void);
+        NTSTDIO_XI pf;
         int n;
 

EcnlProtoTool/trunk/ntshell/ntshell/util/ntstdio.h

@@ -67 +67 @@
 #define NTSTDIO_OPTION_LF_CR        (1 << 3)
 
-typedef unsigned char (*NTSTDIO_XI)(void);
-typedef void (*NTSTDIO_XO)(unsigned char c);
+typedef unsigned char (*NTSTDIO_XI)(struct ntstdio_t *handle);
+typedef void (*NTSTDIO_XO)(struct ntstdio_t *handle, unsigned char c);
 
-typedef struct {
-    NTSTDIO_XI xi;
-    NTSTDIO_XO xo;
-    char *outptr;
+typedef struct ntstdio_t {
+        NTSTDIO_XI xi;
+        NTSTDIO_XO xo;
+        char *outptr;
         int len;
         int pos;
-    unsigned int option;
+        unsigned int option;
 } ntstdio_t;