Changeset 1916d1f in mainline for uspace/lib/posix/stdio.c

Timestamp:

2011-07-12T13:41:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

50fc490

Parents:

11809eab (diff), 6817eba (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 libposix changes.

File:

• uspace/lib/posix/stdio.c (modified) (4 diffs)

uspace/lib/posix/stdio.c

@@ -89 +89 @@
 
 /**
+ * Put a string on the stream.
+ * 
+ * @param s String to be written.
+ * @param stream Output stream.
+ * @return Non-negative on success, EOF on failure.
+ */
+int posix_fputs(const char *restrict s, FILE *restrict stream)
+{
+        int rc = fputs(s, stream);
+        if (rc == 0) {
+                return EOF;
+        } else {
+                return 0;
+        }
+}
+
+/**
  * Push byte back into input stream.
  * 
@@ -100 +117 @@
 
         bool can_unget =
-                /* Provided character is legal. */
+            /* Provided character is legal. */
             c != EOF &&
-                /* Stream is consistent. */
+            /* Stream is consistent. */
             !stream->error &&
-                /* Stream is buffered. */
+            /* Stream is buffered. */
             stream->btype != _IONBF &&
-                /* Last operation on the stream was a read operation. */
+            /* Last operation on the stream was a read operation. */
             stream->buf_state == _bs_read &&
-                /* Stream buffer is already allocated (i.e. there was already carried
-                 * out either write or read operation on the stream). This is probably
-                 * redundant check but let's be safe. */
+            /* Stream buffer is already allocated (i.e. there was already carried
+             * out either write or read operation on the stream). This is probably
+             * redundant check but let's be safe. */
             stream->buf != NULL &&
-                /* There is still space in the stream to retreat. POSIX demands the
-                 * possibility to unget at least 1 character. It should be always
-                 * possible, assuming the last operation on the stream read at least 1
-                 * character, because the buffer is refilled in the lazily manner. */
+            /* There is still space in the stream to retreat. POSIX demands the
+             * possibility to unget at least 1 character. It should be always
+             * possible, assuming the last operation on the stream read at least 1
+             * character, because the buffer is refilled in the lazily manner. */
             stream->buf_tail > stream->buf;
 
@@ -230 +247 @@
  *     stream with a changed mode. NULL otherwise.
  */
-FILE *posix_freopen(
-    const char *restrict filename,
-    const char *restrict mode,
-    FILE *restrict stream)
+FILE *posix_freopen(const char *restrict filename, 
+    const char *restrict mode, FILE *restrict stream)
 {
         assert(mode != NULL);
@@ -393 +408 @@
 {
         return (posix_off_t) ftell(stream);
+}
+
+/**
+ * Discard prefetched data or write unwritten data.
+ * 
+ * @param stream Stream that shall be flushed.
+ * @return Zero on success, EOF on failure.
+ */
+int posix_fflush(FILE *stream)
+{
+        int rc = fflush(stream);
+        if (rc < 0) {
+                errno = -rc;
+                return EOF;
+        } else {
+                return 0;
+        }
 }