mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the pvwatchfd "file_fd" item to "file_fdsymlink" to to better distinguish it from the other structure members.

Browse Source
This commit is contained in:
Andrew Wood
2026-04-23 21:42:10 +01:00
parent bf371e9a8c
commit 43a54bd541
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/pv-internal.h
+2 -2
View File
@@ -50,7 +50,7 @@ extern "C" {
#define PV_FORMAT_ARRAY_MAX 100
#define PV_SIZEOF_FORMAT_SEGMENTS_BUF 4096
#define PV_SIZEOF_FILE_FDINFO 4096
#define PV_SIZEOF_FILE_FD 4096
#define PV_SIZEOF_FILE_FDSYMLINK 4096
#define PV_SIZEOF_FILE_FDPATH 4096
#define PV_SIZEOF_DISPLAY_NAME 512
@@ -496,7 +496,7 @@ struct pvwatchfd_s {
#ifdef __APPLE__
#else
char file_fdinfo[PV_SIZEOF_FILE_FDINFO]; /* path to /proc fdinfo file */
char file_fd[PV_SIZEOF_FILE_FD]; /* path to /proc fd symlink */
char file_fdsymlink[PV_SIZEOF_FILE_FDSYMLINK]; /* path to /proc fd symlink */
#endif
char file_fdpath[PV_SIZEOF_FILE_FDPATH]; /* path to file that was opened */
/*@keep@ */ char display_name[PV_SIZEOF_DISPLAY_NAME]; /* name to show on progress bar */
src/pv/watchpid.c
+7 -6
View File
@@ -186,10 +186,11 @@ int pv_watchfd_info(pvstate_t state, pvwatchfd_t info, bool automatic)
}
(void) pv_snprintf(info->file_fdinfo, PV_SIZEOF_FILE_FDINFO,
"/proc/%u/fdinfo/%d", info->watch_pid, info->watch_fd);
(void) pv_snprintf(info->file_fd, PV_SIZEOF_FILE_FD, "/proc/%u/fd/%d", info->watch_pid, info->watch_fd);
(void) pv_snprintf(info->file_fdsymlink, PV_SIZEOF_FILE_FDSYMLINK, "/proc/%u/fd/%d", info->watch_pid,
info->watch_fd);
memset(info->file_fdpath, 0, PV_SIZEOF_FILE_FDPATH);
if (readlink(info->file_fd, info->file_fdpath, PV_SIZEOF_FILE_FDPATH - 1) < 0) { /* flawfinder: ignore */
if (readlink(info->file_fdsymlink, info->file_fdpath, PV_SIZEOF_FILE_FDPATH - 1) < 0) { /* flawfinder: ignore */
/*
* flawfinder: memset() has put \0 at the end already, and
* readlink() is given 1 byte less than the buffer length,
@@ -202,8 +203,8 @@ int pv_watchfd_info(pvstate_t state, pvwatchfd_t info, bool automatic)
return 2;
}
if (!((0 == stat(info->file_fd, &(info->sb_fd)))
&& (0 == lstat(info->file_fd, &(info->sb_fd_link))))) {
if (!((0 == stat(info->file_fdsymlink, &(info->sb_fd)))
&& (0 == lstat(info->file_fdsymlink, &(info->sb_fd_link))))) {
if (!automatic)
pv_perror("%s %u: %s %d: %s",
_("pid"), info->watch_pid, _("fd"), info->watch_fd, info->file_fdpath);
@@ -245,8 +246,8 @@ bool pv_watchfd_changed(pvwatchfd_t info)
memset(&sb_fd, 0, sizeof(sb_fd));
memset(&sb_fd_link, 0, sizeof(sb_fd_link));
if ((0 == stat(info->file_fd, &sb_fd))
&& (0 == lstat(info->file_fd, &sb_fd_link))) {
if ((0 == stat(info->file_fdsymlink, &sb_fd))
&& (0 == lstat(info->file_fdsymlink, &sb_fd_link))) {
if ((sb_fd.st_dev != info->sb_fd.st_dev)
|| (sb_fd.st_ino != info->sb_fd.st_ino)
|| (sb_fd_link.st_mode != info->sb_fd_link.st_mode)