Add --watchfd option values to an array in the main state, as well as to the currently used variables (#12).

src/include/options.h

@@ -56,8 +56,8 @@ struct opts_s {
 	unsigned int height;           /* screen height */
 	unsigned int argc;             /* number of non-option arguments */
 	unsigned int argv_length;      /* allocated array size */
-	size_t watchfd_count;	       /* number of watchfd items */
-	size_t watchfd_length;	       /* allocated array size */
+	unsigned int watchfd_count;	       /* number of watchfd items */
+	unsigned int watchfd_length;	       /* allocated array size */
 	bool do_nothing;               /* exit-without-doing-anything flag */
 	bool progress;                 /* progress bar flag */
 	bool timer;                    /* timer flag */

src/include/pv-internal.h

@@ -131,13 +131,6 @@ typedef uint16_t pvdisplay_bytecount_t;
 typedef uint16_t pvdisplay_width_t;
 #define PVDISPLAY_WIDTH_MAX (65535)	/* UINT16_MAX */
 
-/* Process and (optional) file descriptor to watch with "--watchfd". */
-struct pvwatchspec_s {
-	pid_t pid;		 /* process to watch fds of */
-	int fd;			 /* fd to watch, or 0 for all */
-};
-typedef struct pvwatchspec_s *pvwatchspec_t;
-
 /* String pointer, that is the only pointer to this resource, that can be null. */
 typedef /*@only@*/ /*@null@*/ char * nullable_string_t;
 
@@ -167,6 +160,15 @@ struct pvstate_s {
 		unsigned int file_count;	 /* number of input files */
 	} files;
 
+	/*********************************
+	 * Items to watch with --watchfd *
+	 *********************************/
+	struct pvwatchspec_s {
+		/*@only@*/ /*@null@*/ pid_t *pid; /* array of processes to watch fds of */
+		/*@only@*/ /*@null@*/ int *fd;	/* array of fds to watch in each one (0=all) */
+		unsigned int count;	/* number of items in these arrays */
+	} watchfd;
+
 	/*******************
 	 * Program control *
 	 *******************/
@@ -183,7 +185,7 @@ struct pvstate_s {
 		off_t rate_limit;                /* rate limit, in bytes per second */
 		size_t target_buffer_size;       /* buffer size (0=default) */
 		off_t size;                      /* total size of data */
-		/* TODO: replace watch_pid, watch_fd with an array of structs (#12) */
+		/* TODO: replace watch_pid, watch_fd with arrays (#12) */
 		pid_t watch_pid;		 /* process to watch fds of */
 		unsigned int skip_errors;        /* skip read errors counter */
 		int watch_fd;			 /* fd to watch */

src/include/pv.h

@@ -240,6 +240,7 @@ extern void pv_state_average_rate_window_set(pvstate_t, unsigned int);
 extern void pv_state_set_terminal_supports_utf8(pvstate_t, bool);
 
 extern void pv_state_inputfiles(pvstate_t, unsigned int, const char **);
+extern void pv_state_watchfds(pvstate_t, unsigned int, const pid_t *, const int *);
 
 /*
  * Work out whether we are in the foreground.