Changeset 387 for asp3_tinet_ecnl_rx/trunk/ntshell/ntshell/util/ntstdio.c

Timestamp:

May 22, 2019, 4:09:18 PM (5 years ago)

Author:

coas-nagasima

Message:

ファイルディスクリプタ処理を更新

File:

• asp3_tinet_ecnl_rx/trunk/ntshell/ntshell/util/ntstdio.c (modified) (4 diffs)

asp3_tinet_ecnl_rx/trunk/ntshell/ntshell/util/ntstdio.c

@@ -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;
 }