Changeset 89c57b6 in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/io/io.c (modified) (3 diffs)

uspace/lib/c/generic/io/io.c

@@ -41 +41 @@
 #include <bool.h>
 #include <malloc.h>
+#include <async.h>
 #include <io/klog.h>
 #include <vfs/vfs.h>
 #include <ipc/devmap.h>
 #include <adt/list.h>
+#include "../private/io.h"
 
 static void _ffillbuf(FILE *stream);
@@ -322 +324 @@
         
         if (stream->phone >= 0)
-                ipc_hangup(stream->phone);
+                async_hangup(stream->phone);
         
         if (stream->fd >= 0)
@@ -757 +759 @@
 }
 
+int fileno(FILE *stream)
+{
+        if (stream->klog) {
+                errno = EBADF;
+                return -1;
+        }
+        
+        return stream->fd;
+}
+
 int fphone(FILE *stream)
 {