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

Replace watch_pid, watch_fd with arrays, though for now only use the first item in the arrays (#12).

Browse Source
This commit is contained in:
Andrew Wood
2025-09-21 19:50:56 +01:00
parent db80f838ff
commit b5fbd1978e
7 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/main.c
+2 -4
View File
@@ -518,8 +518,6 @@ int main(int argc, char **argv)
pv_state_default_bar_style_set(state, opts->default_bar_style);
pv_state_format_string_set(state, opts->format);
pv_state_extra_display_set(state, opts->extra_display);
pv_state_watch_pid_set(state, opts->watch_pid);
pv_state_watch_fd_set(state, opts->watch_fd);
pv_state_average_rate_window_set(state, opts->average_rate_window);
pv_state_set_format(state, opts->progress, opts->timer, can_have_eta ? opts->eta : false,
@@ -549,10 +547,10 @@ int main(int argc, char **argv)
pv_remote_fini();
break;
case PV_ACTION_WATCHFD:
if (-1 == opts->watch_fd) {
if ((opts->watchfd_count > 0) && (NULL != opts->watchfd_fd) && (-1 == opts->watchfd_fd[0])) {
/* "Watch all file descriptors of another process" mode. */
retcode = pv_watchpid_loop(state);
} else if (-1 != opts->watch_fd) {
} else if ((opts->watchfd_count > 0) && (NULL != opts->watchfd_fd) && (-1 != opts->watchfd_fd[0])) {
/* "Watch a specific file descriptor of another process" mode. */
retcode = pv_watchfd_loop(state);
}
src/main/options.c
-4
View File
@@ -413,8 +413,6 @@ opts_t opts_parse(unsigned int argc, char **argv)
opts->action = PV_ACTION_TRANSFER;
opts->interval = 1;
opts->delay_start = 0;
opts->watch_pid = 0;
opts->watch_fd = -1;
opts->average_rate_window = 30;
opts->width_set_manually = false;
@@ -714,8 +712,6 @@ opts_t opts_parse(unsigned int argc, char **argv)
parse_fd = -1;
/* No syntax check here, already done earlier */
(void) sscanf(optarg, "%u:%d", &parse_pid, &parse_fd);
opts->watch_pid = (pid_t) parse_pid;
opts->watch_fd = parse_fd;
if (!opts_add_watchfd(opts, (pid_t) parse_pid, parse_fd)) {
opts_free(opts);
return NULL;