X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2Finclude%2Fstdio.h;h=8d950656c3ce40bec2d491fb8ac8e6ef4d771ac0;hb=032ec5adf8d4faeaa9293da50ad2e32c83dd1704;hp=b8e70f95969db1b83d8c0d8560ce2092d1215780;hpb=17e16b3110b4c5124b0707435e0427993d696545;p=tpg%2Facess2.git

diff --git a/Usermode/include/stdio.h b/Usermode/include/stdio.h
index b8e70f95..8d950656 100644
--- a/Usermode/include/stdio.h
+++ b/Usermode/include/stdio.h
@@ -1,23 +1,47 @@
-/*
- * AcessOS LibC
- * stdlib.h
- */
-#ifndef __STDIO_H
+/*
+ * AcessOS LibC
+ * stdlib.h
+ */
+#ifndef __STDIO_H
 #define __STDIO_H
 
+#include <stdlib.h>
+#include <stdarg.h>
+
+/* === Types === */
 typedef struct sFILE	FILE;
-
-extern int	printf(const char *format, ...);
-extern void sprintfv(char *buf, char *format, va_list args);
-extern int	ssprintfv(char *format, va_list args);
-extern int	sprintf(char *buf, char *format, ...);
-
-extern FILE	*fopen(char *file, char *mode);
-extern FILE	*freopen(FILE *fp, char *file, char *mode);
-extern void fclose(FILE *fp);
-extern void fflush(FILE *fp);
-
+
+/* === CONSTANTS === */
+#define EOF	(-1)
+
+/* --- Standard IO --- */
+extern int	printf(const char *format, ...);
+extern int	vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args);
+extern int	vsprintf(char *buf, const char *format, va_list args);
+extern int	sprintf(char *buf, const char *format, ...);
+extern int	snprintf(char *buf, size_t maxlen, const char *format, ...);
+
+extern FILE	*fopen(const char *file, const char *mode);
+extern FILE	*freopen(const char *file, const char *mode, FILE *fp);
+extern FILE	*fdopen(int fd, const char *modes);
+extern int	fclose(FILE *fp);
+extern void	fflush(FILE *fp);
+extern off_t	ftell(FILE *fp);
+extern int	fseek(FILE *fp, long int amt, int whence);
+
+extern size_t	fread(void *buf, size_t size, size_t n, FILE *fp);
+extern size_t	fwrite(void *buf, size_t size, size_t n, FILE *fp);
+extern int	fgetc(FILE *fp);
+extern int	fputc(int ch, FILE *fp);
+extern int	getchar(void);
+extern int	putchar(int ch);
+
 extern int	fprintf(FILE *fp, const char *format, ...);
+extern int	vfprintf(FILE *fp, const char *format, va_list args);
+
+extern FILE	*stdin;
+extern FILE	*stdout;
+extern FILE	*stderr;
 
-#endif
+#endif