import new version of dietlibc

1 files changed, 67 insertions, 40 deletions

diff --git a/mdk-stage1/dietlibc/include/stdio.h b/mdk-stage1/dietlibc/include/stdio.h
index 65974668d..7c7c698eb 100644
--- a/mdk-stage1/dietlibc/include/stdio.h
+++ b/mdk-stage1/dietlibc/include/stdio.h
@@ -1,69 +1,96 @@
 #ifndef _STDIO_H
 #define _STDIO_H
 
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
 typedef struct __stdio_file FILE;
 
-FILE *fopen (const char *path, const char *mode);
-FILE *fdopen (int fildes, const char *mode);
-FILE *freopen (const char *path, const char *mode, FILE *stream);
+FILE *fopen (const char *path, const char *mode) __THROW;
+FILE *fdopen (int fildes, const char *mode) __THROW;
+FILE *freopen (const char *path, const char *mode, FILE *stream) __THROW;
 
-int printf(const char *format, ...);
-int fprintf(FILE *stream, const char *format, ...);
-int sprintf(char *str, const char *format, ...);
-int snprintf(char *str, size_t size, const char *format, ...);
+int printf(const char *format, ...) __THROW;
+int fprintf(FILE *stream, const char *format, ...) __THROW;
+int sprintf(char *str, const char *format, ...) __THROW;
+int snprintf(char *str, size_t size, const char *format, ...) __THROW;
+int asprintf(char **ptr, const char* format, ...) __THROW;
 
-int scanf( const char *format, ...);
-int fscanf( FILE *stream, const char *format, ...);
-int sscanf( const char *str, const char *format, ...);
+int scanf( const char *format, ...) __THROW;
+int fscanf( FILE *stream, const char *format, ...) __THROW;
+int sscanf( const char *str, const char *format, ...) __THROW;
 
 #include <stdarg.h>
 
-int vprintf(const char *format, va_list ap);
-int vfprintf(FILE *stream, const char *format, va_list ap);
-int vsprintf(char *str, const char *format, va_list ap);
-int vsnprintf(char *str, size_t size, const char *format, va_list ap);
+int vprintf(const char *format, va_list ap) __THROW;
+int vfprintf(FILE *stream, const char *format, va_list ap) __THROW;
+int vsprintf(char *str, const char *format, va_list ap) __THROW;
+int vsnprintf(char *str, size_t size, const char *format, va_list ap) __THROW;
 
-int vscanf( const char *format, va_list ap);
-int vsscanf( const char *str, const char *format, va_list ap);
-int vfscanf( FILE *stream, const char *format, va_list ap);
+int vscanf( const char *format, va_list ap) __THROW;
+int vsscanf( const char *str, const char *format, va_list ap) __THROW;
+int vfscanf( FILE *stream, const char *format, va_list ap) __THROW;
 
-int ferror(FILE *stream);
-int feof(FILE *stream);
+int fgetc(FILE *stream) __THROW;
+char *fgets(char *s, int size, FILE *stream) __THROW;
+int getc(FILE *stream) __THROW;
+int getchar(void) __THROW;
+char *gets(char *s) __THROW;
+int ungetc(int c, FILE *stream) __THROW;
 
-int fgetc(FILE *stream);
-char *fgets(char *s, int size, FILE *stream);
-int getc(FILE *stream);
-int getchar(void);
-char *gets(char *s);
+int fputc(int c, FILE *stream) __THROW;
+int fputs(const char *s, FILE *stream) __THROW;
 
-int fputc(int c, FILE *stream);
-int fputs(const char *s, FILE *stream);
-int putc(int c, FILE *stream);
-int putchar(int c);
-int puts(const char *s);
+#define putc(c,stream) fputc(c,stream)
+#define putchar(c) fputc(c,stdout)
 
-int fseek( FILE *stream, long offset, int whence);
-long ftell( FILE *stream);
-void rewind( FILE *stream);
-int fgetpos( FILE *stream, fpos_t *pos);
-int fsetpos( FILE *stream, fpos_t *pos);
+#define getchar() fgetc(stdin)
+#define getc(stream) fgetc(stream)
 
-size_t fread( void *ptr, size_t size, size_t nmemb, FILE *stream);
+int puts(const char *s) __THROW;
 
-size_t fwrite( const void *ptr, size_t size, size_t nmemb, FILE *stream);
+long fseek( FILE *stream, long offset, int whence) __THROW;
+long ftell( FILE *stream) __THROW;
+void rewind( FILE *stream) __THROW;
+int fgetpos( FILE *stream, fpos_t *pos) __THROW;
+int fsetpos( FILE *stream, fpos_t *pos) __THROW;
 
-int fflush(FILE *stream);
+size_t fread( void *ptr, size_t size, size_t nmemb, FILE *stream) __THROW;
 
-int fclose(FILE *stream);
+size_t fwrite( const void *ptr, size_t size, size_t nmemb, FILE *stream) __THROW;
+
+int fflush(FILE *stream) __THROW;
+
+int fclose(FILE *stream) __THROW;
+
+int feof (FILE *stream) __THROW;
+int ferror( FILE *stream) __THROW;
+int fileno( FILE *stream) __THROW;
+
+int remove(const char *pathname) __THROW;
+
+void perror(const char *s) __THROW;
 
 extern FILE *stdin, *stdout, *stderr;
 
 #define EOF (int)(-1)
 
-void perror (const char *__s);
-
 #define BUFSIZ 128
 
+#define _IONBF 0
+#define _IOLBF 1
+#define _IOFBF 2
+
+int setvbuf(FILE *stream, char *buf, int mode , size_t size) __THROW;
+
+#define setbuf(stream,buf) setvbuf(stream,buf,buf?_IOFBF:_IONBF,BUFSIZ)
+#define setbuffer(stream,buf,size) setvbuf(stream,buf,buf?_IOFBF:_IONBF,size)
+#define setlinebuf(stream) setvbuf(stream,0,_IOLBF,BUFSIZ)
+
+FILE *popen(const char *command, const char *type) __THROW;
+int pclose(FILE *stream) __THROW;
+
+#define getc_unlocked(stream) getc(stream)
+#define putc_unlocked(c,stream) putc(c,stream)
+
 #endif