Changeset 371bd7d in mainline for uspace/lib/c/include/stdio.h

Timestamp:

2010-03-27T09:22:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/include/stdio.h (moved) (moved from uspace/lib/libc/include/stdio.h ) (7 diffs)

uspace/lib/c/include/stdio.h

@@ -38 +38 @@
 #include <sys/types.h>
 #include <stdarg.h>
-#include <string.h>
+#include <str.h>
 #include <adt/list.h>
 
@@ -46 +46 @@
 #define BUFSIZ  4096
 
-#define DEBUG(fmt, ...) \
+#define DEBUG(fmt, ...)se\
         { \
                 char _buf[256]; \
@@ -56 +56 @@
 #ifndef SEEK_SET
         #define SEEK_SET  0
+#endif
+
+#ifndef SEEK_CUR
         #define SEEK_CUR  1
+#endif
+
+#ifndef SEEK_END
         #define SEEK_END  2
 #endif
@@ -67 +73 @@
         /** Full buffering */
         _IOFBF
+};
+
+enum _buffer_state {
+        /** Buffer is empty */
+        _bs_empty,
+
+        /** Buffer contains data to be written */
+        _bs_write,
+
+        /** Buffer contains prefetched data for reading */
+        _bs_read
 };
 
@@ -88 +105 @@
         int phone;
 
+        /**
+         * Non-zero if the stream needs sync on fflush(). XXX change
+         * console semantics so that sync is not needed.
+         */
+        int need_sync;
+
         /** Buffering type */
         enum _buffer_type btype;
+
         /** Buffer */
         uint8_t *buf;
+
         /** Buffer size */
         size_t buf_size;
+
+        /** Buffer state */
+        enum _buffer_state buf_state;
+
         /** Buffer I/O pointer */
         uint8_t *buf_head;
+
+        /** Points to end of occupied space when in read mode. */
+        uint8_t *buf_tail;
 } FILE;
 
@@ -104 +136 @@
 /* Character and string input functions */
 extern int fgetc(FILE *);
-extern char *fgets(char *, size_t, FILE *);
+extern char *fgets(char *, int, FILE *);
 
 extern int getchar(void);
@@ -135 +167 @@
 extern size_t fwrite(const void *, size_t, size_t, FILE *);
 
-extern int fseek(FILE *, long, int);
+extern int fseek(FILE *, off64_t, int);
 extern void rewind(FILE *);
-extern int ftell(FILE *);
+extern off64_t ftell(FILE *);
 extern int feof(FILE *);