| /trunk/uspace/app/tester/stdio/stdio1.def |
|---|
| 1,6 → 1,6 |
| { |
| "stdio1", |
| "ANSI C streams test", |
| "ANSI C streams reading test", |
| &test_stdio1, |
| true |
| }, |
| /trunk/uspace/app/tester/stdio/stdio2.def |
|---|
| 0,0 → 1,6 |
| { |
| "stdio2", |
| "ANSI C streams writing test", |
| &test_stdio2, |
| true |
| }, |
| /trunk/uspace/app/tester/stdio/stdio2.c |
|---|
| 0,0 → 1,69 |
| /* |
| * Copyright (c) 2008 Jiri Svoboda |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| #include <stdio.h> |
| #include <stdlib.h> |
| #include <errno.h> |
| #include "../tester.h" |
| char * test_stdio2(bool quiet) |
| { |
| FILE *f; |
| char *file_name = "/test"; |
| size_t n; |
| int c; |
| printf("Open file '%s' for writing\n", file_name); |
| errno = 0; |
| f = fopen(file_name, "wt"); |
| if (f == NULL) |
| return "Failed opening file."; |
| fprintf(f, "Integer: %d, string: '%s'\n", 42, "Hello!"); |
| if (fclose(f) != 0) |
| return "Failed closing file."; |
| printf("Open file '%s' for reading\n", file_name); |
| f = fopen(file_name, "rt"); |
| if (f == NULL) |
| return "Failed opening file."; |
| printf("File contains:\n"); |
| while (true) { |
| c = fgetc(f); |
| if (c == EOF) break; |
| putchar(c); |
| } |
| if (fclose(f) != 0) |
| return "Failed closing file."; |
| return NULL; |
| } |
| /trunk/uspace/app/tester/tester.c |
|---|
| 60,6 → 60,7 |
| #include "vfs/vfs1.def" |
| #include "console/console1.def" |
| #include "stdio/stdio1.def" |
| #include "stdio/stdio2.def" |
| {NULL, NULL, NULL} |
| }; |
| /trunk/uspace/app/tester/tester.h |
|---|
| 73,6 → 73,7 |
| extern char * test_vfs1(bool quiet); |
| extern char * test_console1(bool quiet); |
| extern char * test_stdio1(bool quiet); |
| extern char * test_stdio2(bool quiet); |
| extern test_t tests[]; |
| /trunk/uspace/app/tester/Makefile |
|---|
| 58,6 → 58,7 |
| devmap/devmap1.c \ |
| console/console1.c \ |
| stdio/stdio1.c \ |
| stdio/stdio2.c \ |
| vfs/vfs1.c |
| OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) |
| /trunk/uspace/lib/libc/include/stdio.h |
|---|
| 63,6 → 63,8 |
| int eof; |
| } FILE; |
| extern FILE *stdin, *stdout, *stderr; |
| extern int getchar(void); |
| extern int puts(const char *); |
| 70,7 → 72,7 |
| extern int printf(const char *, ...); |
| extern int asprintf(char **, const char *, ...); |
| extern int sprintf(char *, const char *fmt, ...); |
| extern int sprintf(char *, const char *, ...); |
| extern int snprintf(char *, size_t , const char *, ...); |
| extern int vprintf(const char *, va_list); |
| 77,8 → 79,6 |
| extern int vsprintf(char *, const char *, va_list); |
| extern int vsnprintf(char *, size_t, const char *, va_list); |
| #define fprintf(f, fmt, ...) printf(fmt, ##__VA_ARGS__) |
| extern int rename(const char *, const char *); |
| extern FILE *fopen(const char *, const char *); |
| 89,10 → 89,13 |
| extern int ferror(FILE *); |
| extern void clearerr(FILE *); |
| extern int fgetc(FILE *);; |
| extern int fgetc(FILE *); |
| extern int fputc(int, FILE *); |
| extern int fputs(const char *, FILE *); |
| extern int fprintf(FILE *, const char *, ...); |
| extern int vfprintf(FILE *, const char *, va_list); |
| #define getc fgetc |
| #define putc fputc |
| /trunk/uspace/lib/libc/generic/io/stdio.c |
|---|
| 43,6 → 43,8 |
| #include <bool.h> |
| #include <stdio.h> |
| FILE *stdin, *stdout, *stderr; |
| /** |
| * Open a stream. |
| * |
| /trunk/uspace/lib/libc/generic/io/fprintf.c |
|---|
| 0,0 → 1,69 |
| /* |
| * Copyright (c) 2008 Jiri Svoboda |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup libc |
| * @{ |
| */ |
| /** |
| * @file |
| * @brief fprintf, vfprintf |
| */ |
| #include <stdio.h> |
| #include <sys/types.h> |
| #include <io/printf_core.h> |
| static int vfprintf_write(const char *s, size_t count, void *f) |
| { |
| return fwrite(s, 1, count, (FILE *) f); |
| } |
| int vfprintf(FILE *f, const char *fmt, va_list ap) |
| { |
| struct printf_spec ps = { |
| (int (*)(void *, size_t, void *)) vfprintf_write, |
| (void *) f |
| }; |
| return printf_core(fmt, &ps, ap); |
| } |
| int fprintf(FILE *f, const char *fmt, ...) |
| { |
| int rv; |
| va_list args; |
| va_start(args, fmt); |
| rv = vfprintf(f, fmt, args); |
| va_end(args); |
| return rv; |
| } |
| /** @} |
| */ |
| /trunk/uspace/lib/libc/Makefile |
|---|
| 60,6 → 60,7 |
| generic/io/asprintf.c \ |
| generic/io/io.c \ |
| generic/io/printf.c \ |
| generic/io/fprintf.c \ |
| generic/io/stdio.c \ |
| generic/io/stream.c \ |
| generic/io/sprintf.c \ |