Changeset 234e39e in mainline for uspace/lib/libc

Timestamp:

2010-01-09T22:12:40Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4702798

Parents:

40d4c1d (diff), 9245413 (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 mkfile and mkfat.

Location:

uspace/lib/libc

Files:

• generic/io/io.c (modified) (1 diff)
• include/ipc/bd.h (modified) (1 diff)
• include/sys/types.h (modified) (1 diff)

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

@@ -554 +554 @@
 }
 
+int ftell(FILE *stream)
+{
+        off_t rc = lseek(stream->fd, 0, SEEK_CUR);
+        if (rc == (off_t) (-1)) {
+                /* errno has been set by lseek. */
+                return -1;
+        }
+
+        return rc;
+}
+
 void rewind(FILE *stream)
 {

uspace/lib/libc/include/ipc/bd.h

@@ -40 +40 @@
 typedef enum {
         BD_GET_BLOCK_SIZE = IPC_FIRST_USER_METHOD,
+        BD_GET_NUM_BLOCKS,
         BD_READ_BLOCKS,
         BD_WRITE_BLOCKS

uspace/lib/libc/include/sys/types.h

@@ -40 +40 @@
 typedef long off_t;
 typedef int mode_t;
+typedef uint64_t bn_t;  /**< Block number type. */
 
 typedef int32_t wchar_t;