From 28b55a9bb6ddb15a15a49c8a3ac6cf83e4f93130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yamato=2C=20Masatake=20=28=E5=A4=A7=E5=92=8C=E6=AD=A3?= =?UTF-8?q?=E6=AD=A6=29?= Date: Thu, 11 May 2006 03:01:42 +0000 Subject: [PATCH] (FT_Stream_Open): Check errno only if read system call returns -1. Remove a redundant parenthesis. --- ChangeLog | 6 ++++++ builds/unix/ftsystem.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd3a3fef5..b6302b5b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-11 Masatake YAMATO + + * builds/unix/ftsystem.c (FT_Stream_Open): Check errno only if + read system call returns -1. + Remove a redundant parenthesis. + 2006-05-10 Werner Lemberg * builds/unix/ftsystem.c (FT_Stream_Open): Avoid infinite loop if diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index 78da9d575..c46b1c0b7 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -303,9 +303,9 @@ stream->base + total_read_count, stream->size - total_read_count ); - if ( ( read_count <= 0 ) ) + if ( read_count <= 0 ) { - if ( errno == EINTR ) + if ( read_count == -1 && errno == EINTR ) continue; FT_ERROR(( "FT_Stream_Open:" ));