SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fd-util: check and log error properly for fd_reopen_propagate_append_and_position

Browse Source 
Follow-up for b8e25bff38
This commit is contained in:
Mike Yuan
2024-05-16 19:17:25 +08:00
parent 2e93331605
commit 2599b32e72
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/fd-util.c
+11 -14
View File
@@ -896,21 +896,18 @@ int fd_reopen_propagate_append_and_position(int fd, int flags) {
if (new_fd < 0)
return new_fd;
/* Try to adjust the offset, but ignore errors for now. */
/* Try to adjust the offset, but ignore errors. */
off_t p = lseek(fd, 0, SEEK_CUR);
if (p <= 0)
return new_fd;
off_t new_p = lseek(new_fd, p, SEEK_SET);
if (new_p == (off_t) -1)
log_debug_errno(errno,
"Failed to propagate file position for re-opened fd %d, ignoring: %m",
fd);
else if (new_p != p)
log_debug("Failed to propagate file position for re-opened fd %d (%lld != %lld), ignoring: %m",
fd,
(long long) new_p,
(long long) p);
if (p > 0) {
off_t new_p = lseek(new_fd, p, SEEK_SET);
if (new_p < 0)
log_debug_errno(errno,
"Failed to propagate file position for re-opened fd %d, ignoring: %m",
fd);
else if (new_p != p)
log_debug("Failed to propagate file position for re-opened fd %d (%lld != %lld), ignoring.",
fd, (long long) new_p, (long long) p);
}
return new_fd;
}