Changeset 331 for EcnlProtoTool/trunk/ntshell/src/fdtable.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/ntshell/src/fdtable.c (modified) (15 diffs)

EcnlProtoTool/trunk/ntshell/src/fdtable.c

@@ -35 +35 @@
  *  @(#) $Id$
  */
+#include "shellif.h"
 #include <stdint.h>
-#include <stdio.h>
-#include <sys/unistd.h>
-#include <limits.h>
 #include <kernel.h>
 #include <t_syslog.h>
 #include <t_stdlib.h>
 #include <sil.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <setjmp.h>
-#include "../../../musl-1.1.12/include/poll.h"
 #include "syssvc/serial.h"
 #include "syssvc/syslog.h"
@@ -61 +54 @@
 #include <net/if_var.h>
 #include <netinet/udp_var.h>
-#include <ethernet_api.h>
+//#include <ethernet_api.h>
 #include "ff.h"
 #include "socket_stub.h"
 #include "kernel_cfg.h"
+#include <string.h>
 
 #define SIO_PORTID 1
@@ -71 +65 @@
 #define IO_TYPE_SIO             1
 #define IO_TYPE_FILE    2
-#define IO_TYPE_TCP             3
-#define IO_TYPE_UDP             4
+#define IO_TYPE_DIR             3
+#define IO_TYPE_TCP             4
+#define IO_TYPE_UDP             5
 
 static struct _IO_FILE fd_table[8 * sizeof(FLGPTN)] = {
-        { 0, IO_TYPE_SIO, 0, stdio_close, stdin_read, stdio_write },
-        { 1, IO_TYPE_SIO, 0, stdio_close, stdio_read, stdout_write },
-        { 2, IO_TYPE_SIO, 0, stdio_close, stdio_read, stderr_write },
+        { 0, IO_TYPE_SIO, 0, stdio_close, stdin_read, stdio_write, sio_seek, sio_ioctl },
+        { 1, IO_TYPE_SIO, 0, stdio_close, stdio_read, stdout_write, sio_seek, sio_ioctl },
+        { 2, IO_TYPE_SIO, 0, stdio_close, stdio_read, stderr_write, sio_seek, sio_ioctl },
 };
 #define fd_table_count (sizeof(fd_table) / sizeof(fd_table[0]))
@@ -94 +89 @@
         }
 
-        return -1;
+        return -ENOMEM;
 }
 
@@ -112 +107 @@
         struct _IO_FILE *fp = id_to_fd(type, id);
         if (fp == NULL)
-                return -1;
+                return -EBADF;
 
         memset(fp, 0, sizeof(struct _IO_FILE));
@@ -136 +131 @@
         fp->read = sio_read;
         fp->write = sio_write;
+        fp->seek = sio_seek;
+        fp->ioctl = sio_ioctl;
 
         return fp;
@@ -160 +157 @@
         fp->read = file_read;
         fp->write = file_write;
+        fp->seek = file_seek;
+        fp->ioctl = file_ioctl;
 
         return fp;
@@ -172 +171 @@
 {
         return id_to_fd(IO_TYPE_FILE, fileid);
+}
+
+struct _IO_FILE *new_dir_fd(int fileid)
+{
+        int fd = new_fd(IO_TYPE_DIR, fileid);
+        if ((fd < 0) || (fd >= fd_table_count))
+                return NULL;
+
+        struct _IO_FILE *fp = &fd_table[fd];
+        fp->close = dir_close;
+        fp->read = dir_read;
+        fp->write = dir_write;
+        fp->seek = dir_seek;
+        fp->ioctl = dir_ioctl;
+
+        return fp;
+}
+
+int delete_dir_fd(int dirid)
+{
+        return delete_fd(IO_TYPE_DIR, dirid);
+}
+
+struct _IO_FILE *dirid_to_fd(int dirid)
+{
+        return id_to_fd(IO_TYPE_DIR, dirid);
 }
 
@@ -184 +209 @@
         fp->read = tcp_fd_read;
         fp->write = tcp_fd_write;
+        fp->seek = tcp_fd_seek;
+        fp->ioctl = tcp_fd_ioctl;
 
         return fp;
@@ -208 +235 @@
         fp->read = udp_fd_read;
         fp->write = udp_fd_write;
+        fp->seek = udp_fd_seek;
+        fp->ioctl = udp_fd_ioctl;
 
         return fp;
@@ -220 +249 @@
 {
         return id_to_fd(IO_TYPE_UDP, udpid);
-}
-
-int shell_isatty(int fd)
-{
-        if ((fd < 0) || (fd >= fd_table_count))
-                return 0;
-
-        struct _IO_FILE *fp = &fd_table[fd];
-        if (fp->type == IO_TYPE_SIO)
-                return 1;
-
-        return 0;
 }
 
@@ -245 +262 @@
 #define TMO_MAX INT_MAX
 
-int select(int n, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *tv)
+int shell_select(int n, fd_set *__restrict rfds, fd_set *__restrict wfds, fd_set *__restrict efds, struct timeval *__restrict tv)
 {
         ER ret;
@@ -277 +294 @@
         }
 
-        return -1;
-}
-
-int poll(struct pollfd *fds, nfds_t nfds, int timeout)
+        return -EBADF;
+}
+
+int shell_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 {
         ER ret;
@@ -334 +351 @@
         }
 
-        return -1;
+        return -EBADF;
 }
 
@@ -541 +558 @@
         }
 }
+
+int shell_ioctl(int fd, int request, void *arg)
+{
+        struct _IO_FILE *fp = fd_to_fp(fd);
+        if (fp == NULL)
+                return -EBADF;
+
+        return fp->ioctl(fp, request, arg);
+}