mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

Better fix for bug#65156

Browse Source 
* src/fileio.c (Finsert_file_contents): Correct seek-ability
test, since lseek returns -1 upon failure.  (Bug#65156)
This commit is contained in:
Po Lu 2023-08-09 10:49:44 +08:00
parent dd1d8414b3
commit 4767f5eaee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fileio.c
View File

@ -4023,7 +4023,7 @@ by calling `format-decode', which see. */)
if (!S_ISREG (st.st_mode))
{
regular = false;
seekable = lseek (fd, 0, SEEK_CUR) < 0;
seekable = lseek (fd, 0, SEEK_CUR) != (off_t) -1;
if (! NILP (visit))
{
@ -4581,7 +4581,7 @@ by calling `format-decode', which see. */)
goto handled;
}
if ((seekable && regular) || !NILP (end))
if (seekable || !NILP (end))
total = end_offset - beg_offset;
else
/* For a special file, all we can do is guess. */
@ -4678,7 +4678,7 @@ by calling `format-decode', which see. */)
For a special file, where TOTAL is just a buffer size,
so don't bother counting in HOW_MUCH.
(INSERTED is where we count the number of characters inserted.) */
if ((seekable && regular) || !NILP (end))
if (seekable || !NILP (end))
how_much += this;
inserted += this;
}