Changeset 1c1002a in mainline for uspace/lib/libc

Timestamp:

2008-12-29T23:48:23Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

6b21292

Parents:

63088cc1

Message:

fprintf(), vfprintf().

Location:

uspace/lib/libc

Files:

• Makefile (modified) (1 diff)
• generic/io/fprintf.c (added)
• generic/io/stdio.c (modified) (1 diff)
• include/stdio.h (modified) (4 diffs)

uspace/lib/libc/Makefile

@@ -61 +61 @@
         generic/io/io.c \
         generic/io/printf.c \
+        generic/io/fprintf.c \
         generic/io/stdio.c \
         generic/io/stream.c \

uspace/lib/libc/generic/io/stdio.c

@@ -43 +43 @@
 #include <bool.h>
 #include <stdio.h>
+
+FILE *stdin, *stdout, *stderr;
 
 /**

uspace/lib/libc/include/stdio.h

@@ -64 +64 @@
 } FILE;
 
+extern FILE *stdin, *stdout, *stderr;
+
 extern int getchar(void);
 
@@ -71 +73 @@
 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 *, ...);
 
@@ -77 +79 @@
 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 *);
@@ -90 +90 @@
 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