Changeset 340 for asp3_tinet_ecnl_rx/trunk/ntshell

Timestamp:

Apr 13, 2018, 1:00:30 PM (6 years ago)

Author:

coas-nagasima

Message:

NTPクライアント処理を追加

Location:

asp3_tinet_ecnl_rx/trunk/ntshell

Files:

• ntshell/usrcmd.c (modified) (1 diff)
• ntshell/usrcmd.h (modified) (1 diff)
• src/net_misc.c (added)
• src/net_misc.cfg (added)
• src/net_misc.h (added)
• src/netcmd.c (modified) (2 diffs)
• src/ntp_cli.c (added)
• src/ntp_cli.cfg (added)
• src/ntp_cli.h (added)
• src/ntshell_main.c (modified) (1 diff)
• src/shellif.h (modified) (2 diffs)
• src/syscall.c (modified) (2 diffs)
• src/tinet_ntp_cli.cfg (added)

asp3_tinet_ecnl_rx/trunk/ntshell/ntshell/usrcmd.c

@@ -790 +790 @@
 }
 
+int usrcmd_date(int argc, char **argv)
+{
+        int ret;
+        struct timespec tp;
+        char buf[30];
+
+        ret = shell_clock_gettime(CLOCK_REALTIME, &tp);
+        if (ret != 0) {
+                ntstdio_printf(&ntstdio, "clock_gettime error %d", ret);
+                return 0;
+        }
+
+        memset(buf, 0, sizeof(buf));
+        if (ctime_r(&tp.tv_sec, buf) == NULL) {
+                ntstdio_printf(&ntstdio, "ctime_r error");
+                return 0;
+        }
+
+        /* 改行コードの削除 */
+        ret = ntlibc_strlen(buf);
+        buf[ret - 1] = '\0';
+
+        ntstdio_printf(&ntstdio, "%s .%09u\n", buf, tp.tv_nsec);
+        return 0;
+}
+
 int usrcmd_info(int argc, char **argv)
 {

asp3_tinet_ecnl_rx/trunk/ntshell/ntshell/usrcmd.h

@@ -50 +50 @@
 int usrcmd_mkdir(int argc, char **argv);
 int usrcmd_hexdump(int argc, char **argv);
+int usrcmd_date(int argc, char **argv);
 
 int usrcmd_help(int argc, char **argv);

asp3_tinet_ecnl_rx/trunk/ntshell/src/netcmd.c

@@ -60 +60 @@
 #include "core/ntlibc.h"
 #include "util/ntstdio.h"
+#include "ntp_cli.h"
 #include "kernel_cfg.h"
 
@@ -469 +470 @@
         return 0;
 }
+
+int usrcmd_ntpc(int argc, char **argv)
+{
+        ntp_cli_execute();
+        return 0;
+}

asp3_tinet_ecnl_rx/trunk/ntshell/src/ntshell_main.c

@@ -125 +125 @@
 {
         const cmd_table_t *p = cmd_table_info.table;
+        int result = 0;
+        int found = 0;
+
         if (strcmp((const char *)args[1], "help") == 0) {
-                usrcmd_help(args[0], (char **)&args[1]);
+                found = 1;
+                result = usrcmd_help(args[0], (char **)&args[1]);
         }
         else for (int i = 0; i < cmd_table_info.count; i++) {
                 if (strcmp((const char *)args[1], p->cmd) == 0) {
-                        return p->func(args[0], (char **)&args[1]);
+                        found = 1;
+                        result = p->func(args[0], (char **)&args[1]);
+                        break;
                 }
                 p++;
         }
-        /*if (setjmp(process_exit) == 0) {
-                main(args);
-        }*/
+
+        if ((found == 0) && (((const char *)args[1])[0] != '\0'))
+                printf("Unknown command found.\n");
+
         clean_fd();
-        return 0;
+
+        return result;
 }
 

asp3_tinet_ecnl_rx/trunk/ntshell/src/shellif.h

@@ -40 +40 @@
 #ifdef _MSC_VER
 #define _CRT_NO_TIME_T
+#define tm msc_tm
 #include <time.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
-#define restrict __restrict
+#undef tm
+#undef NULL
 #endif
 
@@ -106 +108 @@
 #include "../musl-1.1.18/include/bits/stat.h"
 #include "../musl-1.1.18/include/sys/select.h"
+#include "../musl-1.1.18/include/time.h"
 #include "../musl-1.1.18/include/signal.h"
 #include "../musl-1.1.18/include/stdio.h"

asp3_tinet_ecnl_rx/trunk/ntshell/src/syscall.c

@@ -60 +60 @@
         switch (n) {
         case SYS__llseek:
-                return shell_llseek(va_arg(ap, int), ((va_arg(ap, off_t)) << 32) + va_arg(ap, off_t), va_arg(ap, off_t *), va_arg(ap, int));
+                return shell_llseek(va_arg(ap, int), va_arg(ap, off_t), va_arg(ap, off_t *), va_arg(ap, int));
         case SYS__newselect:
                 ret = shell_select(va_arg(ap, int), va_arg(ap, fd_set *), va_arg(ap, fd_set *), va_arg(ap, fd_set *), va_arg(ap, struct timeval *));
@@ -253 +253 @@
                 break;
         case SYS_ftruncate64:
-                ret = shell_ftruncate(va_arg(ap, int), ((va_arg(ap, off_t)) << 32) + va_arg(ap, off_t));
+                ret = shell_ftruncate(va_arg(ap, int), va_arg(ap, off_t));
                 break;
         case SYS_futex: