From 4a564f5b757febc5e74523bce3ccb2424a772036 Mon Sep 17 00:00:00 2001 From: solar Date: Sat, 11 Dec 2010 09:16:11 +0000 Subject: [PATCH] EOL handling is for text mode conversion. git-svn-id: https://srv7.svn-repos.de/dev34/pdclib/trunk@490 546481bc-9713-0410-bf18-d3337bbf4a3e --- functions/_PDCLIB/eol.c | 15 --------------- functions/stdio/puts.c | 22 ++++++---------------- 2 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 functions/_PDCLIB/eol.c diff --git a/functions/_PDCLIB/eol.c b/functions/_PDCLIB/eol.c deleted file mode 100644 index d6edacf..0000000 --- a/functions/_PDCLIB/eol.c +++ /dev/null @@ -1,15 +0,0 @@ -/* $Id$ */ - -/* _PDCLIB_eol - - This file is part of the Public Domain C Library (PDCLib). - Permission is granted to use, modify, and / or redistribute at will. -*/ - -#ifndef _PDCLIB_CONFIG_H -#define _PDCLIB_CONFIG_H _PDCLIB_CONFIG_H -#include <_PDCLIB_config.h> -#endif - -const char * _PDCLIB_eol = _PDCLIB_endl; - diff --git a/functions/stdio/puts.c b/functions/stdio/puts.c index e28a2b8..b7954ea 100644 --- a/functions/stdio/puts.c +++ b/functions/stdio/puts.c @@ -30,26 +30,16 @@ int puts( const char * s ) } } } - /* FIXME: Think-o. '\n' is lineend, conversion to platform-specific - tales place only for text streams. - */ - s = _PDCLIB_eol; - while ( *s != '\0' ) + stdout->buffer[ stdout->bufidx++ ] = '\n'; + if ( ( stdout->bufidx == stdout->bufsize ) || + ( stdout->status & ( _IOLBF | _IONBF ) ) ) { - stdout->buffer[ stdout->bufidx++ ] = *s++; - if ( stdout->bufidx == stdout->bufsize ) - { - if ( _PDCLIB_flushbuffer( stdout ) == EOF ) - { - return EOF; - } - } + return _PDCLIB_flushbuffer( stdout ); } - if ( stdout->status & ( _IOLBF | _IONBF ) ) + else { - return _PDCLIB_flushbuffer( stdout ); + return 0; } - return 0; } #endif -- 2.30.2