Basic implementation of strftime(), untested.

[pdclib] / includes / stdio.h

diff --git a/includes/stdio.h b/includes/stdio.h
index 6b562d95bd6b5732730c1adaefcd220c6c0260b9..3363eeed07deea0a4fafb15aec8a7587cdb71ad4 100644 (file)
--- a/includes/stdio.h
+++ b/includes/stdio.h
@@ -1,6 +1,4 @@
-/* $Id$ */
-
-/* 7.19 Input/output <stdio.h>
+/* Input/output <stdio.h>

 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.


@@ -9,10 +7,7 @@
 #ifndef _PDCLIB_STDIO_H
 #define _PDCLIB_STDIO_H _PDCLIB_STDIO_H
 
 #ifndef _PDCLIB_STDIO_H
 #define _PDCLIB_STDIO_H _PDCLIB_STDIO_H
 

-#ifndef _PDCLIB_INT_H
-#define _PDCLIB_INT_H _PDCLIB_INT_H
-#include <_PDCLIB_int.h>
-#endif
+#include "_PDCLIB_int.h"

 
 #ifndef _PDCLIB_SIZE_T_DEFINED
 #define _PDCLIB_SIZE_T_DEFINED _PDCLIB_SIZE_T_DEFINED
 
 #ifndef _PDCLIB_SIZE_T_DEFINED
 #define _PDCLIB_SIZE_T_DEFINED _PDCLIB_SIZE_T_DEFINED


@@ -59,7 +54,7 @@ extern FILE * stderr;
 int remove( const char * filename );
 
 /* Rename the given old file to the given new name.
 int remove( const char * filename );
 
 /* Rename the given old file to the given new name.

-   Returns zero if successful, non-zero otherwise. 
+   Returns zero if successful, non-zero otherwise.

    This implementation does detect if the old filename corresponds to an open
    file, and fails the rename in this case.
    If there already is a file with the new filename, behaviour is defined by
    This implementation does detect if the old filename corresponds to an open
    file, and fails the rename in this case.
    If there already is a file with the new filename, behaviour is defined by


@@ -654,31 +649,23 @@ int fputc( int c, FILE * stream );
 */
 int fputs( const char * _PDCLIB_restrict s, FILE * _PDCLIB_restrict stream );
 
 */
 int fputs( const char * _PDCLIB_restrict s, FILE * _PDCLIB_restrict stream );
 

-/* Equivalent to fgetc( stream ), but may be implemented as a macro that
+/* Equivalent to fgetc( stream ), but may be overloaded by a macro that

    evaluates its parameter more than once.
 */
    evaluates its parameter more than once.
 */

-#define getc( stream ) fgetc( stream )
+int getc( FILE * stream );

 
 

-/* Equivalent to fgetc( stdin ), but may be implemented as a macro. */
-#define getchar() fgetc( stdin )
-
-/* Read characters from given stream into the array s, stopping at \n or EOF.
-   The string read is terminated with \0. Returns s if successful. If EOF is
-   encountered before any characters are read, the contents of s are unchanged,
-   and NULL is returned. If a read error occurs, the contents of s are indeter-
-   minate, and NULL is returned.
-*/
-char * gets( char * s );
+/* Equivalent to fgetc( stdin ). */
+int getchar( void );

 
 

-/* Equivalent to fputc( c, stream ), but may be implemented as a macro that
+/* Equivalent to fputc( c, stream ), but may be overloaded by a macro that

    evaluates its parameter more than once.
 */
    evaluates its parameter more than once.
 */

-#define putc( c, stream ) fputc( c, stream )
+int putc( int c, FILE * stream );

 
 

-/* Equivalent to fputc( c, stdout ), but may be implemented as a macro that
+/* Equivalent to fputc( c, stdout ), but may be overloaded by a macro that

    evaluates its parameter more than once.
 */
    evaluates its parameter more than once.
 */

-#define putchar( c ) putc( c, stdout )
+int putchar( int c );

 
 /* Write the string s (not including the terminating \0) to stdout, and append
    a newline to the output. Returns a value >= 0 when successful, EOF if a
 
 /* Write the string s (not including the terminating \0) to stdout, and append
    a newline to the output. Returns a value >= 0 when successful, EOF if a