Changeset 04803bf in mainline for uspace/lib/c/include/stdio.h

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

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>
+
+#ifndef NVERIFY_PRINTF
+
+#define PRINTF_ATTRIBUTE(start, end) \
+        __attribute__((format(gnu_printf, start, end)))
+
+#else /* NVERIFY_PRINTF */
+
+#define PRINTF_ATTRIBUTE(start, end)
+
+#endif /* NVERIFY_PRINTF */
 
 #define EOF  (-1)
@@ -56 +67 @@
 #ifndef SEEK_SET
         #define SEEK_SET  0
+#endif
+
+#ifndef SEEK_CUR
         #define SEEK_CUR  1
+#endif
+
+#ifndef SEEK_END
         #define SEEK_END  2
 #endif
@@ -69 +86 @@
 };
 
+enum _buffer_state {
+        /** Buffer is empty */
+        _bs_empty,
+
+        /** Buffer contains data to be written */
+        _bs_write,
+
+        /** Buffer contains prefetched data for reading */
+        _bs_read
+};
+
 typedef struct {
         /** Linked list pointer. */
@@ -88 +116 @@
         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 +147 @@
 /* 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);
@@ -117 +160 @@
 
 /* Formatted string output functions */
-extern int fprintf(FILE *, const char*, ...);
+extern int fprintf(FILE *, const char*, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 extern int vfprintf(FILE *, const char *, va_list);
 
-extern int printf(const char *, ...);
+extern int printf(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
 extern int vprintf(const char *, va_list);
 
-extern int snprintf(char *, size_t , const char *, ...);
-extern int asprintf(char **, const char *, ...);
+extern int snprintf(char *, size_t , const char *, ...)
+    PRINTF_ATTRIBUTE(3, 4);
+extern int asprintf(char **, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 extern int vsnprintf(char *, size_t, const char *, va_list);
 
@@ -135 +182 @@
 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 *);
+extern int fileno(FILE *);
 
 extern int fflush(FILE *);