Changeset 9dae51d7 in mainline

Timestamp:

2006-09-06T21:54:12Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9141377

Parents:

d7e3f1ad

Message:

read() and write() now check if the virtual function they want to
call exists. Thus, these calls will not kill the whole task
if called for instance from a driver task but gracefully fail.

File:

• uspace/libc/generic/io/stream.c (modified) (2 diffs)

uspace/libc/generic/io/stream.c

@@ -165 +165 @@
 ssize_t write(int fd, const void *buf, size_t count)
 {
-//      __SYSCALL3(SYS_IO, 1, (sysarg_t)buf, (sysarg_t) count);
-//      return count;
-        if (fd < FDS)
+        if (fd < FDS && streams[fd].w)
                 return streams[fd].w(streams[fd].param, buf, count);
         
@@ -175 +173 @@
 ssize_t read(int fd, void *buf, size_t count)
 {
-        if (fd < FDS)
+        if (fd < FDS && streams[fd].r)
                 return streams[fd].r(streams[fd].param, buf, count);