mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-10 18:48:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic error in file copy helper functions

Browse Source 
If `errno` is `EAGAIN`, the second if statement is never true and if `errno` is not `EAGAIN`, the function returns immediately, not checking the second if statement.
This commit fixes this.
A logically equivalent change would have been to simply swap the two if statements but I find this version to be more readable.
This commit is contained in:
Luflosi
2022-01-26 23:35:54 +01:00
parent 97e58c5b86
commit 9d87b08c52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kitty/fast-file-copy.c
View File

@@ -60,9 +60,9 @@ copy_with_sendfile(int infd, int outfd, off_t in_pos, size_t len, FastFileCopyBu
off_t r = in_pos;
ssize_t n = sendfile(outfd, infd, &r, len);
if (n < 0) {
if (errno != EAGAIN) return false;
if (errno == EAGAIN) continue;
if (errno == ENOSYS || errno == EPERM) return copy_with_buffer(infd, outfd, in_pos, len, fcb);
continue;
return false;
}
if (n == 0) {
// happens if input file is truncated
@@ -83,9 +83,9 @@ copy_with_file_range(int infd, int outfd, off_t in_pos, size_t len, FastFileCopy
off64_t r = in_pos;
ssize_t n = copy_file_range(infd, &r, outfd, NULL, len, 0);
if (n < 0) {
if (errno != EAGAIN) return false;
if (errno == EAGAIN) continue;
if (errno == ENOSYS || errno == EPERM) return copy_with_sendfile(infd, outfd, in_pos, len, fcb);
continue;
return false;
}
if (n == 0) {
// happens if input file is truncated