mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-27 16:51:06 -07:00
(Finsert_file_contents): Don't treat a return value
of 0 from emacs_read as an IO error.
This commit is contained in:
parent
7642acca1e
commit
2bd2273e7b
1 changed files with 5 additions and 1 deletions
|
|
@ -3863,14 +3863,18 @@ actually used.")
|
|||
while (total_read < trial)
|
||||
{
|
||||
nread = emacs_read (fd, buffer + total_read, trial - total_read);
|
||||
if (nread <= 0)
|
||||
if (nread < 0)
|
||||
error ("IO error reading %s: %s",
|
||||
XSTRING (orig_filename)->data, emacs_strerror (errno));
|
||||
else if (nread == 0)
|
||||
break;
|
||||
total_read += nread;
|
||||
}
|
||||
|
||||
/* Scan this bufferful from the end, comparing with
|
||||
the Emacs buffer. */
|
||||
bufpos = total_read;
|
||||
|
||||
/* Compare with same_at_start to avoid counting some buffer text
|
||||
as matching both at the file's beginning and at the end. */
|
||||
while (bufpos > 0 && same_at_end > same_at_start
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue