Changeset 331 for EcnlProtoTool/trunk/prototool/src/main.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/main.c (modified) (5 diffs)

EcnlProtoTool/trunk/prototool/src/main.c

@@ -49 +49 @@
 #include <netdb.h>
 #include <unistd.h>
-#include <setjmp.h>
 #include <signal.h>
 #include <time.h>
 #include <sys/time.h>
-#include <sys/unistd.h>
+#include <unistd.h>
 #include <errno.h>
 
@@ -65 +64 @@
 #include <mruby/dump.h>
 #include <mruby/string.h>
-#include <usrcmd.h>
+#include <ntshell/usrcmd.h>
 
 #define ETHER_MAX_LEN 1518
@@ -89 +88 @@
 extern int mruby_main(int argc, char **argv);
 extern int mirb_main(int argc, char **argv);
+extern int curl_main(int argc, char **argv);
 extern int tcc_main(int argc, char **argv);
 extern int vi_main(int argc, char **argv);
@@ -101 +101 @@
         {"mruby","mruby command", mruby_main},
         {"mirb", "Embeddable Interactive Ruby Shell", mirb_main},
+        {"curl", "Command lines or scripts to transfer data", curl_main},
         {"tcc", "Tiny C compiler", tcc_main},
         {"vi", "Text editor", vi_main},
-        {"cd", "change directory", usrcmd_cd },
-        {"ls", "list files", usrcmd_ls },
-        {"cp", "copy file", usrcmd_cp },
-        {"rm", "remove file", usrcmd_rm },
-        {"mv", "move file", usrcmd_mv },
-        {"mkdir", "Make directory", usrcmd_mkdir},
-        {"hexdump", "Hex dump", usrcmd_hexdump},
         {"onitest", "Onigumo Test", onitest_main},
         {"tcp_echo", "TCP echo server/client", tcp_echo_main},
         {"help", "This is a description text string for help command.", usrcmd_help},
-        {"info", "This is a description text string for info command.", usrcmd_info},
-        {"exit", "Exit Natural Tyny Shell", usrcmd_exit},
 };
 cmd_table_info_t cmd_table_info = { &cmdlist, sizeof(cmdlist) / sizeof(cmdlist[0]) };
@@ -521 +513 @@
 }
 
-// Provide implementation of _sbrk (low-level dynamic memory allocation
-// routine) for GCC_ARM which compares new heap pointer with MSP instead of
-// SP.  This make it compatible with RTX RTOS thread stacks.
-
-// Linker defined symbol used by _sbrk to indicate where heap should start.
-int _end;
-uint32_t  _stack;
-
-// Turn off the errno macro and use actual global variable instead.
-#undef errno
-int errno;
-
-static unsigned char* heap = (unsigned char*)&_end;
-
-// Dynamic memory allocation related syscall.
-caddr_t _sbrk(int incr) {
-        unsigned char*        prev_heap = heap;
-        unsigned char*        new_heap = heap + incr;
-
-        if (new_heap >= (unsigned char*)&_stack) {     /* _stack is end of heap section */
-                errno = ENOMEM;
-                return (caddr_t)-1;
-        }
-
-        heap = new_heap;
-        return (caddr_t) prev_heap;
-}
-
-char *optarg;
+void _start_c(long *p);
 int _data, _mdata, _edata;
 int _bss, _ebss;
 
-int _PowerON_Reset(int argc, char **argv)
+void _PowerON_Reset(long *args)
 {
         memcpy(&_data, &_mdata, (size_t)&_edata - (size_t)&_data);
         memset(&_bss, 0, (size_t)&_ebss - (size_t)&_bss);
 
-        optarg = *argv;
-        return main(argc, argv);
+        _start_c(args);
 }