Changeset 433 for EcnlProtoTool/trunk/ntshell/ntshell

Timestamp:

Jul 5, 2020, 9:26:49 PM (4 years ago)

Author:

coas-nagasima

Message:

dateコマンド追加
コードの整理

Location:

EcnlProtoTool/trunk/ntshell/ntshell

Files:

• usrcmd.c (modified) (1 diff)
• usrcmd.h (modified) (1 diff)
• util/ntstdio.c (modified) (5 diffs)
• util/ntstdio.h (modified) (2 diffs)

EcnlProtoTool/trunk/ntshell/ntshell/usrcmd.c

@@ -789 +789 @@
 }
 
+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 .%09ld\n", buf, tp.tv_nsec);
+        return 0;
+}
+
 int usrcmd_info(int argc, char **argv)
 {

EcnlProtoTool/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);

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

@@ -186 +186 @@
                  */
                 value = (flag & FLAG_SIZE_LONG_INT) ? va_arg(arp, long)
-                        : (flag & FLAG_SIZE_HALF_INT) ? ((d == 'D') ? (long)va_arg(arp, short) : (long)va_arg(arp, unsigned short))
+                        : (flag & FLAG_SIZE_HALF_INT) ? ((d == 'D') ? (long)((short)va_arg(arp, int)) : (long)((unsigned short)va_arg(arp, unsigned int)))
                                 : ((d == 'D') ? (long)va_arg(arp, int) : (long)va_arg(arp, unsigned int));
                 if ((d == 'D') && (value & 0x80000000)) {
@@ -224 +224 @@
         handle->xi = xi;
         handle->xo = xo;
-        handle->outptr = 0;
-        handle->len = 0;
         handle->pos = 0;
         handle->option = option;
@@ -232 +230 @@
 static void _putc(ntstdio_t *handle, char c)
 {
-        if (handle->outptr) {
-                if ((handle->pos + 1) >= handle->len)
-                        return;
-                handle->outptr[handle->pos] = (unsigned char)c;
-                handle->pos++;
-                return;
-        }
-
         if (handle->xo) {
                 handle->xo(handle, (unsigned char)c);
@@ -291 +281 @@
 }
 
+struct put_buf_t {
+        char *outptr;
+        int len;
+};
+
+static void put_buf(struct ntstdio_t *handle, unsigned char c)
+{
+        struct put_buf_t *put_buf = (struct put_buf_t *)handle->exinf;
+        if ((handle->pos + 1) >= put_buf->len)
+                return;
+        put_buf->outptr[handle->pos] = (char)c;
+        handle->pos++;
+}
+
 int ntstdio_snprintf(char *buf, int len, const char *fmt, ...)
 {
         int result;
         ntstdio_t handle;
+        struct put_buf_t exinf;
         va_list arp;
         /* Switch destination for memory */
+        handle.xo = put_buf;
         handle.option = 0;
-        handle.outptr = buf;
-        handle.len = len;
         handle.pos = 0;
+        handle.exinf = &exinf;
+        exinf.outptr = buf;
+        exinf.len = len;
+
         va_start(arp, fmt);
         result = xvprintf(&handle, fmt, arp);
@@ -306 +314 @@
 
         /* Terminate output string with a \0 */
-        handle.outptr[handle.pos] = '\0';
+        buf[handle.pos] = '\0';
         return result;
 }

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

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