Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/fs: update position when user writing with O_APPEND

Browse Source 
when appending, pos is passed unchanged to the write hook.
fix #16506

Change-Id: I102e8e00e635d7a32cf50f09d8bd3d28dc235f9b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3373
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Jérôme Duval 2020-10-31 14:51:28 +01:00
parent b48159dce2
commit 26ab0d051c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/kernel/fs/fd.cpp
View File

@ -748,7 +748,7 @@ common_user_io(int fd, off_t pos, void* buffer, size_t length, bool write)
}
bool movePosition = false;
if (pos == -1) {
if (pos == -1 && (!write || (descriptor->open_mode & O_APPEND) == 0)) {
pos = descriptor->pos;
movePosition = true;
}
@ -770,6 +770,8 @@ common_user_io(int fd, off_t pos, void* buffer, size_t length, bool write)
if (movePosition)
descriptor->pos = pos + length;
else if (pos == -1)
descriptor->pos = descriptor->ops->fd_seek(descriptor, 0, SEEK_END);
return length <= SSIZE_MAX ? (ssize_t)length : SSIZE_MAX;
}
@ -808,7 +810,7 @@ common_user_vector_io(int fd, off_t pos, const iovec* userVecs, size_t count,
return B_BAD_ADDRESS;
bool movePosition = false;
if (pos == -1) {
if (pos == -1 && (!write || (descriptor->open_mode & O_APPEND) == 0)) {
pos = descriptor->pos;
movePosition = true;
}
@ -852,7 +854,8 @@ common_user_vector_io(int fd, off_t pos, const iovec* userVecs, size_t count,
else
bytesTransferred += (ssize_t)length;
pos += length;
if (pos > -1)
pos += length;
if (length < vecs[i].iov_len)
break;
@ -860,6 +863,8 @@ common_user_vector_io(int fd, off_t pos, const iovec* userVecs, size_t count,
if (movePosition)
descriptor->pos = pos;
else if (pos == -1)
descriptor->pos = descriptor->ops->fd_seek(descriptor, 0, SEEK_END);
return bytesTransferred;
}