Changeset 4dc0fd6 in rtems

Timestamp:

Jan 19, 1998, 10:22:25 PM (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

866c465f

Parents:

6f9c75c3

Message:

Patch from Eric Norum:

With this in place, it is possible to fdopen a TCP stream socket and
getc/fprintf/etc. on the STDIO stream!

Files:

• c/src/exec/libcsupport/src/termios.c (modified) (1 diff)
• c/src/lib/libc/Makefile.in (modified) (1 diff)
• c/src/lib/libc/syscalls.c (modified) (3 diffs)
• c/src/lib/libc/termios.c (modified) (1 diff)
• cpukit/libcsupport/src/termios.c (modified) (1 diff)

c/src/exec/libcsupport/src/termios.c

@@ -114 +114 @@
         int             (*write)(int minor, const char *buf, int len);
 };
+
 static struct rtems_termios_tty *ttyHead, *ttyTail;
 static rtems_id ttyMutex;

c/src/lib/libc/Makefile.in

@@ -31 +31 @@
 
 include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/lib.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
 
 #

c/src/lib/libc/syscalls.c

@@ -27 +27 @@
 
 #include <rtems.h>
+#include <rtems/libio.h>
 
 #ifdef RTEMS_NEWLIB
@@ -36 +37 @@
 int __rtems_fstat(int _fd, struct stat* _sbuf)
 {
-  if ( _fd > 2 ) {
-    puts( "__rtems_fstat -- only stdio supported" );
-    assert( 0 );
-  }
-  _sbuf->st_mode = S_IFCHR;
 #ifdef HAVE_BLKSIZE
   _sbuf->st_blksize = 0;
 #endif
+
+  /*
+   * For now assume stdin/stdout/stderr are always a TTY line
+   */
+  if (_fd <= 2) {
+    _sbuf->st_mode = S_IFCHR;
+  } else {
+    switch (rtems_file_descriptor_type (_fd)) {
+    case RTEMS_FILE_DESCRIPTOR_TYPE_SOCKET:
+      _sbuf->st_mode = S_IFSOCK;
+      break;
+
+    default:
+      puts( "__rtems_fstat -- unknown socket type" );
+      assert( 0 );
+    }
+  }
   return 0;
 }
@@ -49 +62 @@
 int __rtems_isatty(int _fd)
 {
-  return 1;
+  struct stat st;
+
+  if (__rtems_fstat(_fd, &st) < 0)
+    return 0;
+  return S_ISCHR (st.st_mode);
 }
 

c/src/lib/libc/termios.c

@@ -114 +114 @@
         int             (*write)(int minor, const char *buf, int len);
 };
+
 static struct rtems_termios_tty *ttyHead, *ttyTail;
 static rtems_id ttyMutex;

cpukit/libcsupport/src/termios.c

@@ -114 +114 @@
         int             (*write)(int minor, const char *buf, int len);
 };
+
 static struct rtems_termios_tty *ttyHead, *ttyTail;
 static rtems_id ttyMutex;