diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 10:35:00 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2004-12-23 10:35:00 +0000 |
| commit | 690264e239dc4c49ee781835b029f83e672b450e (patch) | |
| tree | ae8d12255c6dc22d6e2d6bb6a6f2b50693e98941 /sal/osl/all | |
| parent | ae18678b4f531962950e799c4fc7d3f5320ba247 (diff) | |
INTEGRATION: CWS mhu05 (1.5.250); FILE MERGED
2004/12/01 19:29:08 mhu 1.5.250.2: #i37371# Fixed 'osl_readLine()' End-Of-File detection.
2004/11/25 18:30:13 mhu 1.5.250.1: #i37371# Fixed 'osl_readLine()' to correctly report End-Of-File condition.
Diffstat (limited to 'sal/osl/all')
| -rw-r--r-- | sal/osl/all/readline.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sal/osl/all/readline.c b/sal/osl/all/readline.c index 918f563eb564..ac9a89e3f7b6 100644 --- a/sal/osl/all/readline.c +++ b/sal/osl/all/readline.c @@ -2,9 +2,9 @@ * * $RCSfile: readline.c,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2003-04-28 17:12:52 $ + * last change: $Author: vg $ $Date: 2004-12-23 11:35:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -316,8 +316,13 @@ oslFileError SAL_CALL osl_readLine(oslFileHandle Handle, sal_Sequence** ppSeq) } else if (0 == nread) { - MakeSequenceFreeBuffer(ppSeq, &line_buffer, line_buffer.m_Size); - return osl_File_E_None; + /* EOF */ + nread = line_buffer.m_Size; + MakeSequenceFreeBuffer(ppSeq, &line_buffer, nread); + if (0 < nread) + return osl_File_E_None; + else + return osl_File_E_AGAIN; } /* scan buffer for line end */ |