enable file feof callback when input is stdin

diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index f1f5fc86c11b3e39cd36d6a28b93bf4e15fe81f8..40c09aa6f2f0fa58a5970f00f7239804892eea4d 100644 (file)
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -468,9 +468,9 @@ FLAC_API FLAC__StreamDecoderInitStatus FLAC__stream_decoder_init_FILE(
                decoder,
                file_read_callback_,
                decoder->private_->file == stdin? 0: file_seek_callback_,
-               decoder->private_->file == stdin? 0: file_tell_callback_,/*@@@@@@ might work for stdin*/
+               decoder->private_->file == stdin? 0: file_tell_callback_,
                decoder->private_->file == stdin? 0: file_length_callback_,
-               decoder->private_->file == stdin? 0: file_eof_callback_,/*@@@@@@ might work for stdin*/
+               file_eof_callback_,
                write_callback,
                metadata_callback,
                error_callback,
@@ -2916,7 +2916,7 @@ FLAC__StreamDecoderTellStatus file_tell_callback_(const FLAC__StreamDecoder *dec
        off_t pos;
        (void)client_data;
 
-       if(decoder->private_->file == stdin) /*@@@@@@ may work for stdin */
+       if(decoder->private_->file == stdin)
                return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
        else if((pos = ftello(decoder->private_->file)) < 0)
                return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
@@ -2945,7 +2945,5 @@ FLAC__bool file_eof_callback_(const FLAC__StreamDecoder *decoder, void *client_d
 {
        (void)client_data;
 
-       if(decoder->private_->file == stdin) /*@@@@@@ feof() may work for stdin */
-               return false;
        return feof(decoder->private_->file)? true : false;
 }

diff --git a/src/libOggFLAC/stream_decoder.c b/src/libOggFLAC/stream_decoder.c
index edbfbc04a2d44ed83a5f7f50b8315a8a50dde4bd..9e211cf36fe3b0b588915a4d5e4a776d24d76b8d 100644 (file)
--- a/src/libOggFLAC/stream_decoder.c
+++ b/src/libOggFLAC/stream_decoder.c
@@ -271,9 +271,9 @@ OggFLAC_API FLAC__StreamDecoderInitStatus OggFLAC__stream_decoder_init_FILE(
                decoder,
                file_read_callback_,
                decoder->private_->file == stdin? 0: file_seek_callback_,
-               decoder->private_->file == stdin? 0: file_tell_callback_,/*@@@@@@ might work for stdin*/
+               decoder->private_->file == stdin? 0: file_tell_callback_,
                decoder->private_->file == stdin? 0: file_length_callback_,
-               decoder->private_->file == stdin? 0: file_eof_callback_,/*@@@@@@ might work for stdin*/
+               file_eof_callback_,
                write_callback,
                metadata_callback,
                error_callback,
@@ -1030,7 +1030,7 @@ FLAC__StreamDecoderTellStatus file_tell_callback_(const FLAC__StreamDecoder *sup
        off_t pos;
        (void)client_data;
 
-       if(decoder->private_->file == stdin) /*@@@@@@ may work for stdin */
+       if(decoder->private_->file == stdin)
                return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
        else if((pos = ftello(decoder->private_->file)) < 0)
                return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
@@ -1061,7 +1061,5 @@ FLAC__bool file_eof_callback_(const FLAC__StreamDecoder *super, void *client_dat
        OggFLAC__StreamDecoder *decoder = (OggFLAC__StreamDecoder *)super;
        (void)client_data;
 
-       if(decoder->private_->file == stdin) /*@@@@@@ feof() may work for stdin */
-               return false;
        return feof(decoder->private_->file)? true : false;
 }