Changeset 446 for EcnlProtoTool/trunk/prototool/src/main.c

Timestamp:

Jul 21, 2020, 8:38:44 AM (4 years ago)

Author:

coas-nagasima

Message:

プログラムテーブルのセクションを追加しntshellで読みだしてHELPを表示するよう変更

File:

• EcnlProtoTool/trunk/prototool/src/main.c (modified) (2 diffs)

EcnlProtoTool/trunk/prototool/src/main.c

@@ -78 +78 @@
 };
 
-typedef struct
-{
-        cmd_table_t *table;
-        cmd_table_t *count;
-} cmd_table_info_t;
-
-extern int mrbc_main(int argc, char **argv);
-extern int mrdb_main(int argc, char **argv);
-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);
-extern int openssl_main(int argc, char *argv[]);
-extern int onitest_main(int argc, char **argv);
-extern int tcp_echo_main(int argc, char **argv);
-extern int echo_client_main(int argc, char **argv);
-extern int mrdb_break(void);
-
-static const cmd_table_t cmdlist[] = {
-        {"mrbc", "mruby compiler executable", mrbc_main},
-        {"mrdb","mruby debugger command", mrdb_main},
-        {"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},
-        {"openssl", "Cryptography and SSL/TLS Toolkit", openssl_main},
-        {"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},
-};
-cmd_table_info_t cmd_table_info = { &cmdlist, sizeof(cmdlist) / sizeof(cmdlist[0]) };
+extern const cmd_table_info_t cmd_table_info;
 
 int echonet = 1;
@@ -199 +167 @@
         printf("tcp_echo -c ipaddr port\n");
 
-        return 0;
-}
-
-int usrcmd_help(int argc, char **argv)
-{
-        const cmd_table_t *p = cmd_table_info.table;
-        for (int i = 0; i < cmd_table_info.count; i++) {
-                printf(p->cmd);
-                printf("\t:");
-                printf(p->desc);
-                printf("\n");
-                p++;
-        }
         return 0;
 }