Author: rhuijben
Date: Fri Mar 18 09:19:22 2011
New Revision: 1082856
URL: http://svn.apache.org/viewvc?rev=1082856&view=rev
Log:
* subversion/libsvn_diff/parse-diff.c
(scan_eol): Following up on r1082851, scan for eol even when we can't fill
the entire buffer.
Modified:
subversion/trunk/subversion/libsvn_diff/parse-diff.c
Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1082856&r1=1082855&r2=1082856&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Fri Mar 18 09:19:22
2011
@@ -295,16 +295,19 @@ scan_eol(const char **eol, apr_file_t *f
SVN_ERR(svn_io_file_read_full2(file, buf, sizeof(buf)-1, &len, &eof,
pool));
- if (eof)
- break;
+ if (len > 0)
+ {
+ buf[len] = '\0';
+ total_len += len;
- buf[len] = '\0';
- total_len += len;
+ /* ### BH: Does this properly detect the case where '\r' is on byte
+ ### 254 (last character of buffer and '\n' is on byte 255
+ ### (first character of next buffer)? */
+ eol_str = svn_eol__detect_eol(buf, buf + len);
+ }
- /* ### BH: Does this properly detect the case where '\r' is on byte 254
- ### (last character of buffer and '\n' is on byte 255 (first
- ### character of next buffer)? */
- eol_str = svn_eol__detect_eol(buf, buf + len);
+ if (eof)
+ break;
}
SVN_ERR(svn_io_file_seek(file, APR_SET, &pos, pool));
