Changeset 8cd8bf6 in mainline for uspace/lib/posix/stdio.c

Timestamp:

2011-07-08T17:25:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

11809eab

Parents:

f5b2522 (diff), ddc63fd (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) (5 diffs)

uspace/lib/posix/stdio.c

@@ -36 +36 @@
 #define LIBPOSIX_INTERNAL
 
-#include <assert.h>
-#include <errno.h>
+/* Has to be first. */
+#include "stdbool.h"
 
 #include "internal/common.h"
 #include "stdio.h"
+
+#include "assert.h"
+#include "errno.h"
 #include "string.h"
-
-/* not the best of solutions, but freopen will eventually
+#include "sys/types.h"
+
+#include "libc/io/printf_core.h"
+#include "libc/str.h"
+#include "libc/malloc.h"
+
+
+/* not the best of solutions, but freopen and ungetc will eventually
  * need to be implemented in libc anyway
  */
 #include "../c/generic/private/stdio.h"
 
-/**
- * 
- * @param c
- * @param stream
- * @return 
+/** Clears the stream's error and end-of-file indicators.
+ *
+ * @param stream Stream whose indicators shall be cleared.
+ */
+void posix_clearerr(FILE *stream)
+{
+        stream->error = 0;
+        stream->eof = 0;
+}
+
+/**
+ * Generate a pathname for the controlling terminal.
+ *
+ * @param s Allocated buffer to which the pathname shall be put.
+ * @return Either s or static location filled with the requested pathname.
+ */
+char *posix_ctermid(char *s)
+{
+        /* Currently always returns an error value (empty string). */
+        // TODO: return a real terminal path
+
+        static char dummy_path[L_ctermid] = {'\0'};
+
+        if (s == NULL) {
+                return dummy_path;
+        }
+
+        s[0] = '\0';
+        return s;
+}
+
+/**
+ * Push byte back into input stream.
+ * 
+ * @param c Byte to be pushed back.
+ * @param stream Stream to where the byte shall be pushed.
+ * @return Provided byte on success or EOF if not possible.
  */
 int posix_ungetc(int c, FILE *stream)
 {
-        // TODO
-        not_implemented();
-}
-
-/**
- * 
- * @param filename
- * @param mode
- * @param stream
- * @return
+        uint8_t b = (uint8_t) c;
+
+        bool can_unget =
+                /* Provided character is legal. */
+            c != EOF &&
+                /* Stream is consistent. */
+            !stream->error &&
+                /* Stream is buffered. */
+            stream->btype != _IONBF &&
+                /* 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->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. */
+            stream->buf_tail > stream->buf;
+
+        if (can_unget) {
+                --stream->buf_tail;
+                stream->buf_tail[0] = b;
+                stream->eof = false;
+                return (int) b;
+        } else {
+                return EOF;
+        }
+}
+
+/**
+ * Read a stream until the delimiter (or EOF) is encountered.
+ *
+ * @param lineptr Pointer to the output buffer in which there will be stored
+ *     nul-terminated string together with the delimiter (if encountered).
+ *     Will be resized if necessary.
+ * @param n Pointer to the size of the output buffer. Will be increased if
+ *     necessary.
+ * @param delimiter Delimiter on which to finish reading the stream.
+ * @param stream Input stream.
+ * @return Number of fetched characters (including delimiter if encountered)
+ *     or -1 on error (set in errno).
+ */
+ssize_t posix_getdelim(char **restrict lineptr, size_t *restrict n,
+    int delimiter, FILE *restrict stream)
+{
+        /* Check arguments for sanity. */
+        if (!lineptr || !n) {
+                errno = EINVAL;
+                return -1;
+        }
+
+        size_t alloc_step = 80; /* Buffer size gain during reallocation. */
+        char *pos = *lineptr; /* Next free byte of the output buffer. */
+        size_t cnt = 0; /* Number of fetched characters. */
+        int c = fgetc(stream); /* Current input character. Might be EOF. */
+
+        do {
+                /* Mask EOF as NUL to terminate string. */
+                if (c == EOF) {
+                        c = '\0';
+                }
+
+                /* Ensure there is still space left in the buffer. */
+                if (pos == *lineptr + *n) {
+                        *lineptr = realloc(*lineptr, *n + alloc_step);
+                        if (*lineptr) {
+                                pos = *lineptr + *n;
+                                *n += alloc_step;
+                        } else {
+                                errno = ENOMEM;
+                                return -1;
+                        }
+                }
+
+                /* Store the fetched character. */
+                *pos = c;
+
+                /* Fetch the next character according to the current character. */
+                if (c != '\0') {
+                        ++pos;
+                        ++cnt;
+                        if (c == delimiter) {
+                                /* Delimiter was just stored. Provide EOF as the next
+                                 * character - it will be masked as NUL and output string
+                                 * will be properly terminated. */
+                                c = EOF;
+                        } else {
+                                /* Neither delimiter nor EOF were encountered. Just fetch
+                                 * the next character from the stream. */
+                                c = fgetc(stream);
+                        }
+                }
+        } while (c != '\0');
+
+        if (errno == EOK && cnt > 0) {
+                return cnt;
+        } else {
+                /* Either some error occured or the stream was already at EOF. */
+                return -1;
+        }
+}
+
+/**
+ * Read a stream until the newline (or EOF) is encountered.
+ * 
+ * @param lineptr Pointer to the output buffer in which there will be stored
+ *     nul-terminated string together with the delimiter (if encountered).
+ *     Will be resized if necessary.
+ * @param n Pointer to the size of the output buffer. Will be increased if
+ *     necessary.
+ * @param stream Input stream.
+ * @return Number of fetched characters (including newline if encountered)
+ *     or -1 on error (set in errno).
+ */
+ssize_t posix_getline(char **restrict lineptr, size_t *restrict n,
+    FILE *restrict stream)
+{
+        return posix_getdelim(lineptr, n, '\n', stream);
+}
+
+/**
+ * Reopen a file stream.
+ * 
+ * @param filename Pathname of a file to be reopened or NULL for changing
+ *     the mode of the stream.
+ * @param mode Mode to be used for reopening the file or changing current
+ *     mode of the stream.
+ * @param stream Current stream associated with the opened file.
+ * @return On success, either a stream of the reopened file or the provided
+ *     stream with a changed mode. NULL otherwise.
  */
 FILE *posix_freopen(
@@ -115 +278 @@
 /**
  *
- * @param s
- */
-void posix_perror(const char *s)
+ * @param buf
+ * @param size
+ * @param mode
+ * @return
+ */
+FILE *posix_fmemopen(void *restrict buf, size_t size,
+    const char *restrict mode)
 {
         // TODO
@@ -124 +291 @@
 
 /**
- * 
- * @param stream
- * @param offset
- * @param whence
+ *
+ * @param bufp
+ * @param sizep
  * @return
  */
-int posix_fseeko(FILE *stream, posix_off_t offset, int whence)
+FILE *posix_open_memstream(char **bufp, size_t *sizep)
 {
         // TODO
@@ -137 +303 @@
 
 /**
- * 
- * @param stream
+ * Write error messages to standard error.
+ *
+ * @param s Error message.
+ */
+void posix_perror(const char *s)
+{
+        if (s == NULL || s[0] == '\0') {
+                fprintf(stderr, "%s\n", posix_strerror(errno));
+        } else {
+                fprintf(stderr, "%s: %s\n", s, posix_strerror(errno));
+        }
+}
+
+struct _posix_fpos {
+        off64_t offset;
+};
+
+/** Restores stream a to position previously saved with fgetpos().
+ *
+ * @param stream Stream to restore
+ * @param pos Position to restore
+ * @return Zero on success, non-zero (with errno set) on failure
+ */
+int posix_fsetpos(FILE *stream, const posix_fpos_t *pos)
+{
+        return fseek(stream, pos->offset, SEEK_SET);
+}
+
+/** Saves the stream's position for later use by fsetpos().
+ *
+ * @param stream Stream to save
+ * @param pos Place to store the position
+ * @return Zero on success, non-zero (with errno set) on failure
+ */
+int posix_fgetpos(FILE *restrict stream, posix_fpos_t *restrict pos)
+{
+        off64_t ret = ftell(stream);
+        if (ret == -1) {
+                return errno;
+        }
+        pos->offset = ret;
+        return 0;
+}
+
+/**
+ * Reposition a file-position indicator in a stream.
+ * 
+ * @param stream Stream to seek in.
+ * @param offset Direction and amount of bytes to seek.
+ * @param whence From where to seek.
+ * @return Zero on success, -1 otherwise.
+ */
+int posix_fseek(FILE *stream, long offset, int whence)
+{
+        return fseek(stream, (off64_t) offset, whence);
+}
+
+/**
+ * Reposition a file-position indicator in a stream.
+ * 
+ * @param stream Stream to seek in.
+ * @param offset Direction and amount of bytes to seek.
+ * @param whence From where to seek.
+ * @return Zero on success, -1 otherwise.
+ */
+int posix_fseeko(FILE *stream, posix_off_t offset, int whence)
+{
+        return fseek(stream, (off64_t) offset, whence);
+}
+
+/**
+ * Discover current file offset in a stream.
+ * 
+ * @param stream Stream for which the offset shall be retrieved.
+ * @return Current offset or -1 if not possible.
+ */
+long posix_ftell(FILE *stream)
+{
+        return (long) ftell(stream);
+}
+
+/**
+ * Discover current file offset in a stream.
+ * 
+ * @param stream Stream for which the offset shall be retrieved.
+ * @return Current offset or -1 if not possible.
+ */
+posix_off_t posix_ftello(FILE *stream)
+{
+        return (posix_off_t) ftell(stream);
+}
+
+/**
+ * Print formatted output to the opened file.
+ *
+ * @param fildes File descriptor of the opened file.
+ * @param format Format description.
+ * @return Either the number of printed characters or negative value on error.
+ */
+int posix_dprintf(int fildes, const char *restrict format, ...)
+{
+        va_list list;
+        va_start(list, format);
+        int result = posix_vdprintf(fildes, format, list);
+        va_end(list);
+        return result;
+}
+
+/**
+ * Write ordinary string to the opened file.
+ *
+ * @param str String to be written.
+ * @param size Size of the string (in bytes)..
+ * @param fd File descriptor of the opened file.
+ * @return The number of written characters.
+ */
+static int _dprintf_str_write(const char *str, size_t size, void *fd)
+{
+        ssize_t wr = write(*(int *) fd, str, size);
+        return str_nlength(str, wr);
+}
+
+/**
+ * Write wide string to the opened file.
+ * 
+ * @param str String to be written.
+ * @param size Size of the string (in bytes).
+ * @param fd File descriptor of the opened file.
+ * @return The number of written characters.
+ */
+static int _dprintf_wstr_write(const wchar_t *str, size_t size, void *fd)
+{
+        size_t offset = 0;
+        size_t chars = 0;
+        size_t sz;
+        char buf[4];
+        
+        while (offset < size) {
+                sz = 0;
+                if (chr_encode(str[chars], buf, &sz, sizeof(buf)) != EOK) {
+                        break;
+                }
+                
+                if (write(*(int *) fd, buf, sz) != (ssize_t) sz) {
+                        break;
+                }
+                
+                chars++;
+                offset += sizeof(wchar_t);
+        }
+        
+        return chars;
+}
+
+/**
+ * Print formatted output to the opened file.
+ * 
+ * @param fildes File descriptor of the opened file.
+ * @param format Format description.
+ * @param ap Print arguments.
+ * @return Either the number of printed characters or negative value on error.
+ */
+int posix_vdprintf(int fildes, const char *restrict format, va_list ap)
+{
+        printf_spec_t spec = {
+                .str_write = _dprintf_str_write,
+                .wstr_write = _dprintf_wstr_write,
+                .data = &fildes
+        };
+        
+        return printf_core(format, &spec, ap);
+}
+
+/**
+ * Print formatted output to the string.
+ * 
+ * @param s Output string.
+ * @param format Format description.
+ * @return Either the number of printed characters (excluding null byte) or
+ *     negative value on error.
+ */
+int posix_sprintf(char *s, const char *restrict format, ...)
+{
+        va_list list;
+        va_start(list, format);
+        int result = posix_vsprintf(s, format, list);
+        va_end(list);
+        return result;
+}
+
+/**
+ * Print formatted output to the string.
+ * 
+ * @param s Output string.
+ * @param format Format description.
+ * @param ap Print arguments.
+ * @return Either the number of printed characters (excluding null byte) or
+ *     negative value on error.
+ */
+int posix_vsprintf(char *s, const char *restrict format, va_list ap)
+{
+        return vsnprintf(s, STR_NO_LIMIT, format, ap);
+}
+
+/**
+ * Convert formatted input from the stream.
+ * 
+ * @param stream Input stream.
+ * @param format Format description.
+ * @return The number of converted output items or EOF on failure.
+ */
+int posix_fscanf(FILE *restrict stream, const char *restrict format, ...)
+{
+        va_list list;
+        va_start(list, format);
+        int result = posix_vfscanf(stream, format, list);
+        va_end(list);
+        return result;
+}
+
+/**
+ * Convert formatted input from the standard input.
+ * 
+ * @param format Format description.
+ * @return The number of converted output items or EOF on failure.
+ */
+int posix_scanf(const char *restrict format, ...)
+{
+        va_list list;
+        va_start(list, format);
+        int result = posix_vscanf(format, list);
+        va_end(list);
+        return result;
+}
+
+/**
+ * Convert formatted input from the standard input.
+ * 
+ * @param format Format description.
+ * @param arg Output items.
+ * @return The number of converted output items or EOF on failure.
+ */
+int posix_vscanf(const char *restrict format, va_list arg)
+{
+        return posix_vfscanf(stdin, format, arg);
+}
+
+/**
+ * Convert formatted input from the string.
+ * 
+ * @param s Input string.
+ * @param format Format description.
+ * @return The number of converted output items or EOF on failure.
+ */
+int posix_sscanf(const char *restrict s, const char *restrict format, ...)
+{
+        va_list list;
+        va_start(list, format);
+        int result = posix_vsscanf(s, format, list);
+        va_end(list);
+        return result;
+}
+
+/**
+ * Acquire file stream for the thread.
+ *
+ * @param file File stream to lock.
+ */
+void posix_flockfile(FILE *file)
+{
+        /* dummy */
+}
+
+/**
+ * Acquire file stream for the thread (non-blocking).
+ *
+ * @param file File stream to lock.
+ * @return Zero for success and non-zero if the lock cannot be acquired.
+ */
+int posix_ftrylockfile(FILE *file)
+{
+        /* dummy */
+        return 0;
+}
+
+/**
+ * Relinquish the ownership of the locked file stream.
+ *
+ * @param file File stream to unlock.
+ */
+void posix_funlockfile(FILE *file)
+{
+        /* dummy */
+}
+
+/**
+ * Get a byte from a stream (thread-unsafe).
+ *
+ * @param stream Input file stream.
+ * @return Either read byte or EOF.
+ */
+int posix_getc_unlocked(FILE *stream)
+{
+        return getc(stream);
+}
+
+/**
+ * Get a byte from the standard input stream (thread-unsafe).
+ *
+ * @return Either read byte or EOF.
+ */
+int posix_getchar_unlocked(void)
+{
+        return getchar();
+}
+
+/**
+ * Put a byte on a stream (thread-unsafe).
+ *
+ * @param c Byte to output.
+ * @param stream Output file stream.
+ * @return Either written byte or EOF.
+ */
+int posix_putc_unlocked(int c, FILE *stream)
+{
+        return putc(c, stream);
+}
+
+/**
+ * Put a byte on the standard output stream (thread-unsafe).
+ * 
+ * @param c Byte to output.
+ * @return Either written byte or EOF.
+ */
+int posix_putchar_unlocked(int c)
+{
+        return putchar(c);
+}
+
+/**
+ * Remove a file.
+ *
+ * @param path Pathname of the file that shall be removed.
+ * @return Zero on success, -1 otherwise.
+ */
+int posix_remove(const char *path)
+{
+        // FIXME: unlink() and rmdir() seem to be equivalent at the moment,
+        //        but that does not have to be true forever
+        return unlink(path);
+}
+
+/**
+ * 
+ * @param s
  * @return
  */
-posix_off_t posix_ftello(FILE *stream)
-{
-        // TODO
-        not_implemented();
-}
-
-/**
- * 
- * @param s
- * @param format
- * @param ...
- * @return
- */
-int posix_sprintf(char *s, const char *format, ...)
-{
-        // TODO
-        not_implemented();
-}
-
-/**
- * 
- * @param s
- * @param format
- * @param ...
- * @return
- */
-int posix_vsprintf(char *s, const char *format, va_list ap)
+char *posix_tmpnam(char *s)
 {
         // TODO: low priority, just a compile-time dependency of binutils
@@ -173 +666 @@
 }
 
-/**
- * 
- * @param s
- * @param format
- * @param ...
- * @return
- */
-int posix_sscanf(const char *s, const char *format, ...)
-{
-        // TODO
-        not_implemented();
-}
-
-/**
- *
- * @param path
- * @return
- */
-int posix_remove(const char *path)
-{
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
-}
-
-/**
- * 
- * @param s
- * @return
- */
-char *posix_tmpnam(char *s)
-{
-        // TODO: low priority, just a compile-time dependency of binutils
-        not_implemented();
-}
-
 /** @}
  */