Set current release line

Minor updates
Version update pending new release
2023-07-17 22:05:29 +01:00 · 2023-07-17 21:57:56 +01:00 · 2023-07-17 21:53:54 +01:00 · 2023-07-17 21:48:16 +01:00 · 2023-07-17 21:37:54 +01:00 · 2023-07-17 21:29:17 +01:00
45 changed files with 2979 additions and 2661 deletions
@@ -0,0 +1 @@
+github: a-j-wood
@@ -0,0 +1,3 @@
+*~
+configure
+patch-backlog
@@ -1,230 +0,0 @@
-Introduction
-************
-
-This is the README for `pv' ("Pipe Viewer"), a terminal-based tool for
-monitoring the progress of data through a pipeline.  It can be inserted into
-any normal pipeline between two processes to give a visual indication of how
-quickly data is passing through, how long it has taken, how near to
-completion it is, and an estimate of how long it will be until completion.
-
-
-Documentation
-*************
-
-A manual page is included in this distribution.  See `man ./doc/quickref.1',
-or `man pv' after installation.
-
-
-Compilation
-***********
-
-If you have downloaded `pv' from Subversion, first run "./generate.sh".
-
-To compile the package, type "sh ./configure", which should generate a
-Makefile for your system.  You may then type "make" to build everything.
-Note that GNU `make' is required; this may be installed as `gmake' on some
-systems, so if typing "make" gives an error, try "gmake" instead.
-
-See the file `doc/INSTALL' for more about the `configure' script.
-
-Developers note that you can do "./configure --enable-debugging" to cause
-debugging support to be built in, and "--enable-profiling" builds in
-profiling support (see "man gprof").  Also note that doing "make index" will
-generate an HTML code index (using "ctags" and "cproto"); this index lists
-all files used, all functions defined, and all TODOs marked in the code.
-
-
-Author and acknowledgements
-***************************
-
-This package is copyright 2015 Andrew Wood, and is being distributed under
-the terms of the Artistic License 2.0.  For more details of this license,
-see the file `doc/COPYING'.
-
-Report bugs in `pv' using the contact form linked from the home page.
-
-The `pv' home page is at:
-
-  http://www.ivarch.com/programs/pv.shtml
-
-The latest version can always be found here.
-
-Credit is also due to:
-
-  Jakub Hrozek <jhrozek@redhat.com>
-    - Fedora package maintainer
-
-  Antoine BeauprÃ© <anarcat@debian.org>
-    - Debian package maintainer
-
-  Kevin Coyner <kcoyner@debian.org>
-  CÃ©dric Delfosse <cedric@debian.org>
-    - previous Debian package maintainers
-
-  Eduardo Aguiar <eduardo.oliveira@sondabrasil.com.br>
-    - provided Portuguese (Brazilian) translation
-
-  StÃ©phane Lacasse <stephane@gorfou.ca>
-    - provided French translation
-
-  Marcos Kreinacke <public@kreinacke.com>
-    - provided German translation
-
-  Bartosz Feñski <fenio@o2.pl> <http://skawina.eu.org/>
-    - provided Polish translation along with Krystian Zubel
-
-  Joshua Jensen
-    - reported RPM installation bug
-
-  Boris Folgmann <http://www.folgmann.com/en/>
-    - reported cursor handling bug
-
-  Mathias Gumz
-    - reported NLS bug
-
-  Daniel Roethlisberger
-    - submitted patch to use lockfiles for -c if terminal locking fails
-
-  Adam Buchbinder
-    - lots of help with a Cygwin port of -c
-
-  Mark Tomich <http://metuchen.dyndns.org>
-    - suggested -B option
-
-  Gert Menke
-    - reported bug when piping to dd with a large input buffer size
-
-  Ville Herva <Ville.Herva@iki.fi>
-    - informative bug report about rate limiting performance
-
-  Elias Pipping
-    - patch to compile properly on Darwin 9; potential NULL deref report
-
-  Patrick Collison
-    - similar patch for OS X
-
-  Boris Lohner
-    - reported problem that "-L" does not complain if given non-numeric value
-
-  Sebastian Kayser
-    - supplied testing for SIGPIPE, demonstrated internationalisation problem
-
-  Laszlo Ersek <http://phptest11.atw.hu/>
-    - reported shared memory leak on SIGINT with -c
-
-  Phil Rutschman <http://bandgap.rsnsoft.com/>
-    - provided a patch for fully restoring terminal state on exit
-
-  Henry Precheur <http://henry.precheur.org/>
-    - reporting and suggestions for --rate-limit bug when rate is under 10
-
-  E. Rosten <http://mi.eng.cam.ac.uk/~er258/>
-    - supplied patch for block buffering in line mode
-
-  Kjetil Torgrim Homme
-    - reported compilation error with default CFLAGS on non-GCC compilers
-
-  Alexandre de Verteuil
-    - reported bug in OS X build and supplied test environment to fix in
-
-  Martin Baum
-    - supplied patch to return nonzero exit status if terminated by signal
-
-  Sam Nelson <http://www.siliconfuture.net/>
-    - supplied patch to fix trailing slash on DESTDIR
-
-  Daniel Pape
-    - reported Cygwin installation problem due to DESTDIR
-
-  Philipp Beckers
-    - ported to the Syabas PopcornHour A-100 series
-
-  Henry Gebhard <hsggebhardt@googlemail.com>
-    - supplied patches to improve SI prefixes and add --average-rate
-
-  Vladimir Kokarev, Alexander Leo
-    - reported that exit status did not reflect file errors
-
-  Thomas Rachel
-    - submitted patches for IEEE1541 (MiB suffixes), 1+e03 bug
-
-  Guillaume Marcais
-    - submitted speedup patch for line mode
-
-  Moritz Barsnick
-    - submitted patch for compile warning in size calculation
-
-  Pawel Piatek
-    - submitted RPM and patches for AIX
-
-  Sami Liedes
-    - submitted patch for --timer and --bytes with --numeric
-
-  Steven Willis
-    - reported problem with "-R" killing non-PV remote processes
-
-  Vladimir Pal, Vladimir Ermakov
-    - submitted patch which led to development of --format option
-
-  Peter Samuelson <peter@p12n.org>
-    - submitted patch to calculate size if stdout is a block device
-
-  Miguel Diaz
-    - much Cygwin help (and packaging), found narrow-terminal bug
-
-  Jim Salter <http://ubuntuwiki.net>
-    - commissioned work on the --skip-errors option
-
-  Wouter Pronk
-    - reported build problem on SCO
-
-  Bryan Dongray <http://www.dongrays.com>
-    - provided patches for test scripts failing on older Red Hats
-
-  Zev Weiss <www.bewilderbeest.net>
-    - provided patch to fix splice() not using stdin
-
-  Zing Shishak
-    - provided patch for --null / -0 (count null terminated lines)
-
-  Jacek Wielemborek <http://deetah.jogger.pl/kategorie/english>
-    - implemented fdwatch in Python, suggested PV port
-    - reported bug with "-l" and ETA / size
-    - suggested common switches
-
-  Kim Krecht
-    - suggested buffer fill status and last bytes output display options
-
-  Cristian Ciupitu <http://ciupicri.github.io>, Josh Stone
-    - pointed out file descriptor leak with helpful suggestions
-      (Josh Stone initially noticed the missing close)
-
-  Jan Seda
-    - found issue with splice() and SPLICE_F_NONBLOCK causing slowdown
-
-  AndrÃ© Stapf
-    - pointed out formatting problem e.g. 13GB -> 13.1GB which should be
-      shown 13.0GB -> 13.1GB; highlighted on-startup row swapping in -c
-
-  Damon Harper <http://www.usrbin.ca/>
-    - suggested "-D" / "--delay-start" option
-
-  GanaÃ«l Laplanche <http://www.martymac.org>
-    - provided patch for lstat64 on systems that do not support it
-
-  Peter Korsgaard <http://www.buildroot.net/>
-    - provided similar patch for lstat64, specifically for uClibc support
-
-  Ralf Ramsauer <https://blog.ramses-pyramidenbau.de/>
-    - reported bug which dropped transfer rate on terminal resize
-
-  Michiel Van Herwegen
-    - reported and discussed bug with "-l" and ETA / size
-
-  Erkki SeppÃ¤lÃ¤ <http://www.inside.org/~flux/>
-    - provided patch implementing "-I"
-
-  Eric A. Borisch
-    - provided details of compatibility fix for "%Lu" in watchpid code
-
-----------------------------------------------------------------------------
@@ -0,0 +1,58 @@
+Introduction
+------------
+
+This is the README for **pv** ("Pipe Viewer"), a terminal-based tool for
+monitoring the progress of data through a pipeline.  It can be inserted into
+any normal pipeline between two processes to give a visual indication of how
+quickly data is passing through, how long it has taken, how near to
+completion it is, and an estimate of how long it will be until completion.
+
+
+Documentation
+-------------
+
+A manual page is included in this distribution.  See "`man ./doc/quickref.1`",
+or "`man pv`" after installation.
+
+Changes are listed in "[doc/NEWS.md](./doc/NEWS.md)".  The to-do list is "[doc/TODO.md](./doc/TODO.md)".
+
+
+Compilation
+-----------
+
+If this is not a packaged release, first run "`./generate.sh`".
+
+To compile the package, type "`sh ./configure`", which should generate a
+Makefile for your system.  You may then type "`make`" to build everything.
+Note that GNU _make_ is required; this may be installed as _gmake_ on some
+systems, so if typing "`make`" gives an error, try "`gmake`" instead.
+
+See the file "[doc/INSTALL](./doc/INSTALL)" for more about the _configure_ script.
+
+Developers note that you can run "`./configure --enable-debugging`" to cause
+debugging support to be built in, and the `--enable-profiling` option builds
+in profiling support (see "`man gprof`").  Also note that running
+"`make index`" will generate an HTML code index (using _ctags_ and
+_cproto_); this index lists all files used, all functions defined, and all
+TODOs marked in the code.
+
+
+Author and acknowledgements
+---------------------------
+
+This package is copyright 2023 Andrew Wood, and is being distributed under
+the terms of the Artistic License 2.0.  For more details of this license,
+see the file "[doc/COPYING](./doc/COPYING)".
+
+Report bugs in **pv** using the contact form linked from the home page, or
+though the [project issue tracker](https://github.com/a-j-wood/pv/issues).
+
+The **pv** home page is at:
+
+&nbsp;&nbsp;[http://www.ivarch.com/programs/pv.shtml](http://www.ivarch.com/programs/pv.shtml)
+
+The latest version can always be found here.
+
+**Please see "[doc/ACKNOWLEDGEMENTS.md](./doc/ACKNOWLEDGEMENTS.md)" for a list of contributors.**
+
+---
@@ -86,7 +86,7 @@ AC_PROG_MAKE_SET

 dnl AIX needs -lc128
 dnl
-AC_EGREP_CPP([yes], [#ifdef _AIX
+AC_EGREP_CPP([^yes$], [#ifdef _AIX
 yes
 #endif
 ], [LIBS="$LIBS -lc128"])
@@ -155,7 +155,13 @@ dnl Check for various header files and set various other macros.
 dnl
 AC_DEFINE(HAVE_CONFIG_H)
 AC_HEADER_STDC
-AC_CHECK_FUNCS(memcpy basename snprintf stat64)
+AC_HEADER_STDBOOL
+AC_CHECK_FUNCS(memcpy basename snprintf)
+dnl OSX 11 (apple silicon) lets you link stat64() but fails to compile
+dnl so use a compile test for stat64() instead of a link test.
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { stat64(); }])],
+		  [AC_DEFINE([HAVE_STAT64], [1], [Is stat64() available])],
+		  [])
 AC_CHECK_HEADERS(limits.h)

 if test "$IPC_SUPPORT" = "yes"; then
@@ -188,8 +194,7 @@ dnl Output files (and create build directory structure too).
 dnl
 AC_OUTPUT(Makefile:$mk_segments doc/lsm:doc/lsm.in
          doc/quickref.1:doc/quickref.1.in
-          doc/$PACKAGE.spec:doc/spec.in
-          src/.dummy:doc/NEWS,
+          src/.dummy:doc/NEWS.md,
  rm -f src/.dummy
  for i in $subdirs; do
    test -d $i || mkdir $i
@@ -90,6 +90,24 @@
 #define CURSOR_ANSWERBACK_BYTE_BY_BYTE 1
 #endif

+/* Boolean type support. */
+#undef HAVE_STDBOOL_H
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# ifndef HAVE__BOOL
+#  ifdef __cplusplus
+typedef bool _Bool;
+#  else
+#   define _Bool signed char
+#  endif
+# endif
+# define bool _Bool
+# define false 0
+# define true 1
+# define __bool_true_false_are_defined 1
+#endif
+
 /* Support for debugging output. */
 #undef ENABLE_DEBUGGING

@@ -1,21 +0,0 @@
-#
-# Dependencies.
-#
-
-src/library/getopt.d src/library/getopt.o: src/library/getopt.c src/include/config.h src/include/library/gettext.h 
-src/library/gettext.d src/library/gettext.o: src/library/gettext.c src/include/config.h src/include/library/gettext.h 
-src/pv/signal.d src/pv/signal.o: src/pv/signal.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/watchpid.d src/pv/watchpid.o: src/pv/watchpid.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/cursor.d src/pv/cursor.o: src/pv/cursor.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/file.d src/pv/file.o: src/pv/file.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/display.d src/pv/display.o: src/pv/display.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/loop.d src/pv/loop.o: src/pv/loop.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/number.d src/pv/number.o: src/pv/number.c src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/transfer.d src/pv/transfer.o: src/pv/transfer.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/pv/state.d src/pv/state.o: src/pv/state.c src/include/pv-internal.h src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/main/version.d src/main/version.o: src/main/version.c src/include/config.h src/include/library/gettext.h 
-src/main/debug.d src/main/debug.o: src/main/debug.c src/include/config.h src/include/library/gettext.h src/include/pv.h 
-src/main/main.d src/main/main.o: src/main/main.c src/include/config.h src/include/library/gettext.h src/include/options.h src/include/pv.h 
-src/main/options.d src/main/options.o: src/main/options.c src/include/config.h src/include/library/gettext.h src/include/options.h src/include/library/getopt.h src/include/pv.h 
-src/main/remote.d src/main/remote.o: src/main/remote.c src/include/config.h src/include/library/gettext.h src/include/options.h src/include/pv.h 
-src/main/help.d src/main/help.o: src/main/help.c src/include/config.h src/include/library/gettext.h 
@@ -1,62 +0,0 @@
-# Automatically generated file listings
-#
-# Creation time: Fri Jun 30 22:23:37 BST 2017
-
-allsrc = src/library/getopt.c \
-src/library/gettext.c \
-src/pv/signal.c \
-src/pv/watchpid.c \
-src/pv/cursor.c \
-src/pv/file.c \
-src/pv/display.c \
-src/pv/loop.c \
-src/pv/number.c \
-src/pv/transfer.c \
-src/pv/state.c \
-src/main/version.c \
-src/main/debug.c \
-src/main/main.c \
-src/main/options.c \
-src/main/remote.c \
-src/main/help.c
-
-allobj = src/library/getopt.o \
-src/library/gettext.o \
-src/pv/signal.o \
-src/pv/watchpid.o \
-src/pv/cursor.o \
-src/pv/file.o \
-src/pv/display.o \
-src/pv/loop.o \
-src/pv/number.o \
-src/pv/transfer.o \
-src/pv/state.o \
-src/main/version.o \
-src/main/debug.o \
-src/main/main.o \
-src/main/options.o \
-src/main/remote.o \
-src/main/help.o \
-src/library.o \
-src/pv.o \
-src/nls.o \
-src/main.o
-
-alldep = src/library/getopt.d \
-src/library/gettext.d \
-src/pv/signal.d \
-src/pv/watchpid.d \
-src/pv/cursor.d \
-src/pv/file.d \
-src/pv/display.d \
-src/pv/loop.d \
-src/pv/number.d \
-src/pv/transfer.d \
-src/pv/state.d \
-src/main/version.d \
-src/main/debug.d \
-src/main/main.d \
-src/main/options.d \
-src/main/remote.d \
-src/main/help.d
-
@@ -1,14 +0,0 @@
-# Automatically generated module linking rules
-#
-# Creation time: Fri Jun 30 22:23:37 BST 2017
-
-src/library.o:  src/library/getopt.o src/library/gettext.o
-	$(LD) $(LDFLAGS) -o $@  src/library/getopt.o src/library/gettext.o
-
-src/pv.o:  src/pv/cursor.o src/pv/display.o src/pv/file.o src/pv/loop.o src/pv/number.o src/pv/signal.o src/pv/state.o src/pv/transfer.o src/pv/watchpid.o
-	$(LD) $(LDFLAGS) -o $@  src/pv/cursor.o src/pv/display.o src/pv/file.o src/pv/loop.o src/pv/number.o src/pv/signal.o src/pv/state.o src/pv/transfer.o src/pv/watchpid.o
-
-src/main.o:  src/main/debug.o src/main/help.o src/main/main.o src/main/options.o src/main/remote.o src/main/version.o
-	$(LD) $(LDFLAGS) -o $@  src/main/debug.o src/main/help.o src/main/main.o src/main/options.o src/main/remote.o src/main/version.o
-
-
@@ -7,7 +7,7 @@ version = @VERSION@
 PACKAGE = @PACKAGE@

 distfiles =		\
-$(srcdir)/README	\
+$(srcdir)/README.md	\
 $(srcdir)/autoconf	\
 $(srcdir)/configure	\
 $(srcdir)/doc		\
@@ -6,8 +6,7 @@
  clean depclean indentclean distclean cvsclean svnclean \
  index manhtml indent update-po \
  doc dist release \
-  install uninstall \
-  rpm srpm
+  install uninstall

 all: $(alltarg) $(CATALOGS)

@@ -35,9 +34,7 @@ help:
 	@echo '  update-po       update the .po files'
 	@echo
 	@echo '  dist            create a source tarball for distribution'
-	@echo '  rpm             build a binary RPM (passes $$RPMFLAGS to RPM)'
-	@echo '  srpm            build a source RPM (passes $$RPMFLAGS to RPM)'
-	@echo '  release         dist+rpm+srpm'
+	@echo '  release         create and sign tar.gz and tar.bz2'
 	@echo

 make:
@@ -83,13 +80,12 @@ update-po: $(srcdir)/src/nls/$(PACKAGE).pot

 distclean: clean depclean
 	rm -f $(alltarg) src/include/config.h
-	rm -rf $(package)-$(version).tar* $(package)-$(version) $(package)-$(version)-*.rpm
+	rm -rf $(package)-$(version).tar* $(package)-$(version)
 	rm -f *.html config.*
 	rm Makefile

 cvsclean svnclean: distclean
 	rm -f doc/lsm
-	rm -f doc/$(package).spec
 	rm -f doc/quickref.1
 	rm -f configure
 	rm -f src/nls/*.gmo src/nls/*.mo
@@ -123,7 +119,6 @@ dist: doc update-po
 	cp -dprf Makefile $(distfiles) $(package)-$(version)
 	cd $(package)-$(version); $(MAKE) distclean
 	cp -dpf doc/lsm             $(package)-$(version)/doc/
-	cp -dpf doc/$(package).spec $(package)-$(version)/doc/
 	chmod 644 `find $(package)-$(version) -type f -print`
 	chmod 755 `find $(package)-$(version) -type d -print`
 	chmod 755 `find $(package)-$(version)/autoconf/scripts`
@@ -181,21 +176,8 @@ uninstall:
 	  done; \
 	fi

-rpm:
-	test -e $(package)-$(version).tar.gz || $(MAKE) dist
-	rpmbuild $(RPMFLAGS) --define="%_topdir `pwd`/rpm" -tb $(package)-$(version).tar.gz
-	mv rpm/RPMS/*/$(package)-*.rpm .
-	rm -rf rpm
-
-srpm:
-	test -e $(package)-$(version).tar.gz || $(MAKE) dist
-	rpmbuild $(RPMFLAGS) --define="%_topdir `pwd`/rpm" -ts $(package)-$(version).tar.gz
-	mv rpm/SRPMS/*$(package)-*.rpm .
-	rm -rf rpm
-
-release: dist rpm srpm
+release: dist
 	zcat $(package)-$(version).tar.gz | bzip2 > $(package)-$(version).tar.bz2
-	-grep -Fq '%_gpg_name' ~/.rpmmacros 2>/dev/null && rpm --addsign *.rpm
 	-gpg --list-secret-keys 2>&1 | grep -Fq 'uid' && gpg -ab *.tar.gz && rename .asc .txt *.tar.gz.asc
 	-gpg --list-secret-keys 2>&1 | grep -Fq 'uid' && gpg -ab *.tar.bz2 && rename .asc .txt *.tar.bz2.asc
 	chmod 644 $(package)-$(version)*
@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/sh
 #
 # Script to generate an HTML index of all C code from the current directory
 # downwards (skipping directories ending in ~). The header comment in each
@@ -0,0 +1,86 @@
+The following people have contributed to this project, and their assistance
+is acknowledged and greatly appreciated:
+
+ * Antoine Beaupré <anarcat@debian.org> - Debian package maintainer
+ * Kevin Coyner <kcoyner@debian.org> - previous Debian package maintainer
+ * Cédric Delfosse <cedric@debian.org> - previous Debian package maintainer
+ * Jakub Hrozek <jhrozek@redhat.com> - Fedora package maintainer
+ * Eduardo Aguiar <eduardo.oliveira@sondabrasil.com.br> - provided Portuguese (Brazilian) translation
+ * Stéphane Lacasse <stephane@gorfou.ca> - provided French translation
+ * Marcos Kreinacke <public@kreinacke.com> - provided German translation
+ * Bartosz Feński <fenio@o2.pl> <http://skawina.eu.org/> - provided Polish translation along with Krystian Zubel
+ * Joshua Jensen - reported RPM installation bug
+ * Boris Folgmann <http://www.folgmann.com/en/> - reported cursor handling bug
+ * Mathias Gumz - reported NLS bug
+ * Daniel Roethlisberger - submitted patch to use lockfiles for "`-c`" if terminal locking fails
+ * Adam Buchbinder - lots of help with a Cygwin port of "`-c`"
+ * Mark Tomich <http://metuchen.dyndns.org> - suggested "`-B`" option
+ * Gert Menke - reported bug when piping to `dd` with a large input buffer size
+ * Ville Herva <Ville.Herva@iki.fi> - informative bug report about rate limiting performance
+ * Elias Pipping - patch to compile properly on Darwin 9; potential NULL deref report
+ * Patrick Collison - similar patch for OS X
+ * Boris Lohner - reported problem that "`-L`" does not complain if given non-numeric value
+ * Sebastian Kayser - supplied testing for *SIGPIPE*, demonstrated internationalisation problem
+ * Laszlo Ersek <http://phptest11.atw.hu/> - reported shared memory leak on *SIGINT* with "`-c`"
+ * Phil Rutschman <http://bandgap.rsnsoft.com/> - provided a patch for fully restoring terminal state on exit
+ * Henry Precheur <http://henry.precheur.org/> - reporting and suggestions for "`--rate-limit`" bug when rate is under 10
+ * E. Rosten <http://mi.eng.cam.ac.uk/~er258/> - supplied patch for block buffering in line mode
+ * Kjetil Torgrim Homme - reported compilation error with default *CFLAGS* on non-GCC compilers
+ * Alexandre de Verteuil - reported bug in OS X build and supplied test environment to fix in
+ * Martin Baum - supplied patch to return nonzero exit status if terminated by signal
+ * Sam Nelson <http://www.siliconfuture.net/> - supplied patch to fix trailing slash on *DESTDIR*
+ * Daniel Pape - reported Cygwin installation problem due to *DESTDIR*
+ * Philipp Beckers - ported to the Syabas PopcornHour A-100 series
+ * Henry Gebhard <hsggebhardt@googlemail.com> - supplied patches to improve SI prefixes and add "`--average-rate`"
+ * Vladimir Kokarev, Alexander Leo - reported that exit status did not reflect file errors
+ * Thomas Rachel - submitted patches for IEEE1541 (MiB suffixes), 1+e03 bug
+ * Guillaume Marcais - submitted speedup patch for line mode
+ * Moritz Barsnick - submitted patch for compile warning in size calculation
+ * Pawel Piatek - submitted RPM and patches for AIX
+ * Sami Liedes - submitted patch for "`--timer`" and "`--bytes`" with "`--numeric`"
+ * Steven Willis - reported problem with "`-R`" killing non-PV remote processes
+ * Vladimir Pal, Vladimir Ermakov - submitted patch which led to development of "`--format`" option
+ * Peter Samuelson <peter@p12n.org> - submitted patch to calculate size if stdout is a block device
+ * Miguel Diaz - much Cygwin help (and packaging), found narrow-terminal bug
+ * Jim Salter <http://ubuntuwiki.net> - commissioned work on the "`--skip-errors`" option
+ * Wouter Pronk - reported build problem on SCO
+ * Bryan Dongray <http://www.dongrays.com> - provided patches for test scripts failing on older Red Hats
+ * Zev Weiss <www.bewilderbeest.net> - provided patch to fix `splice()` not using stdin
+ * Zing Shishak - provided patch for "`--null`" / "`-0`" (count null terminated lines)
+ * Jacek Wielemborek <http://deetah.jogger.pl/kategorie/english> - implemented fdwatch in Python, suggested PV port; reported bug with "`-l`" and ETA / size; many other contributions
+ * Kim Krecht - suggested buffer fill status and last bytes output display options
+ * Cristian Ciupitu <http://ciupicri.github.io>, Josh Stone - pointed out file descriptor leak with helpful suggestions (Josh Stone initially noticed the missing close)
+ * Jan Seda - found issue with `splice()` and *SPLICE_F_NONBLOCK* causing slowdown
+ * André Stapf - pointed out formatting problem e.g. 13GB -> 13.1GB which should be shown 13.0GB -> 13.1GB; highlighted on-startup row swapping in "`-c`"
+ * Damon Harper <http://www.usrbin.ca/> - suggested "`-D`" / "`--delay-start`" option
+ * Ganaël Laplanche <http://www.martymac.org> - provided patch for `lstat64()` on systems that do not support it
+ * Peter Korsgaard <http://www.buildroot.net/> - provided similar patch for `lstat64()`, specifically for uClibc support; provided AIX cross-compilation patch to fix bug in "`-lc128`" check
+ * Ralf Ramsauer <https://blog.ramses-pyramidenbau.de/> - reported bug which dropped transfer rate on terminal resize
+ * Michiel Van Herwegen - reported and discussed bug with "`-l`" and ETA / size
+ * Erkki Seppälä <http://www.inside.org/~flux/> - provided patch implementing "`-I`"
+ * Eric A. Borisch - provided details of compatibility fix for "`%Lu`" in watchpid code
+ * Jan Venekamp - reported MacOS buffer size interactions with pipes
+ * Matt <https://github.com/lemonsqueeze/pv> - provided "rate-window" patches for rate calculation
+ * [Filippo Valsorda](https://github.com/FiloSottile) - provided patch for stat64 issue on Apple Silicon
+ * Matt Koscica, William Dillon - also reported stat64 issue on Apple Silicon
+ * [Demitri Muna](https://github.com/demitri) - assisted with stat64 patch on Apple Silicon
+ * Norman Rasmussen - suggested "`-c`" with "`-d PID:FD`", reject "`-N`" with "`-d PID`"
+ * Andriy Gapon, Jonathan Elchison - reported bug where "`pv /dev/zero >/dev/null &`" stops immediately
+ * Marcelo Chiesa - reported unused-result warnings when compiling PV 1.6.6
+ * Jered Floyd - provided patches to improve "`--rate-limit`"
+ * Christoph Biedl - provided ETA and dynamic interval patches
+ * Richard Fonfara - provided German translations for "`pv --help`"
+ * Johannes Gerer <http://johannesgerer.com> - suggested that "`-B`" should enable "`-C`"
+ * Sam James - provided fix for number.c build issue caused by missing stddef.h
+ * Jakub Wilk <jwilk@jwilk.net> - corrected README encoding
+ * Frederik Eaton - reported issue with `<()` shell constructs
+ * [gray](https://github.com/gray) - reported issue with "`--force`" and terminal process groups, and proposed a patch
+ * [Luc Gommans](https://github.com/lgommans) / https://lgms.nl/ - provided a "momentary ETA" patch
+ * [ikasty](https://github.com/ikasty) - added relative filename display to "`--watchfd`"
+ * [Michael Weiß](https://github.com/quitschbo) - corrected behaviour when not attached to a terminal
+ * [christoph-zededa](https://github.com/christoph-zededa) - provided OS X support for "`--watchfd`"
+ * [Dave Beckett](https://github.com/dajobe) - added "`@filename`" syntax to "`--size`", and corrected an autoconf problem with stat64 on OS X
+ * [Volodymyr Bychkovyak](https://github.com/vbychkoviak) - provided fix for rate limit behaviour with bursty traffic
+ * [Nick Black](https://nick-black.com) - added "`--bits`" option
+
+---
@@ -1,304 +0,0 @@
-1.6.6 - 30 June 2017
-  - (r161) use %llu instead of %Lu for better compatibility (Eric A. Borisch)
-  - (r162) (#1532) fix target buffer size (-B) being ignored (AndCycle, Ilya
-    Basin, Antoine BeauprÃ©)
-  - (r164) cap read/write sizes, and check elapsed time during read/write
-    cycles, to avoid display hangs with large buffers or slow media; also
-    remove select() call from repeated_write function as it slows the
-    transfer down and the wrapping alarm() means it is unnecessary
-  - (r169) (#1477) use alternate form for transfer counter, such that 13GB
-    is shown as 13.0GB so it's the same width as 13.1GB (AndrÃ© Stapf)
-  - (r171) cleanup: units corrections in man page, of the form kb -> KiB
-  - (r175) report error in "-d" if process fd directory is unreadable, or if
-    process disappears before we start the main loop (Jacek Wielemborek)
-
-1.6.0 - 15 March 2015
-  - fix lstat64 support when unavailable - separate patches supplied by
-    Ganael Laplanche and Peter Korsgaard
-  - (#1506) new option "-D" / "--delay-start" to only show bar after N
-    seconds (Damon Harper)
-  - new option "--fineta" / "-I" to show ETA as time of day rather than time
-    remaining - patch supplied by Erkki SeppÃ¤lÃ¤ (r147)
-  - (#1509) change ETA (--eta / -e) so that days are given if the hours
-    remaining are 24 or more (Jacek Wielemborek)
-  - (#1499) repeat read and write attempts on partial buffer fill/empty to
-    work around post-signal transfer rate drop reported by Ralf Ramsauer
-  - (#1507) do not try to calculate total size in line mode, due to bug
-    reported by Jacek Wielemborek and Michiel Van Herwegen
-  - cleanup: removed defunct RATS comments and unnecessary copyright notices
-  - clean up displayed lines when using --watchfd PID, when PID exits
-  - output errors on a new line to avoid overwriting transfer bar
-
-1.5.7 - 26 August 2014
-  - show KiB instead of incorrect kiB (Debian bug #706175)
-  - (#1284) do not gzip man page, for non-Linux OSes (Bob Friesenhahn)
-  - work around "awk" bug in tests/016-numeric-timer in decimal "," locales
-  - fix "make rpm" and "make srpm", extend "make release" to sign releases
-
-1.5.3 - 4 May 2014
-  - remove SPLICE_F_NONBLOCK to fix problem with slow splice() (Jan Seda)
-
-1.5.2 - 10 February 2014
-  - allow "--watchfd" to look at block devices
-  - let "--watchfd PID:FD" work with "--size N"
-  - moved contributors out of the manual as the list was too long
-    (NB everyone is still listed in the README and always will be)
-
-1.5.1 - 23 January 2014
-  - new option "--watchfd" - suggested by Jacek Wielemborek and "fdwatch"
-  - use non-block flag with splice()
-  - new display option "--buffer-percent", suggested by Kim Krecht
-  - new display option "--last-written", suggested by Kim Krecht
-  - new transfer option "--no-splice"
-  - fix for minor bug which dropped display elements after one empty one
-  - fix for single fd leak on exit (Cristian Ciupitu)
-
-1.4.12 - 5 August 2013
-  - new option "--null" - patch supplied by Zing Shishak
-  - AIX build fix (add "-lc128") - with help from Pawel Piatek
-  - AIX "-c" fixes - with help from Pawel Piatek
-  - SCO build fix (po2table.sh) - reported by Wouter Pronk
-  - test scripts fix for older distributions - patch from Bryan Dongray
-  - fix for splice() not using stdin - patch from Zev Weiss
-
-1.4.6 - 22 January 2013
-  - added patch from Pawel Piatek to omit O_NOFOLLOW in AIX
-
-1.4.5 - 10 January 2013
-  - updated manual page to show known problem with "-R" on Cygwin
-
-1.4.4 - 11 December 2012
-  - added debugging, see `pv -h' when configure run with "--enable-debugging"
-  - rewrote cursor positioning code used when IPC is unavailable (Cygwin)
-  - fixed cursor positioning cursor read answerback problem (Cygwin/Solaris)
-  - fixed bug causing crash when progress displayed with too-small terminal
-
-1.4.0 - 6 December 2012
-  - new option "--skip-errors" commissioned by Jim Salter
-  - if stdout is a block device, and we don't know the total size, use the
-    size of that block device as the total (Peter Samuelson)
-  - new option "--stop-at-size" to stop after "--size" bytes
-  - report correct filename on read errors
-  - fix use-after-free bug in remote PID cleanup code
-  - refactored large chunks of code to make it more readable and to replace
-    most static variables with a state structure
-
-1.3.9 - 5 November 2012
-  - allow "--format" parameters to be sent with "--remote"
-  - configure option "--disable-ipc"
-  - added tests for --numeric with --timer and --bytes
-  - added tests for --remote
-
-1.3.8 - 29 October 2012
-  - new "--pidfile" option to save process ID to a file
-  - integrated patch for --numeric with --timer and --bytes (Sami Liedes)
-  - removed signalling from --remote to prevent accidental process kills
-  - new "--format" option (originally Vladimir Pal / Vladimir Ermakov)
-
-1.3.4 - 27 June 2012
-  - new "--disable-splice" configure script option
-  - fixed line mode size count with multiple files (Moritz Barsnick)
-  - fixes for AIX core dumps (Pawel Piatek)
-
-1.3.1 - 9 June 2012
-  - do not use splice() if the write buffer is not empty (Thomas Rachel)
-  - added test 15 (pipe transfers), and new test script
-
-1.3.0 - 5 June 2012
-  - added Tiger build patch from Olle Jonsson
-  - fix 1024-boundary display garble (Debian bug #586763)
-  - use splice(2) where available (Debian bug #601683)
-  - added known bugs section of the manual page
-  - fixed average rate test, 12 (Andrew Macheret)
-  - use IEEE1541 units (Thomas Rachel)
-  - bug with rate limit under 10 fixed (Henry Precheur)
-  - speed up PV line mode (patch: Guillaume Marcais)
-  - remove LD=ld from vars.mk to fix cross-compilation (paintitgray/PV#1291)
-
-1.2.0 - 14 December 2010
-  - integrated improved SI prefixes and --average-rate (Henry Gebhardt)
-  - return nonzero if exiting due to SIGTERM (Martin Baum)
-  - patch from Phil Rutschman to restore terminal properly on exit
-  - fix i18n especially for --help (Sebastian Kayser)
-  - refactored pv_display
-  - we now have a coherent, documented, exit status
-  - modified pipe test and new cksum test from Sebastian Kayser
-  - default CFLAGS to just "-O" for non-GCC (Kjetil Torgrim Homme)
-  - LFS compile fix for OS X 10.4 (Alexandre de Verteuil)
-  - remove DESTDIR / suffix (Sam Nelson, Daniel Pape)
-  - fixed potential NULL deref in transfer (Elias Pipping / LLVM/Clang)
-
-1.1.4 - 6 March 2008
-  - patch from Elias Pipping correcting compilation failure on Darwin 9
-  - patch from Patrick Collison correcting similar problems on OS X
-  - trap SIGINT/SIGHUP/SIGTERM so we clean up IPCs on exit (Laszlo Ersek)
-  - abort if numeric option, eg -L, has non-numeric value (Boris Lohner)
-
-1.1.0 - 30 August 2007
-  - new option --remote (-R) to control an already-running process
-  - new option --line-mode (-l) to count lines instead of bytes
-  - fix for "-L" to be less resource intensive
-  - fix for input/output equivalence check on Mac OS X
-  - fix for size calculation in pipelines on Mac OS X
-  - fixed "make uninstall"
-  - removed /debian directory at request of new Debian maintainer
-
-1.0.1 - 4 August 2007
-  - licensing change from Artistic to Artistic 2.0
-  - removed the "-l" / "--license" option
-
-1.0.0 - 2 August 2007
-  - act more like "cat" - just skip unreadable files, don't abort
-  - removed text version of manual page, and obsolete Info file generation
-  - code cleanup and separation of PV internals from CLI front-end
-
-0.9.9 - 5 February 2007
-  - new option --buffer-size (-B) suggested by Mark Tomich
-  - build fix: HP/UX largefile compile fix from Timo Savinen
-  - maintain better buffer filling during transfers
-  - workaround: pv /dev/zero | dd bs=1M count=1k bug (reported by Gert Menke)
-  - dropped support for the Texinfo manual
-
-0.9.6 - 27 February 2006
-  - bugfix: key_t incompatibility with Cygwin
-  - bugfix: interval (-i) parameter parses numbers after decimal point
-  - build fix: use static NLS if msgfmt is unavailable
-  - on the final update, blank out the now-zero ETA
-
-0.9.2 - 1 September 2005
-  - Daniel Roethlisberger patch: use lockfiles if terminal locking fails
-
-0.9.1 - 16 June 2005
-  - minor RPM spec file fix for Fedora Core 4
-
-0.9.0 - 15 November 2004
-  - minor NLS bugfix
-
-0.8.9 - 6 November 2004
-  - decimal values now accepted for rate and size, eg "-L 1.23M"
-  - code cleanup
-  - developers: "make help" now lists Makefile targets
-
-0.8.6 - 29 June 2004
-  - use uu_lock() for terminal locking on FreeBSD
-
-0.8.5 - 2 May 2004
-  - cursor positioning (-c) reliability improved on systems with IPC
-  - minor fix: made test 005 more reliable
-  - new option --height (-H)
-
-0.8.2 - 24 April 2004
-  - allow k,m,g,t suffixes on numbers
-  - added "srpm" and "release" Makefile targets
-
-0.8.1 - 19 April 2004
-  - bugfix in cursor positioning (-c)
-
-0.8.0 - 12 February 2004
-  - replaced GNU getopt with my library code
-  - replaced GNU gettext with my very minimal replacement
-  - use DESTDIR instead of RPM_BUILD_ROOT for optional installation prefix
-  - looked for flaws using RATS, cleaned up code
-
-0.7.0 - 8 February 2004
-  - display buffer management fixes (thanks Cédric Delfosse)
-  - replaced --enable-debug with --enable-debugging and --enable-profiling
-
-0.6.4 - 14 January 2004
-  - fixed minor bug in RPM installation
-  - bugfix in "make index" (only of interest to developers)
-
-0.6.3 - 22 December 2003
-  - fixed transient bug that reported "resource unavailable" occasionally
-
-0.6.2 - 6 August 2003
-  - block devices now have their size read correctly, so pv /dev/hda1 works
-  - minor code cleanups (mainly removal of CVS "Id" tags)
-
-0.6.0 - 3 August 2003
-  - doing ^Z then "bg" then "fg" now continues displaying
-
-0.5.9 - 23 July 2003
-  - fix for test 007 when not in C locale
-  - fix for build process to use CPPFLAGS
-  - fix for build process to use correct i18n libraries
-  - fix for build process - more portable sed in dependency generator
-  - fix for install process - remember to mkinstalldirs before installing
-  - fixes for building on Mac OS X
-
-0.5.3 - 4 May 2003
-  - added Polish translation thanks to Bartosz Feñski
-    <fenio@o2.pl> <http://skawina.eu.org/> and Krystian Zubel
-  - moved doc/debian to ./debian at insistence of common sense
-  - minor Solaris 8 compatibility fixes
-  - seems to compile and test OK on Mac OS X
-
-0.5.0 - 15 April 2003
-  - added French translation thanks to Stéphane Lacasse
-    <stephane@gorfou.ca>
-  - added German translation thanks to Marcos Kreinacke
-    <public@kreinacke.com>
-  - switched LGPL reference from "Library" to "Lesser"
-
-0.4.9 - 18 February 2003
-  - support for >2GB files added where available (Debian bug #180986)
-  - added doc/debian dir (from Cédric Delfosse)
-  - added "make rpm" and "make deb" targets to build RPM and Debian packages
-  - added a "make pv-static" rule to build a statically linked version
-
-0.4.5 - 13 December 2002
-  - added Portuguese (Brazilian) translation thanks to Eduardo Aguiar
-
-0.4.4 - 7 December 2002
-  - pause/resume support - don't count time while stopped
-  - stop output when resumed in the background
-  - terminal size change support
-  - bugfix: <=> indicator no longer sticks at right hand edge
-
-0.4.0 - 27 November 2002
-  - allow decimal interval values, eg 0.1, 0.5, etc
-  - some simple tests added (`make check')
-  - smoother throughput limiting (--rate-limit), now done in 0.1sec chunks
-  - bounds-check interval values (-i) - max update interval now 10 minutes
-  - more reliable non-blocking output to keep display updated
-  - no longer rely on atoll()
-  - don't output final blank line if --numeric
-  - use fcntl() instead of flock() for Solaris compatibility
-
-0.3.0 - 25 November 2002
-  - handle broken output pipe gracefully
-  - continue updating display even when output pipe is blocking
-
-0.2.6 - 21 October 2002
-  - we now ignore EINTR on select()
-  - variable-size buffer (still need to add code to change size)
-  - added (tentative) support for internationalisation
-  - removed superfluous --no-progress, etc options
-  - optimised transfer by using bigger buffers, based on st_blksize
-  - added --wait option to wait until transfer begins before showing progress
-  - added --rate-limit option to limit rate to a maximum throughput
-  - added --quiet option (no output at all) to be used with --rate-limit
-
-0.2.5 - 23 July 2002
-  - added [FILE]... arguments, like `cat'
-  - function separation in code
-  - some bug fixes related to numeric overflow
-
-0.2.3 - 19 July 2002
-  - Texinfo manual written, man page updated
-  - byte counter added
-
-0.2.0 - 18 July 2002
-  - ETA counter added
-  - screen width estimation added
-  - progress bar added
-
-0.1.0 - 17 July 2002
-  - main loop created
-  - rate counter added
-  - elapsed time counter added
-  - percentage calculation added
-
-0.0.1 - 16 July 2002
-  - package created
-  - first draft of man page written
@@ -0,0 +1,338 @@
+1.7.0 - 17 July 2023
+ * dropped: support for Red Hat Enterprise Linux and its derivatives has been dropped; removed the RPM spec file, and will no longer build binaries
+ * feature: the "`--size`" option now accepts "`@filename`" to use the size of another file (pull request [#57](https://github.com/a-j-wood/pv/pull/57) supplied by [Dave Beckett](https://github.com/dajobe))
+ * feature: the "`--watchfd`" option is now available on OS X (pull request [#60](https://github.com/a-j-wood/pv/pull/60) supplied by [christoph-zededa](https://github.com/christoph-zededa))
+ * feature: new "`--bits`" option to show bit count instead of byte count (adapted from pull request [#63](https://github.com/a-j-wood/pv/pull/63) supplied by [Nick Black](https://nick-black.com))
+ * feature: new "`--average-rate-window`" option, to set the window over which the average rate is calculated, also used for ETA (modified from pull request [#65](https://github.com/a-j-wood/pv/pull/65) supplied by [lemonsqueeze](https://github.com/lemonsqueeze))
+ * feature: the "`--watchfd`" option will now show relative filenames, if they are under the current directory (pull request [#66](https://github.com/a-j-wood/pv/pull/66) supplied by [ikasty](https://github.com/ikasty))
+ * fix: correction to `pv_in_foreground()` to behave as its comment block says it should, when not on a terminal - corrects [GH#19 "No output in Arch Linux initcpio after 1.6.6"](https://github.com/a-j-wood/pv/issues/19), [GH#31 "No output written from inside zsh <() construct"](https://github.com/a-j-wood/pv/issues/31), [GH#55 "pv Stopped Working in the Background"](https://github.com/a-j-wood/pv/issues/55) (pull request [#64](https://github.com/a-j-wood/pv/pull/64) supplied by [Michael Weiß](https://github.com/quitschbo))
+ * fix: workaround for OS X 11 behaviour in configure script regarding stat64 at compile time (pull request [#57](https://github.com/a-j-wood/pv/pull/57) supplied by [Dave Beckett](https://github.com/dajobe))
+ * fix: workaround for macOS equivalence of stat to stat64 - patches from [Filippo Valsorda](https://github.com/FiloSottile) and [Demitri Muna](https://github.com/demitri), correcting [GH#33 "Fix compilation problems due to `stat64()` on Apple Silicon"](https://github.com/a-j-wood/pv/issues/33)
+ * fix: add burst rate limit to transfer, so rate limits are not broken by bursty traffic (pull request [#62](https://github.com/a-j-wood/pv/pull/62) supplied by [Volodymyr Bychkovyak](https://github.com/vbychkoviak))
+ * fix: corrected "`--force`" option so it will still output progress when not in the same process group as the owner of the terminal - corrects [GH#23 "No output with "`-f`" when run in background after 1.6.6"](https://github.com/a-j-wood/pv/issues/23) and helps to correct [GH#31 "No output written from inside zsh <() construct"](https://github.com/a-j-wood/pv/issues/31)
+ * fix: corrected elapsed time display to show as D:HH:MM:SS after 1 day, like the ETA does - corrects [GH#16 "Show days in same format in ETA as in elapsed time"](https://github.com/a-j-wood/pv/issues/16)
+ * fix: corrected bug where percentages went down after 100% when in "`--numeric`" mode with a "`--size`" that was too small - corrects [GH#26 "Correct "`-n`" behaviour when going past 100% of "`-s`" size"](https://github.com/a-j-wood/pv/issues/26)
+ * i18n: recoded Polish translation file to UTF-8
+ * i18n: removed inaccurate fuzzy translation matches
+ * docs: moved all open issues into GitHub and updated the TODO list
+ * docs: renamed README to README.md and altered it to Markdown format
+ * docs: moved contributors from the README to docs/ACKNOWLEDGEMENTS.md
+ * docs: moved TODO to TODO.md and altered it to Markdown format
+ * docs: moved NEWS to NEWS.md, converted it to UTF-8, and altered it to Markdown format
+
+1.6.20 - 12 September 2021
+ * fix: add missing `stddef.h` include to `number.c` (Sam James)
+
+1.6.19 - 5 September 2021
+ * fix: starting pv in the background no longer immediately stops unless the transfer is to/from the terminal (Andriy Gapon, Jonathan Elchison)
+ * fix: using "`-B`", "`-A`", or "`-T`" now switches on "`-C`" implicitly (Johannes Gerer, André Stapf)
+ * fix: AIX build fixes (Peter Korsgaard)
+ * i18n: updated German "`--help`" translations (Richard Fonfara)
+ * i18n: switched to UTF-8 encoding, added missing translations (de,fr,pt)
+ * docs: new "common switches" manual section (Jacek Wielemborek)
+ * docs: use placeholder instead of `/dev/sda` in the manual (Pranav Peshwe)
+ * docs: mention MacOS pipes and "`-B 1024`" in the manual (Jan Venekamp)
+ * docs: correct shell in `autoconf/scripts/index.sh` (Juan Picca)
+ * cleanup: various compiler warnings cleaned up
+
+ Full changelog is below:
+ * (r181) added common switches section to manual (Jacek Wielemborek)
+ * (r184) use placeholder instead of /dev/sda in the manual (Pranav Peshwe)
+ * (r185) replace ash with sh in autoconf/scripts/index.sh (Juan Picca)
+ * (r185) added note to manual about "`-B 1024`" in MacOS pipes (Jan Venekamp)
+ * (r185) fix AIX config check when the CWD contains "yes" (Peter Korsgaard)
+ * (r189) (#1556) updated German "`--help`" translations (Richard Fonfara)
+ * (r189) updated missing German translations and changed to UTF-8 encoding
+ * (r191) updated missing French translations and changed to UTF-8 encoding
+ * (r193) updated missing Portuguese translations, changed to UTF-8 encoding
+ * (r196) (#1563) using "`-B`", "`-A`", or "`-T`" now switches on "`-C`" implicitly (Johannes Gerer, André Stapf)
+ * (r199) fixed numerous compiler warnings in newer GCC versions
+ * (r200,205) fixed bug where "`pv /dev/zero >/dev/null &`" stopped immediately (Jonathan Elchison, Andriy Gapon)
+ * (r203,205) marked unused arguments with GCC unused attribute, started using boolean data type for flags, corrected more compiler warnings
+
+1.6.6 - 30 June 2017
+ * (r161) use `%llu` instead of `%Lu` for better compatibility (Eric A. Borisch)
+ * (r162) (#1532) fix target buffer size ("`-B`") being ignored (AndCycle, Ilya Basin, Antoine Beaupré)
+ * (r164) cap read/write sizes, and check elapsed time during read/write cycles, to avoid display hangs with large buffers or slow media; also remove `select()` call from repeated_write function as it slows the transfer down and the wrapping `alarm()` means it is unnecessary
+ * (r169) (#1477) use alternate form for transfer counter, such that 13GB is shown as 13.0GB so it's the same width as 13.1GB (André Stapf)
+ * (r171) cleanup: units corrections in man page, of the form kb -> KiB
+ * (r175) report error in "`-d`" if process fd directory is unreadable, or if process disappears before we start the main loop (Jacek Wielemborek)
+
+1.6.0 - 15 March 2015
+ * fix lstat64 support when unavailable - separate patches supplied by Ganael Laplanche and Peter Korsgaard
+ * (#1506) new option "`-D`" / "`--delay-start`" to only show bar after N seconds (Damon Harper)
+ * new option "`--fineta`" / "`-I`" to show ETA as time of day rather than time remaining - patch supplied by Erkki Seppälä (r147)
+ * (#1509) change ETA ("`--eta`" / "`-e`") so that days are given if the hours remaining are 24 or more (Jacek Wielemborek)
+ * (#1499) repeat read and write attempts on partial buffer fill/empty to work around post-signal transfer rate drop reported by Ralf Ramsauer
+ * (#1507) do not try to calculate total size in line mode, due to bug reported by Jacek Wielemborek and Michiel Van Herwegen
+ * cleanup: removed defunct RATS comments and unnecessary copyright notices
+ * clean up displayed lines when using "`--watchfd PID`", when PID exits
+ * output errors on a new line to avoid overwriting transfer bar
+
+1.5.7 - 26 August 2014
+ * show KiB instead of incorrect kiB (Debian bug #706175)
+ * (#1284) do not gzip man page, for non-Linux OSes (Bob Friesenhahn)
+ * work around "awk" bug in `tests/016-numeric-timer` in decimal "," locales
+ * fix "`make rpm`" and "`make srpm`", extend "`make release`" to sign releases
+
+1.5.3 - 4 May 2014
+ * remove *SPLICE_F_NONBLOCK* to fix problem with slow `splice()` (Jan Seda)
+
+1.5.2 - 10 February 2014
+ * allow "`--watchfd`" to look at block devices
+ * let "`--watchfd PID:FD`" work with "`--size N`"
+ * moved contributors out of the manual as the list was too long (NB everyone is still listed in the README and always will be)
+
+1.5.1 - 23 January 2014
+ * new option "`--watchfd`" - suggested by Jacek Wielemborek and "fdwatch"
+ * use non-block flag with `splice()`
+ * new display option "`--buffer-percent`", suggested by Kim Krecht
+ * new display option "`--last-written`", suggested by Kim Krecht
+ * new transfer option "`--no-splice`"
+ * fix for minor bug which dropped display elements after one empty one
+ * fix for single fd leak on exit (Cristian Ciupitu)
+
+1.4.12 - 5 August 2013
+ * new option "`--null`" - patch supplied by Zing Shishak
+ * AIX build fix (add "`-lc128`") - with help from Pawel Piatek
+ * AIX "`-c`" fixes - with help from Pawel Piatek
+ * SCO build fix (`po2table.sh`) - reported by Wouter Pronk
+ * test scripts fix for older distributions - patch from Bryan Dongray
+ * fix for `splice()` not using stdin - patch from Zev Weiss
+
+1.4.6 - 22 January 2013
+ * added patch from Pawel Piatek to omit *O_NOFOLLOW* in AIX
+
+1.4.5 - 10 January 2013
+ * updated manual page to show known problem with "`-R`" on Cygwin
+
+1.4.4 - 11 December 2012
+ * added debugging, see "`pv -h`" when `configure` is run with "`--enable-debugging`"
+ * rewrote cursor positioning code used when IPC is unavailable (Cygwin)
+ * fixed cursor positioning cursor read answerback problem (Cygwin/Solaris)
+ * fixed bug causing crash when progress displayed with too-small terminal
+
+1.4.0 - 6 December 2012
+ * new option "`--skip-errors`" commissioned by Jim Salter
+ * if stdout is a block device, and we don't know the total size, use the size of that block device as the total (Peter Samuelson)
+ * new option "`--stop-at-size`" to stop after "`--size`" bytes
+ * report correct filename on read errors
+ * fix use-after-free bug in remote PID cleanup code
+ * refactored large chunks of code to make it more readable and to replace most static variables with a state structure
+
+1.3.9 - 5 November 2012
+ * allow "`--format`" parameters to be sent with "`--remote`"
+ * configure option "`--disable-ipc`"
+ * added tests for "`--numeric`" with "`--timer`" and "`--bytes`"
+ * added tests for "`--remote`"
+
+1.3.8 - 29 October 2012
+ * new "`--pidfile`" option to save process ID to a file
+ * integrated patch for "`--numeric`" with "`--timer`" and "`--bytes`" (Sami Liedes)
+ * removed signalling from "`--remote`" to prevent accidental process kills
+ * new "`--format`" option (originally Vladimir Pal / Vladimir Ermakov)
+
+1.3.4 - 27 June 2012
+ * new "`--disable-splice`" configure script option
+ * fixed line mode size count with multiple files (Moritz Barsnick)
+ * fixes for AIX core dumps (Pawel Piatek)
+
+1.3.1 - 9 June 2012
+ * do not use `splice()` if the write buffer is not empty (Thomas Rachel)
+ * added test 15 (pipe transfers), and new test script
+
+1.3.0 - 5 June 2012
+ * added Tiger build patch from Olle Jonsson
+ * fix 1024-boundary display garble (Debian bug #586763)
+ * use `splice`(2) where available (Debian bug #601683)
+ * added known bugs section of the manual page
+ * fixed average rate test, 12 (Andrew Macheret)
+ * use IEEE1541 units (Thomas Rachel)
+ * bug with rate limit under 10 fixed (Henry Precheur)
+ * speed up PV line mode (patch: Guillaume Marcais)
+ * remove `LD=ld` from `vars.mk` to fix cross-compilation (paintitgray/PV#1291)
+
+1.2.0 - 14 December 2010
+ * integrated improved SI prefixes and "`--average-rate`" (Henry Gebhardt)
+ * return nonzero if exiting due to *SIGTERM* (Martin Baum)
+ * patch from Phil Rutschman to restore terminal properly on exit
+ * fix i18n especially for "`--help`" (Sebastian Kayser)
+ * refactored `pv_display`
+ * we now have a coherent, documented, exit status
+ * modified pipe test and new cksum test from Sebastian Kayser
+ * default *CFLAGS* to just "`-O`" for non-GCC (Kjetil Torgrim Homme)
+ * LFS compile fix for OS X 10.4 (Alexandre de Verteuil)
+ * remove *DESTDIR* `/` suffix (Sam Nelson, Daniel Pape)
+ * fixed potential NULL deref in transfer (Elias Pipping / LLVM/Clang)
+
+1.1.4 - 6 March 2008
+ * patch from Elias Pipping correcting compilation failure on Darwin 9
+ * patch from Patrick Collison correcting similar problems on OS X
+ * trap *SIGINT* / *SIGHUP* / *SIGTERM* so we clean up IPCs on exit (Laszlo Ersek)
+ * abort if numeric option, eg "`-L`", has non-numeric value (Boris Lohner)
+
+1.1.0 - 30 August 2007
+ * new option "`--remote`" ("`-R`") to control an already-running process
+ * new option "`--line-mode`" ("`-l`") to count lines instead of bytes
+ * fix for "`-L`" to be less resource intensive
+ * fix for input/output equivalence check on Mac OS X
+ * fix for size calculation in pipelines on Mac OS X
+ * fixed "`make uninstall`"
+ * removed "`/debian`" directory at request of new Debian maintainer
+
+1.0.1 - 4 August 2007
+ * licensing change from Artistic to Artistic 2.0
+ * removed the "`-l`" / "`--license`" option
+
+1.0.0 - 2 August 2007
+ * act more like "`cat`" - just skip unreadable files, don't abort
+ * removed text version of manual page, and obsolete Info file generation
+ * code cleanup and separation of PV internals from CLI front-end
+
+0.9.9 - 5 February 2007
+ * new option "`--buffer-size`" ("`-B`") suggested by Mark Tomich
+ * build fix: HP/UX largefile compile fix from Timo Savinen
+ * maintain better buffer filling during transfers
+ * workaround: "`pv /dev/zero | dd bs=1M count=1k`" bug (reported by Gert Menke)
+ * dropped support for the Texinfo manual
+
+0.9.6 - 27 February 2006
+ * bugfix: `key_t` incompatibility with Cygwin
+ * bugfix: interval ("`-i`") parameter parses numbers after decimal point
+ * build fix: use static NLS if `msgfmt` is unavailable
+ * on the final update, blank out the now-zero ETA
+
+0.9.2 - 1 September 2005
+ * Daniel Roethlisberger patch: use lockfiles if terminal locking fails
+
+0.9.1 - 16 June 2005
+ * minor RPM spec file fix for Fedora Core 4
+
+0.9.0 - 15 November 2004
+ * minor NLS bugfix
+
+0.8.9 - 6 November 2004
+ * decimal values now accepted for rate and size, eg "`-L 1.23M`"
+ * code cleanup
+ * developers: "`make help`" now lists Makefile targets
+
+0.8.6 - 29 June 2004
+ * use `uu_lock()` for terminal locking on FreeBSD
+
+0.8.5 - 2 May 2004
+ * cursor positioning ("`-c`") reliability improved on systems with IPC
+ * minor fix: made test 005 more reliable
+ * new option "`--height`" ("`-H`")
+
+0.8.2 - 24 April 2004
+ * allow k,m,g,t suffixes on numbers
+ * added "`srpm`" and "`release`" Makefile targets
+
+0.8.1 - 19 April 2004
+ * bugfix in cursor positioning ("`-c`")
+
+0.8.0 - 12 February 2004
+ * replaced GNU getopt with my library code
+ * replaced GNU gettext with my very minimal replacement
+ * use *DESTDIR* instead of *RPM_BUILD_ROOT* for optional installation prefix
+ * looked for flaws using RATS, cleaned up code
+
+0.7.0 - 8 February 2004
+ * display buffer management fixes (thanks Cédric Delfosse)
+ * replaced "`--enable-debug`" with "`--enable-debugging`" and "`--enable-profiling`"
+
+0.6.4 - 14 January 2004
+ * fixed minor bug in RPM installation
+ * bugfix in "`make index`" (only of interest to developers)
+
+0.6.3 - 22 December 2003
+ * fixed transient bug that reported "resource unavailable" occasionally
+
+0.6.2 - 6 August 2003
+ * block devices now have their size read correctly, so "`pv /dev/hda1`" works
+ * minor code cleanups (mainly removal of CVS "Id" tags)
+
+0.6.0 - 3 August 2003
+ * doing *^Z* then "`bg`" then "`fg`" now continues displaying
+
+0.5.9 - 23 July 2003
+ * fix for test 007 when not in C locale
+ * fix for build process to use *CPPFLAGS*
+ * fix for build process to use correct i18n libraries
+ * fix for build process - more portable sed in dependency generator
+ * fix for install process - remember to `mkinstalldirs` before installing
+ * fixes for building on Mac OS X
+
+0.5.3 - 4 May 2003
+ * added Polish translation thanks to Bartosz Feński <fenio@o2.pl> <http://skawina.eu.org/> and Krystian Zubel
+ * moved `doc/debian` to `./debian` at insistence of common sense
+ * minor Solaris 8 compatibility fixes
+ * seems to compile and test OK on Mac OS X
+
+0.5.0 - 15 April 2003
+ * added French translation thanks to Stéphane Lacasse <stephane@gorfou.ca>
+ * added German translation thanks to Marcos Kreinacke <public@kreinacke.com>
+ * switched LGPL reference from "Library" to "Lesser"
+
+0.4.9 - 18 February 2003
+ * support for >2GB files added where available (Debian bug #180986)
+ * added `doc/debian` dir (from Cédric Delfosse)
+ * added "`make rpm`" and "`make deb`" targets to build RPM and Debian packages
+ * added a "`make pv-static`" rule to build a statically linked version
+
+0.4.5 - 13 December 2002
+ * added Portuguese (Brazilian) translation thanks to Eduardo Aguiar
+
+0.4.4 - 7 December 2002
+ * pause/resume support - don't count time while stopped
+ * stop output when resumed in the background
+ * terminal size change support
+ * bugfix: "`<=>`" indicator no longer sticks at right hand edge
+
+0.4.0 - 27 November 2002
+ * allow decimal interval values, eg 0.1, 0.5, etc
+ * some simple tests added ("`make check`")
+ * smoother throughput limiting ("`--rate-limit`"), now done in 0.1sec chunks
+ * bounds-check interval values ("`-i`") - max update interval now 10 minutes
+ * more reliable non-blocking output to keep display updated
+ * no longer rely on `atoll()`
+ * don't output final blank line if "`--numeric`"
+ * use `fcntl()` instead of `flock()` for Solaris compatibility
+
+0.3.0 - 25 November 2002
+ * handle broken output pipe gracefully
+ * continue updating display even when output pipe is blocking
+
+0.2.6 - 21 October 2002
+ * we now ignore *EINTR* on `select()`
+ * variable-size buffer (still need to add code to change size)
+ * added (tentative) support for internationalisation
+ * removed superfluous "`--no-progress`", etc options
+ * optimised transfer by using bigger buffers, based on `st_blksize`
+ * added "`--wait`" option to wait until transfer begins before showing progress
+ * added "`--rate-limit`" option to limit rate to a maximum throughput
+ * added "`--quiet`" option (no output at all) to be used with "`--rate-limit`"
+
+0.2.5 - 23 July 2002
+ * added *[FILE]...* arguments, like "`cat`"
+ * function separation in code
+ * some bug fixes related to numeric overflow
+
+0.2.3 - 19 July 2002
+ * Texinfo manual written, man page updated
+ * byte counter added
+
+0.2.0 - 18 July 2002
+ * ETA counter added
+ * screen width estimation added
+ * progress bar added
+
+0.1.0 - 17 July 2002
+ * main loop created
+ * rate counter added
+ * elapsed time counter added
+ * percentage calculation added
+
+0.0.1 - 16 July 2002
+ * package created
+ * first draft of man page written
@@ -1,35 +0,0 @@
-Things still to do:
-
-  - allow -E to take a block size argument so errors cause a skip to the
-    next block (Anthony DeRobertis)
-  - (#1559) momentary ETA option (Luc Gommans)
-  - (#1556) correct German translations (Richard Fonfara)
-  - (#1557) use clock_gettime() in ETA calculation (Mateju Miroslav)
-  - (#1561) show days in same format in ETA as in elapsed time
-  - (#1562) allow -r with -l and -n to output lines/sec (Roland Kletzing)
-  - (#1563) make -B imply -C (Johannes Gerer)
-  - document zsh <() incompatibility (frederik@ofb.net - Frederik Eaton)
-  - do not check terminal in -q/-n mode (zsh <(pv -n) fails)
-  - if -w/-H was specified, ignore SIGWINCH
-  - option to enable O_DIRECT (Romain Kang, Jacek Wielemborek)
-  - use posix_fadvise() like cat(1) does (Jacek Wielemborek)
-  - (#1508) add watchfd tests
-  - (#1534) allow multiple -d options
-  - (#1533) one-shot option (Jacek Wielemborek)
-  - (#1505) option to switch rate to per minute if really slow
-  - (#1510) option "--progress-from FILE", read last number and use it as bytes read:
-    pv --progress-from <( while sleep 1; do du -sb somedir; done ) -s 123g
-    (Jacek Wielemborek)
-  - (#1476) (Debian #507682) adjustable averaging window for rate display
-  - (#1286) option for process title (Martin Sarsale) as "pv - name:FooProcess -xyz - transferred: 1.3GB - 500KB/s - running: 10:15:30s"
-  - (#1290) look at effect of O_SYNC or fsync on performance
-  - (#1281) option (-x?) to use xterm title line for status (Joachim Haga)
-  - (#1287) if the first pv exits, should the second become IPC leader?
-  - (#1560) use Unicode for more granular progress bar (Alexander Petrossian)
-
-  - add development support for http://clang-analyzer.llvm.org/
-  - stats for avg/min/max/stddev throughput (Venky.N.Iyer)
-  - pv-ify a command line (Will Entriken) - "pv FOO | BAR | BAZ"
-  - get more translations
-
-Any assistance would be appreciated.
@@ -0,0 +1,46 @@
+Things still to do.  (GH#n) indicates the Github issue tracker number.
+
+Bugs
+----
+
+ * ([GH#5](https://github.com/a-j-wood/pv/issues/5)) Transfer IPC leadership on exit of leader
+ * ([GH#13](https://github.com/a-j-wood/pv/issues/13)) Use `clock_gettime()` in ETA calculation to cope with machine suspend/resume (Mateju Miroslav)
+ * ([GH#20](https://github.com/a-j-wood/pv/issues/20)) Terminal state is not restored correctly in all cases (VA)
+ * ([GH#24](https://github.com/a-j-wood/pv/issues/24)) Race condition with multiple "`pv -c`" leaves terminal state inconsistent (Lars Ellenberg, Viktor Ashirov)
+ * ([GH#34](https://github.com/a-j-wood/pv/issues/34)) Continue timer even if input or output is blocking (Martin Probst - Jun 2017)
+
+Feature requests
+----------------
+
+ * ([GH#3](https://github.com/a-j-wood/pv/issues/3)) Option ("`-x`"?) to use xterm title line for status (Joachim Haga)
+ * ([GH#4](https://github.com/a-j-wood/pv/issues/4)) Option for process title (Martin Sarsale) as "`pv - name:FooProcess -xyz - transferred: 1.3GB - 500KB/s - running: 10:15:30s`"
+ * ([GH#6](https://github.com/a-j-wood/pv/issues/6)) Look at effect of *O_SYNC* or `fsync` on performance; update counters during buffer flush
+ * ([GH#9](https://github.com/a-j-wood/pv/issues/9)) Option to switch rate to per minute if really slow
+ * ([GH#10](https://github.com/a-j-wood/pv/issues/10)) Add watchfd tests
+ * ([GH#11](https://github.com/a-j-wood/pv/issues/11)) Option "`--progress-from FILE`", read last number and use it as bytes read (Jacek Wielemborek)
+ * ([GH#12](https://github.com/a-j-wood/pv/issues/12)) Allow multiple "`-d`" options (Linus Heckemann for multiple PID:FD; Jacek Wielemborek)
+ * ([GH#15](https://github.com/a-j-wood/pv/issues/15)) Use Unicode for more granular progress bar (Alexander Petrossian)
+ * ([GH#17](https://github.com/a-j-wood/pv/issues/17)) Allow "`-r`" with "`-l`" and "`-n`" to output lines/sec (Roland Kletzing)
+ * ([GH#22](https://github.com/a-j-wood/pv/issues/22)) Options to skip input and seek on output (Jason A. Pfeil, Feb 2022)
+ * ([GH#25](https://github.com/a-j-wood/pv/issues/25)) Normalise progress to 100% on overrun (Andrej Gantvorg)
+ * ([GH#29](https://github.com/a-j-wood/pv/issues/29)) Option to enable *O_DIRECT* (Romain Kang, Jacek Wielemborek)
+ * ([GH#35](https://github.com/a-j-wood/pv/issues/35)) Allow decimal values for "`-s`", "`-L`", "`-B`" (Thomas Watson - Aug 2020)
+ * ([GH#36](https://github.com/a-j-wood/pv/issues/36)) Ignore *SIGWINCH* (window size change) if "`-w`" / "`-H`" provided
+ * ([GH#37](https://github.com/a-j-wood/pv/issues/37)) Allow "`-E`" to take a block size argument so errors cause a skip to the next block (Anthony DeRobertis - Oct 2016)
+ * ([GH#38](https://github.com/a-j-wood/pv/issues/38)) Reset ETA on *SIGUSR1* (Jacek Wielemborek - Jan 2019)
+ * ([GH#39](https://github.com/a-j-wood/pv/issues/39)) Use `posix_fadvise()` like `cat`(1) does (Jacek Wielemborek - Oct 2015)
+ * ([GH#40](https://github.com/a-j-wood/pv/issues/40)) Permit "`-c`" with "`-d PID:FD`", reject "`-N`" with "`-d PID`" (Norman Rasmussen - Nov 2020)
+ * ([GH#41](https://github.com/a-j-wood/pv/issues/41)) Improve how backwards-moving reads are shown in "`--watchfd`" (Ryan Cooley - Dec 2017)
+ * ([GH#42](https://github.com/a-j-wood/pv/issues/42)) Option to discard stdin so nothing is written to stdout (André Stapf - Apr 2017)
+ * ([GH#43](https://github.com/a-j-wood/pv/issues/43)) Differentiate between "`--eta`" and "`--fineta`" in display (André Stapf - Apr 2017)
+ * ([GH#45](https://github.com/a-j-wood/pv/issues/45)) Option "`--sparse`" (with block size option) to write sparse output (Andriy Galetski - Apr 2019)
+ * ([GH#46](https://github.com/a-j-wood/pv/issues/46)) Option to show speed gauge (% max speed) if progress not known (Ryan Cooley - Jun 2019)
+ * ([GH#47](https://github.com/a-j-wood/pv/issues/47)) Analyse splice and buffer usage to improve performance
+ * ([GH#48](https://github.com/a-j-wood/pv/issues/48)) Option to show multiple files with individual sizes and a cumulative total (Zach Riggle - Jul 2021)
+ * ([GH#49](https://github.com/a-j-wood/pv/issues/49)) Option to provide stats for avg/min/max/stddev throughput (Venky.N.Iyer)
+ * ([GH#50](https://github.com/a-j-wood/pv/issues/50)) Allow pv to report on a whole pipeline at once (Will Entriken - Feb 2011)
+ * ([GH#54](https://github.com/a-j-wood/pv/issues/54)) Run command every n percent ([haarp](https://github.com/haarp))
+ * ([GH#56](https://github.com/a-j-wood/pv/issues/56)) Support for backgrounding pv, and allowing it to be monitored separately ([jimbobmcgee](https://github.com/jimbobmcgee))
+ * ([GH#67](https://github.com/a-j-wood/pv/issues/67)) Wrap another process to monitor its stdin & stdout ([Alex Mason](https://github.com/axman6))
+
+Any assistance would be appreciated.
@@ -1 +1 @@
-1.6.6
+1.7.0
@@ -1,7 +1,7 @@
 Begin3
 Title:		@PACKAGE@
 Version:	@VERSION@
-Entered-date:	30JUN17
+Entered-date:	17JUL23
 Description:	A tool for monitoring the progress of data through a
 		pipeline.  It can be inserted into any normal pipeline
 		between two processes to give a visual indication of how
@@ -1,4 +1,4 @@
-.TH @UCPACKAGE@ 1 "June 2017" Linux "User Manuals"
+.TH @UCPACKAGE@ 1 "July 2023" Linux "User Manuals"
 .SH NAME
@PACKAGE@ \- monitor the progress of data through a pipe
 .SH SYNOPSIS
@@ -63,19 +63,19 @@ program for a full-screen progress display:
 Taking an image of a disk, skipping errors:

 .RS
-.B @PACKAGE@ -EE /dev/sda > disk-image.img
+.B @PACKAGE@ -EE /dev/your/disk/device > disk-image.img
 .RE

 Writing an image back to a disk:

 .RS
-.B @PACKAGE@ disk-image.img > /dev/sda
+.B @PACKAGE@ disk-image.img > /dev/your/disk/device
 .RE

 Zeroing a disk:

 .RS
-.B @PACKAGE@ < /dev/zero > /dev/sda
+.B @PACKAGE@ < /dev/zero > /dev/your/disk/device
 .RE

 Note that if the input size cannot be calculated, and the output is a block
@@ -127,7 +127,7 @@ Turn the timer on.  This will display the total elapsed time that
 has been running for.
 .TP
 .B \-e, \-\-eta
-Turn the ETA timer on.  This will attempt to guess, based on previous
+Turn the ETA timer on.  This will attempt to guess, based on current
 transfer rates and the total data size, how long it will be before
 completion.  This option will have no effect if the total data size cannot
 be determined.
@@ -142,20 +142,25 @@ Turn the rate counter on.  This will display the current rate of data
 transfer.
 .TP
 .B \-a, \-\-average\-rate
-Turn the average rate counter on.  This will display the average rate of
-data transfer so far.
+Turn the average rate counter on.  This will display the current average
+rate of data transfer (default: last 30s, see --average-rate-window).
 .TP
 .B \-b, \-\-bytes
 Turn the total byte counter on.  This will display the total amount of
 data transferred so far.
 .TP
+.B \-8, \-\-bits
+Display the total bits instead of the total bytes.  The output suffix will
+be "b" instead of "B".
+.TP
 .B \-T, \-\-buffer\-percent
 Turn on the transfer buffer percentage display.  This will show the
 percentage of the transfer buffer in use - but see the caveat under
 .B %T
 in the
 .B FORMATTING
-section below.
+section below.  Implies
+.BR \-C .
 .TP
 .B \-A, \-\-last\-written NUM
 Show the last
@@ -164,7 +169,8 @@ bytes written - but see the caveat under
 .B %nA
 in the
 .B FORMATTING
-section below.
+section below.  Implies
+.BR \-C .
 .TP
 .B \-F, \-\-format FORMAT
 Ignore the options
@@ -241,7 +247,18 @@ etc can be used as with
 .BR -L .
 .TP
 .B ""
-Has no effect if used with
+If
+.B SIZE
+starts with
+.BR "@" ,
+the size of file whose name follows the
+.B @
+will be used.
+.TP
+.B ""
+Note that
+.B \-\-size
+has no effect if used with
 .B -d PID
 to watch all file descriptors of a process, but will work with
 .BR "-d PID:FD" .
@@ -263,6 +280,11 @@ Wait
 seconds between updates.  The default is to update every second.
 Note that this can be a decimal such as 0.1.
 .TP
+.B \-m SEC, \-\-average-rate-window SEC
+Compute current average rate over a
+.B SEC
+seconds window for average rate and ETA calculations (default 30s).
+.TP
 .B \-w WIDTH, \-\-width WIDTH
 Assume the terminal is
 .B WIDTH
@@ -312,7 +334,10 @@ Use a transfer buffer size of
 bytes.  A suffix of "K", "M", "G", or "T" can be added to denote
 kibibytes (*1024), mebibytes, and so on.  The default buffer size is the
 block size of the input file's filesystem multiplied by 32 (512KiB max), or
-400KiB if the block size cannot be determined.
+400KiB if the block size cannot be determined.  This can be useful on
+platforms like MacOS which perform better in pipelines with specific buffer
+sizes such as 1024.  Implies
+.BR \-C .
 .TP
 .B \-C, \-\-no-splice
 Never use
@@ -328,13 +353,18 @@ but means that the transfer buffer may not be used.  This prevents
 .B \-A
 and
 .B \-T
-from working, so if you want to use
-.B \-A
+from working, and makes
+.B \-B
+redundant, so using
+.BR \-A ,
+.BR \-T ,
 or
-.B \-T
-then you will need to use
-.BR \-C ,
-at the cost of a small loss in transfer efficiency.
+.B \-B
+automatically switches on
+.BR \-C .
+Switching on
+.B \-C
+results in a small loss of transfer efficiency.
 (This option has no effect on systems where
 .BR splice (2)
 is unavailable).
@@ -463,6 +493,11 @@ Bytes transferred so far (or lines if
 .B \-l
 was specified).  Equivalent to
 .BR \-b .
+If
+.B \-\-bits
+was specified, 
+.B %b
+shows the bits transferred so far, not bytes.
 .TP
 .B %T
 Percentage of the transfer buffer in use.  Equivalent to
@@ -513,6 +548,11 @@ Show only the elapsed time - useful as a simple timer, e.g.
 The default behaviour: progress bar, elapsed time, estimated completion
 time, current rate, and byte counter.

+.P
+On MacOS, it may be useful to specify
+.B -B 1024
+in a pipeline, as this may improve performance.
+

 .SH EXIT STATUS
 An exit status of 1 indicates a problem with the
@@ -544,12 +584,14 @@ A signal was caught that caused an early exit.
 .B 64
 Memory allocation failed.

+.P
 A zero exit status indicates no problems.


 .SH AUTHOR
 Written by Andrew Wood, with patches submitted by various other people. 
-Please see the package README for a complete list of contributors.
+Please see the package's ACKNOWLEDGEMENTS file for a complete list of
+contributors.


 .SH KNOWN PROBLEMS
@@ -557,6 +599,19 @@ The following problems are known to exist in
 .BR @PACKAGE@ :
 .TP
 .B *
+In some versions of
+.BR bash (1)
+and
+.BR zsh (1),
+the construct
+.B <(pv filename)
+will not output any progress to the terminal when run from an interactive
+shell, due to the subprocess being run in a separate process group from the
+one that owns the terminal.  In these cases, use
+.BR \-\-force .
+.P
+.TP
+.B *
 The
 .B -c
 option does not work properly on Cygwin without
@@ -1,20 +1,19 @@
 Before releasing a new version, go through this checklist:

-  - check for patches from http://packages.qa.debian.org/p/pv.html
+  - check for patches from https://tracker.debian.org/pkg/pv
  - bump doc/VERSION
  - bump doc/lsm.in
-  - check doc/NEWS is up to date
-  - check doc/spec.in is up to date (changelog)
+  - check doc/NEWS.md is up to date
  - check manual is up to date
-  - make indent indentclean
+  - make indent; make indent indentclean
  - make update-po
  - make test
-  - commit
+  - commit to repository
  - wipe build directory, re-run generate.sh and configure
  - make release
  - make manhtml | tidy -asxhtml | sed -e '1,/<body>/d' -e '/<\/body>/,$d'
  - update HTML for todo and news
-  - copy and sign tar.gz to HTML directory
-  - submit new release
+  - copy and sign tar.gz to HTML directory (sig as both .asc and .txt)
+  - submit new release to Sourceforge
  - upload HTML
  - check validator results for project page and manual
@@ -1,249 +0,0 @@
-Summary: Monitor the progress of data through a pipe
-Name: @PACKAGE@
-Version: @VERSION@
-Release: 1%{?dist}
-License: Artistic 2.0
-Group: Development/Tools
-Source: http://www.ivarch.com/programs/sources/@PACKAGE@-@VERSION@.tar.gz
-Url: http://www.ivarch.com/programs/pv.shtml
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gettext
-
-%description
-PV ("Pipe Viewer") is a tool for monitoring the progress of data through a
-pipeline.  It can be inserted into any normal pipeline between two processes
-to give a visual indication of how quickly data is passing through, how long
-it has taken, how near to completion it is, and an estimate of how long it
-will be until completion.
-
-%prep
-%setup -q
-
-%build
-%configure
-make %{?_smp_mflags}
-
-%install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p "$RPM_BUILD_ROOT"%{_bindir}
-mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man1
-mkdir -p "$RPM_BUILD_ROOT"/usr/share/locale
-
-make DESTDIR="$RPM_BUILD_ROOT" install
-%find_lang %{name}
-
-%check
-make test
-
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-
-%files -f %{name}.lang
-%defattr(-, root, root)
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
-
-%doc README doc/NEWS doc/TODO doc/COPYING
-
-%changelog
-* Fri Jun 30 2017 Andrew Wood <andrew.wood@ivarch.com> 1.6.6-1
- (r161) use %llu instead of %Lu for better compatibility (Eric A. Borisch)
- (r162) (#1532) fix target buffer size (-B) being ignored (AndCycle, Ilya
- Basin, Antoine Beaupré)
- (r164) cap read/write sizes, and check elapsed time during read/write
- cycles, to avoid display hangs with large buffers or slow media; also
- remove select() call from repeated_write function as it slows the
- transfer down and the wrapping alarm() means it is unnecessary
- (r169) (#1477) use alternate form for transfer counter, such that 13GB
- is shown as 13.0GB so it's the same width as 13.1GB (André Stapf)
- (r171) cleanup: units corrections in man page, of the form kb -> KiB
- (r175) report error in "-d" if process fd directory is unreadable, or if
- process disappears before we start the main loop (Jacek Wielemborek)
-
-* Sun Mar 15 2015 Andrew Wood <andrew.wood@ivarch.com> 1.6.0-1
- fix lstat64 support when unavailable - separate patches supplied by Ganael
- Laplanche and Peter Korsgaard
- (#1506) new option "-D" / "--delay-start" to only show bar after N seconds
- (Damon Harper)
- new option "--fineta" / "-I" to show ETA as time of day rather than time
- remaining - patch supplied by Erkki Seppälä (r147)
- (#1509) change ETA (--eta / -e) so that days are given if the hours
- remaining are 24 or more (Jacek Wielemborek)
- (#1499) repeat read and write attempts on partial buffer fill/empty to
- work around post-signal transfer rate drop reported by Ralf Ramsauer
- (#1507) do not try to calculate total size in line mode, due to bug
- reported by Jacek Wielemborek and Michiel Van Herwegen
- cleanup: removed defunct RATS comments and unnecessary copyright notices
- clean up displayed lines when using --watchfd PID, when PID exits
- output errors on a new line to avoid overwriting transfer bar
-
-* Tue Aug 26 2014 Andrew Wood <andrew.wood@ivarch.com> 1.5.7-1
- show KiB instead of incorrect kiB (Debian bug #706175)
- (#1284) do not gzip man page, for non-Linux OSes (Bob Friesenhahn)
- work around "awk" bug in tests/016-numeric-timer in decimal "," locales
- fix "make rpm" and "make srpm", extend "make release" to sign releases
-
-* Sun May  4 2014 Andrew Wood <andrew.wood@ivarch.com> 1.5.3-1
- remove SPLICE_F_NONBLOCK to fix problem with slow splice() (Jan Seda)
-
-* Mon Feb 10 2014 Andrew Wood <andrew.wood@ivarch.com> 1.5.2-1
- allow "--watchfd" to look at block devices
- let "--watchfd PID:FD" work with "--size N"
- moved contributors out of the manual as the list was too long
- (NB everyone is still listed in the README and always will be)
-
-* Thu Jan 23 2014 Andrew Wood <andrew.wood@ivarch.com> 1.5.1-1
- new option "--watchfd" - suggested by Jacek Wielemborek and "fdwatch"
- use non-block flag with splice()
- new display option "--buffer-percent", suggested by Kim Krecht
- new display option "--last-written", suggested by Kim Krecht
- new transfer option "--no-splice"
- fix for minor bug which dropped display elements after one empty one
- fix for single fd leak on exit (Cristian Ciupitu, Josh Stone)
-
-* Mon Aug  5 2013 Andrew Wood <andrew.wood@ivarch.com> 1.4.12-1
- new option "--null" - patch supplied by Zing Shishak
- AIX build fix (add "-lc128") - with help from Pawel Piatek
- AIX "-c" fixes - with help from Pawel Piatek
- SCO build fix (po2table.sh) - reported by Wouter Pronk
- test scripts fix for older distributions - patch from Bryan Dongray
- fix for splice() not using stdin - patch from Zev Weiss
-
-* Tue Jan 22 2013 Andrew Wood <andrew.wood@ivarch.com> 1.4.6-1
- added patch from Pawel Piatek to omit O_NOFOLLOW in AIX
-
-* Thu Jan 10 2013 Andrew Wood <andrew.wood@ivarch.com> 1.4.5-1
- updated manual page to show known problem with "-R" on Cygwin
-
-* Tue Dec 11 2012 Andrew Wood <andrew.wood@ivarch.com> 1.4.4-1
- added debugging, see `pv -h' when configure run with "--enable-debugging"
- rewrote cursor positioning code used when IPC is unavailable (Cygwin)
- fixed cursor positioning cursor read answerback problem (Cygwin/Solaris)
- fixed bug causing crash when progress displayed with too-small terminal
-
-* Thu Dec  6 2012 Andrew Wood <andrew.wood@ivarch.com> 1.4.0-1
- new option "--skip-errors" commissioned by Jim Salter
- if stdout is a block device, and we don't know the total size, use the
- size of that block device as the total (Peter Samuelson)
- new option "--stop-at-size" to stop after "--size" bytes
- report correct filename on read errors
- fix use-after-free bug in remote PID cleanup code
- refactored large chunks of code to make it more readable and to replace
- most static variables with a state structure
-
-* Mon Nov  5 2012 Andrew Wood <andrew.wood@ivarch.com> 1.3.9-1
- allow "--format" parameters to be sent with "--remote"
- configure option "--disable-ipc"
- added tests for --numeric with --timer and --bytes
- added tests for --remote
-
-* Mon Oct 29 2012 Andrew Wood <andrew.wood@ivarch.com> 1.3.8-1
- new "--pidfile" option to save process ID to a file
- integrated patch for --numeric with --timer and --bytes (Sami Liedes)
- removed signalling from --remote to prevent accidental process kills
- new "--format" option (originally Vladimir Pal / Vladimir Ermakov)
-
-* Wed Jun 27 2012 Andrew Wood <andrew.wood@ivarch.com> 1.3.4-1
- new "--disable-splice" configure script option
- fixed line mode size count with multiple files (Moritz Barsnick)
- fixes for AIX core dumps (Pawel Piatek)
-
-* Sat Jun  9 2012 Andrew Wood <andrew.wood@ivarch.com> 1.3.1-1
- do not use splice() if the write buffer is not empty (Thomas Rachel)
- added test 15 (pipe transfers), and new test script
-
-* Tue Jun  5 2012 Andrew Wood <andrew.wood@ivarch.com> 1.3.0-1
- added Tiger build patch from Olle Jonsson.
- fix 1024-boundary display garble (Debian bug #586763).
- use splice(2) where available (Debian bug #601683).
- added known bugs section of the manual page.
- fixed average rate test, 12 (Andrew Macheret).
- use IEEE1541 units (Thomas Rachel).
- bug with rate limit under 10 fixed (Henry Precheur).
- speed up PV line mode (patch: Guillaume Marcais).
- remove LD=ld from vars.mk to fix cross-compilation (paintitgray/PV#1291).
-
-* Tue Dec 14 2010 Andrew Wood <andrew.wood@ivarch.com> 1.2.0-1
- Integrated improved SI prefixes and --average-rate (Henry Gebhardt).
- Return nonzero if exiting due to SIGTERM (Martin Baum).
- Patch from Phil Rutschman to restore terminal properly on exit.
- Fix i18n especially for --help (Sebastian Kayser).
- Refactored pv_display.
- We now have a coherent, documented, exit status.
- Modified pipe test and new cksum test from Sebastian Kayser.
- Default CFLAGS to just "-O" for non-GCC (Kjetil Torgrim Homme).
- LFS compile fix for OS X 10.4 (Alexandre de Verteuil).
- Remove DESTDIR / suffix (Sam Nelson, Daniel Pape).
- Fixed potential NULL deref in transfer (Elias Pipping / LLVM/Clang).
-
-* Thu Mar  6 2008 Andrew Wood <andrew.wood@ivarch.com> 1.1.4-1
- Trap SIGINT/SIGHUP/SIGTERM so we clean up IPCs on exit (Laszlo Ersek).
- Abort if numeric option, eg -L, has non-numeric value (Boris Lohner).
- Compilation fixes for Darwin 9 and OS X.
-
-* Thu Aug 30 2007 Andrew Wood <andrew.wood@ivarch.com> 1.1.0-1
- New option "-R" to remotely control another @PACKAGE@ process.
- New option "-l" to count lines instead of bytes.
- Performance improvement for "-L" (rate) option.
- Some Mac OS X fixes, and packaging cleanups.
-
-* Sat Aug  4 2007 Andrew Wood <andrew.wood@ivarch.com> 1.0.1-1
- Changed license from Artistic to Artistic 2.0.
- Removed "--license" option.
-
-* Thu Aug  2 2007 Andrew Wood <andrew.wood@ivarch.com> 1.0.0-1
- We now act more like "cat" - just skip unreadable files, don't abort.
- Various code cleanups were done.
-
-* Mon Feb  5 2007 Andrew Wood <andrew.wood@ivarch.com> 0.9.9-1
- New option "-B" to set the buffer size, and a workaround for problems
- piping to dd(1).
-
-* Mon Feb 27 2006 Andrew Wood <andrew.wood@ivarch.com>
- Minor bugfixes, and on the final update, blank out the now-zero ETA.
-
-* Thu Sep  1 2005 Andrew Wood <andrew.wood@ivarch.com>
- Terminal locking now uses lockfiles if the terminal itself cannot be locked.
-
-* Thu Jun 16 2005 Andrew Wood <andrew.wood@ivarch.com>
- A minor problem with the spec file was fixed.
-
-* Mon Nov 15 2004 Andrew Wood <andrew.wood@ivarch.com>
- A minor bug in the NLS code was fixed.
-
-* Sat Nov  6 2004 Andrew Wood <andrew.wood@ivarch.com>
- Code cleanups and minor usability fixes.
-
-* Tue Jun 29 2004 Andrew Wood <andrew.wood@ivarch.com>
- A port of the terminal locking code to FreeBSD.
-
-* Sun May  2 2004 Andrew Wood <andrew.wood@ivarch.com>
- Major reliability improvements to the cursor positioning.
-
-* Sat Apr 24 2004 Andrew Wood <andrew.wood@ivarch.com>
- Rate and size parameters can now take suffixes such as "k", "m" etc.
-
-* Mon Apr 19 2004 Andrew Wood <andrew.wood@ivarch.com>
- A bug in the cursor positioning was fixed.
-
-* Thu Feb 12 2004 Andrew Wood <andrew.wood@ivarch.com>
- Code cleanups and portability fixes.
-
-* Sun Feb  8 2004 Andrew Wood <andrew.wood@ivarch.com>
- The display buffer is now dynamically allocated, fixing an overflow bug.
-
-* Wed Jan 14 2004 Andrew Wood <andrew.wood@ivarch.com>
- A minor bug triggered when installing the RPM was fixed.
-
-* Mon Dec 22 2003 Andrew Wood <andrew.wood@ivarch.com>
- Fixed a minor bug that occasionally reported "resource unavailable".
-
-* Wed Aug  6 2003 Andrew Wood <andrew.wood@ivarch.com>
- Block devices now have their size read correctly, so pv /dev/hda1 works
- Minor code cleanups (mainly removal of CVS "Id" tags)
-
-* Sun Aug  3 2003 Andrew Wood <andrew.wood@ivarch.com>
- Doing ^Z then "bg" then "fg" now continues displaying
-
-* Tue Jul 16 2002 Andrew Wood <andrew.wood@ivarch.com>
- First draft of spec file created.
@@ -14,34 +14,36 @@ typedef struct opts_s *opts_t;

 struct opts_s {           /* structure describing run-time options */
 	char *program_name;            /* name the program is running as */
-	unsigned char do_nothing;      /* exit-without-doing-anything flag */
-	unsigned char progress;        /* progress bar flag */
-	unsigned char timer;           /* timer flag */
-	unsigned char eta;             /* ETA flag */
-	unsigned char fineta;          /* absolute ETA flag */
-	unsigned char rate;            /* rate counter flag */
-	unsigned char average_rate;    /* average rate counter flag */
-	unsigned char bytes;           /* bytes transferred flag */
-	unsigned char bufpercent;      /* transfer buffer percentage flag */
+	bool do_nothing;               /* exit-without-doing-anything flag */
+	bool progress;                 /* progress bar flag */
+	bool timer;                    /* timer flag */
+	bool eta;                      /* ETA flag */
+	bool fineta;                   /* absolute ETA flag */
+	bool rate;                     /* rate counter flag */
+	bool average_rate;             /* average rate counter flag */
+	bool bytes;                    /* bytes transferred flag */
+	bool bits;                     /* report transfer size in bits */
+	bool bufpercent;               /* transfer buffer percentage flag */
 	unsigned int lastwritten;      /* show N bytes last written */
-	unsigned char force;           /* force-if-not-terminal flag */
-	unsigned char cursor;          /* whether to use cursor positioning */
-	unsigned char numeric;         /* numeric output only */
-	unsigned char wait;            /* wait for transfer before display */
-	unsigned char linemode;        /* count lines instead of bytes */
-	unsigned char null;            /* lines are null-terminated */
-	unsigned char no_op;           /* do nothing other than pipe data */
+	bool force;                    /* force-if-not-terminal flag */
+	bool cursor;                   /* whether to use cursor positioning */
+	bool numeric;                  /* numeric output only */
+	bool wait;                     /* wait for transfer before display */
+	bool linemode;                 /* count lines instead of bytes */
+	bool null;                     /* lines are null-terminated */
+	bool no_op;                    /* do nothing other than pipe data */
 	unsigned long long rate_limit; /* rate limit, in bytes per second */
 	unsigned long long buffer_size;/* buffer size, in bytes (0=default) */
 	unsigned int remote;           /* PID of pv to update settings of */
 	unsigned long long size;       /* total size of data */
-	unsigned char no_splice;       /* flag set if never to use splice */
-	unsigned char skip_errors;     /* skip read errors flag */
-	unsigned char stop_at_size;    /* set if we stop at "size" bytes */
+	bool no_splice;                /* flag set if never to use splice */
+	unsigned int skip_errors;      /* skip read errors counter */
+	bool stop_at_size;             /* set if we stop at "size" bytes */
 	double interval;               /* interval between updates */
 	double delay_start;            /* delay before first display */
 	unsigned int watch_pid;	       /* process to watch fds of */
 	int watch_fd;		       /* fd to watch */
+	unsigned int average_rate_window; /* time window in seconds for average rate calculations */
 	unsigned int width;            /* screen width */
 	unsigned int height;           /* screen height */
 	char *name;                    /* process name, if any */
@@ -18,6 +18,16 @@
 #include <sys/time.h>
 #include <sys/stat.h>

+/* 
+ * Since macOS 10.6, stat64 variants are equivalent to plain stat, and the
+ * suffixed versions have been removed in macOS 11.  See stat(2).
+ */
+#if defined(__APPLE__) || defined(APPLE)
+#define stat64 stat
+#define fstat64 fstat
+#define lstat64 lstat
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -34,6 +44,7 @@ extern "C" {
 #define PV_DISPLAY_FINETA	512

 #define RATE_GRANULARITY	100000	 /* usec between -L rate chunks */
+#define RATE_BURST_WINDOW	5	 /* rate burst window (multiples of rate) */
 #define REMOTE_INTERVAL		100000	 /* usec between checks for -R */
 #define BUFFER_SIZE		409600	 /* default transfer buffer size */
 #define BUFFER_SIZE_MAX		524288	 /* max auto transfer buffer size */
@@ -45,6 +56,12 @@ extern "C" {
 #define MAXIMISE_BUFFER_FILL	1


+typedef struct pvhistory {
+	long long   total_bytes;
+	long double elapsed_sec;
+} pvhistory_t;
+
+
 /*
 * Structure for holding PV internal state. Opaque outside the PV library.
 */
@@ -58,16 +75,17 @@ struct pvstate_s {
 	/*******************
 	 * Program control *
 	 *******************/
-	unsigned char force;             /* display even if not on terminal */
-	unsigned char cursor;            /* use cursor positioning */
-	unsigned char numeric;           /* numeric output only */
-	unsigned char wait;              /* wait for data before display */
-	unsigned char linemode;          /* count lines instead of bytes */
-	unsigned char null;              /* lines are null-terminated */
-	unsigned char no_op;             /* do nothing other than pipe data */
-	unsigned char skip_errors;       /* skip read errors flag */
-	unsigned char stop_at_size;      /* set if we stop at "size" bytes */
-	unsigned char no_splice;         /* never use splice() */
+	bool force;                      /* display even if not on terminal */
+	bool cursor;                     /* use cursor positioning */
+	bool numeric;                    /* numeric output only */
+	bool wait;                       /* wait for data before display */
+	bool linemode;                   /* count lines instead of bytes */
+	bool bits;			 /* report bits instead of bytes */
+	bool null;                       /* lines are null-terminated */
+	bool no_op;                      /* do nothing other than pipe data */
+	unsigned int skip_errors;        /* skip read errors counter */
+	bool stop_at_size;               /* set if we stop at "size" bytes */
+	bool no_splice;                  /* never use splice() */
 	unsigned long long rate_limit;   /* rate limit, in bytes per second */
 	unsigned long long target_buffer_size;  /* buffer size (0=default) */
 	unsigned long long size;         /* total size of data */
@@ -85,6 +103,7 @@ struct pvstate_s {
 	 * Program status *
 	 ******************/
 	const char *program_name;	 /* program name for error reporting */
+	char cwd[4096];			 /* current working directory for relative path */
 	const char *current_file;	 /* current file being read */
 	int exit_status; 		 /* exit status to give (0=OK) */

@@ -113,6 +132,15 @@ struct pvstate_s {
 	long double prev_elapsed_sec;
 	long double prev_rate;
 	long double prev_trans;
+
+	/* Keep track of progress over last intervals to compute current average rate. */
+	pvhistory_t *history;            /* state at previous intervals (circular buffer) */
+	int history_len;		 /* total size */
+	int history_interval;		 /* seconds between each history entry */
+	int history_first;
+	int history_last;
+	long double current_avg_rate;    /* current average rate over last history intervals */
+	
 	unsigned long long initial_offset;
 	char *display_buffer;
 	long display_buffer_size;
@@ -135,7 +163,7 @@ struct pvstate_s {
 		const char *string;
 		int length;
 	} format[100];
-	unsigned char display_visible;	 /* set once anything written to terminal */
+	bool display_visible;		 /* set once anything written to terminal */

 	/********************
 	 * Cursor/IPC state *
@@ -147,8 +175,8 @@ struct pvstate_s {
 	int *crs_y_top;			 /* pointer to Y coord of topmost `pv' */
 	int crs_y_lastread;		 /* last value of _y_top seen */
 	int crs_y_offset;		 /* our Y offset from this top position */
-	int crs_needreinit;		 /* set if we need to reinit cursor pos */
-	int crs_noipc;			 /* set if we can't use IPC */
+	int crs_needreinit;		 /* counter if we need to reinit cursor pos */
+	bool crs_noipc;			 /* set if we can't use IPC */
 #endif				/* HAVE_IPC */
 	int crs_lock_fd;		 /* fd of lockfile, -1 if none open */
 	char crs_lock_file[1024];
@@ -212,8 +240,11 @@ struct pvstate_s {
 struct pvwatchfd_s {
 	unsigned int watch_pid;		 /* PID to watch */
 	int watch_fd;			 /* fd to watch, -1 = not displayed */
+#ifdef __APPLE__
+#else
 	char file_fdinfo[4096];		 /* path to /proc fdinfo file */
 	char file_fd[4096];		 /* path to /proc fd symlink  */
+#endif
 	char file_fdpath[4096];		 /* path to file that was opened */
 	char display_name[512];		 /* name to show on progress bar */
 	struct stat64 sb_fd;		 /* stat of fd symlink */
@@ -34,14 +34,14 @@ typedef enum {
 extern double pv_getnum_d(const char *);

 /*
- * Return the given string converted to an integer.
+ * Return the given string converted to an unsigned integer.
 */
-extern int pv_getnum_i(const char *);
+extern unsigned int pv_getnum_ui(const char *);

 /*
- * Return the given string converted to a long long.
+ * Return the given string converted to an unsigned long long.
 */
-extern long long pv_getnum_ll(const char *);
+extern unsigned long long pv_getnum_ull(const char *);

 /*
 * Return zero if the given string is a number of the given type. NB an
@@ -61,30 +61,31 @@ extern pvstate_t pv_state_alloc(const char *);
 /*
 * Set the formatting string, given a set of old-style formatting options.
 */
-extern void pv_state_set_format(pvstate_t state, unsigned char progress,
-				unsigned char timer, unsigned char eta,
-				unsigned char fineta, unsigned char rate,
-				unsigned char average_rate, unsigned char bytes,
-				unsigned char bufpercent,
+extern void pv_state_set_format(pvstate_t state, bool progress,
+				bool timer, bool eta,
+				bool fineta, bool rate,
+				bool average_rate, bool bytes,
+				bool bufpercent,
 				unsigned int lastwritten,
 				const char *name);

 /*
 * Set the various options.
 */
-extern void pv_state_force_set(pvstate_t, unsigned char);
-extern void pv_state_cursor_set(pvstate_t, unsigned char);
-extern void pv_state_numeric_set(pvstate_t, unsigned char);
-extern void pv_state_wait_set(pvstate_t, unsigned char);
+extern void pv_state_force_set(pvstate_t, bool);
+extern void pv_state_cursor_set(pvstate_t, bool);
+extern void pv_state_numeric_set(pvstate_t, bool);
+extern void pv_state_wait_set(pvstate_t, bool);
 extern void pv_state_delay_start_set(pvstate_t, double);
-extern void pv_state_linemode_set(pvstate_t, unsigned char);
-extern void pv_state_null_set(pvstate_t, unsigned char);
-extern void pv_state_no_op_set(pvstate_t, unsigned char);
-extern void pv_state_skip_errors_set(pvstate_t, unsigned char);
-extern void pv_state_stop_at_size_set(pvstate_t, unsigned char);
+extern void pv_state_linemode_set(pvstate_t, bool);
+extern void pv_state_bits_set(pvstate_t, bool);
+extern void pv_state_null_set(pvstate_t, bool);
+extern void pv_state_no_op_set(pvstate_t, bool);
+extern void pv_state_skip_errors_set(pvstate_t, unsigned int);
+extern void pv_state_stop_at_size_set(pvstate_t, bool);
 extern void pv_state_rate_limit_set(pvstate_t, unsigned long long);
 extern void pv_state_target_buffer_size_set(pvstate_t, unsigned long long);
-extern void pv_state_no_splice_set(pvstate_t, unsigned char);
+extern void pv_state_no_splice_set(pvstate_t, bool);
 extern void pv_state_size_set(pvstate_t, unsigned long long);
 extern void pv_state_interval_set(pvstate_t, double);
 extern void pv_state_width_set(pvstate_t, unsigned int);
@@ -93,9 +94,15 @@ extern void pv_state_name_set(pvstate_t, const char *);
 extern void pv_state_format_string_set(pvstate_t, const char *);
 extern void pv_state_watch_pid_set(pvstate_t, unsigned int);
 extern void pv_state_watch_fd_set(pvstate_t, int);
+extern void pv_state_average_rate_window_set(pvstate_t, int);

 extern void pv_state_inputfiles(pvstate_t, int, const char **);

+/*
+ * Work out whether we are in the foreground.
+ */
+extern bool pv_in_foreground(void);
+
 /*
 * Work out the terminal size.
 */
@@ -23,7 +23,7 @@
 void debugging_output(const char *function, const char *file, int line,
 		      const char *format, ...)
 {
-	static int tried_open = 0;
+	static bool tried_open = false;
 	static FILE *debugfptr = NULL;
 	char *debugfile;
 	va_list ap;
@@ -31,30 +31,31 @@ void debugging_output(const char *function, const char *file, int line,
 	struct tm *tm;
 	char tbuf[128];

-	if (0 == tried_open) {
+	if (false == tried_open) {
 		debugfile = getenv("DEBUG");
 		if (NULL != debugfile)
 			debugfptr = fopen(debugfile, "a");
-		tried_open = 1;
+		tried_open = true;
 	}

 	if (NULL == debugfptr)
 		return;

-	time(&t);
+	(void) time(&t);
 	tm = localtime(&t);
-	tbuf[0] = 0;
-	strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", tm);
+	tbuf[0] = '\0';
+	if (0 == strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", tm))
+		tbuf[0] = '\0';

-	fprintf(debugfptr, "[%s] (%d) %s (%s:%d): ", tbuf, getpid(),
-		function, file, line);
+	(void) fprintf(debugfptr, "[%s] (%d) %s (%s:%d): ", tbuf, getpid(),
+		       function, file, line);

 	va_start(ap, format);
-	vfprintf(debugfptr, format, ap);
+	(void) vfprintf(debugfptr, format, ap);
 	va_end(ap);

-	fprintf(debugfptr, "\n");
-	fflush(debugfptr);
+	(void) fprintf(debugfptr, "\n");
+	(void) fflush(debugfptr);
 }

 #else				/* ! ENABLE_DEBUGGING */
@@ -62,7 +63,10 @@ void debugging_output(const char *function, const char *file, int line,
 /*
 * Stub debugging output function.
 */
-void debugging_output(const char *function, const char *file, int line,
+void debugging_output( __attribute__ ((unused))
+		      const char *function, __attribute__ ((unused))
+		      const char *file, __attribute__ ((unused))
+		      int line, __attribute__ ((unused))
 		      const char *format, ...)
 {
 }
@@ -40,8 +40,13 @@ void display_help(void)
 		 N_("show data transfer rate counter")},
 		{"-a", "--average-rate", 0,
 		 N_("show data transfer average rate counter")},
+		{"-m", "--average-rate-window", N_("SEC"),
+		 N_
+		 ("compute average rate over past SEC seconds (default 30s)")},
 		{"-b", "--bytes", 0,
 		 N_("show number of bytes transferred")},
+		{"-8", "--bits", 0,
+		 N_("show number of bits transferred")},
 		{"-T", "--buffer-percent", 0,
 		 N_("show percentage of transfer buffer in use")},
 		{"-A", "--last-written", _("NUM"),
@@ -103,7 +108,7 @@ void display_help(void)
 		 N_("show version information and exit")},
 		{0, 0, 0, 0}
 	};
-	int i, col1max = 0, tw = 77;
+	unsigned int i, col1max = 0, tw = 77;
 	char *optbuf;

 	printf(_("Usage: %s [OPTION] [FILE]..."), PROGRAM_NAME);
@@ -113,13 +118,14 @@ void display_help(void)
 		"with monitoring."));

 	for (i = 0; optlist[i].optshort; i++) {
-		int width = 0;
+		unsigned int width = 0;
 		char *param;

-		width = 2 + strlen(optlist[i].optshort);
+		width = 2 + (unsigned int) strlen(optlist[i].optshort);
 #ifdef HAVE_GETOPT_LONG
 		if (optlist[i].optlong)
-			width += 2 + strlen(optlist[i].optlong);
+			width +=
+			    2 + (unsigned int) strlen(optlist[i].optlong);
 #endif
 		param = optlist[i].param;
 		if (param)
@@ -133,10 +139,10 @@ void display_help(void)

 	col1max++;

-	optbuf = malloc(col1max + 16);
+	optbuf = malloc((size_t) (col1max + 16));
 	if (NULL == optbuf) {
 		fprintf(stderr, "%s: %s\n", PROGRAM_NAME, strerror(errno));
-		exit(1);
+		exit(EXIT_FAILURE);
 	}

 	for (i = 0; optlist[i].optshort; i++) {
@@ -145,7 +151,7 @@ void display_help(void)
 		char *start;
 		char *end;

-		if (0 == optlist[i].optshort[0]) {
+		if ('\0' == optlist[i].optshort[0]) {
 			printf("\n");
 			continue;
 		}
@@ -157,7 +163,12 @@ void display_help(void)
 		if (description)
 			description = _(description);

+#ifdef HAVE_SNPRINTF
+		(void) snprintf(optbuf, (size_t) (col1max + 15),
+				"%s%s%s%s%s", optlist[i].optshort,
+#else
 		sprintf(optbuf, "%s%s%s%s%s", optlist[i].optshort,
+#endif
 #ifdef HAVE_GETOPT_LONG
 			optlist[i].optlong ? ", " : "",
 			optlist[i].optlong ? optlist[i].optlong : "",
@@ -166,7 +177,7 @@ void display_help(void)
 #endif
 			param ? " " : "", param ? param : "");

-		printf("  %-*s ", col1max - 2, optbuf);
+		printf("  %-*s ", (int) (col1max - 2), optbuf);

 		if (NULL == description) {
 			printf("\n");
@@ -175,7 +186,7 @@ void display_help(void)

 		start = description;

-		while (strlen(start) > tw - col1max) {
+		while ((unsigned int) strlen(start) > tw - col1max) {
 			end = start + tw - col1max;
 			while ((end > start) && (end[0] != ' '))
 				end--;
@@ -185,7 +196,7 @@ void display_help(void)
 				end++;
 			}
 			printf("%.*s\n%*s ", (int) (end - start), start,
-			       col1max, "");
+			       (int) col1max, "");
 			if (end == start)
 				end++;
 			start = end;
@@ -35,12 +35,13 @@ int main(int argc, char **argv)
 	struct termios t, t_save;
 	opts_t opts;
 	pvstate_t state;
+	bool t_saved, t_needs_reset;
 	int retcode = 0;

 #ifdef ENABLE_NLS
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
+	(void) setlocale(LC_ALL, "");
+	(void) bindtextdomain(PACKAGE, LOCALEDIR);
+	(void) textdomain(PACKAGE);
 #endif

 	opts = opts_parse(argc, argv);
@@ -90,7 +91,10 @@ int main(int argc, char **argv)
 			return 1;
 		}
 		fprintf(pidfptr, "%d\n", getpid());
-		fclose(pidfptr);
+		if (0 != fclose(pidfptr)) {
+			fprintf(stderr, "%s: %s: %s\n", opts->program_name,
+				opts->pidfile, strerror(errno));
+		}
 	}

 	/*
@@ -112,7 +116,7 @@ int main(int argc, char **argv)
 		 * If no size was given, and we're not in line mode, try to
 		 * calculate the total size.
 		 */
-		if ((0 == opts->size) && (0 == opts->linemode)) {
+		if ((0 == opts->size) && (false == opts->linemode)) {
 			opts->size = pv_calc_total_size(state);
 			debug("%s: %llu", "no size given - calculated",
 			      opts->size);
@@ -122,7 +126,7 @@ int main(int argc, char **argv)
 		 * If the size is unknown, we cannot have an ETA.
 		 */
 		if (opts->size < 1) {
-			opts->eta = 0;
+			opts->eta = false;
 			debug("%s", "size unknown - ETA disabled");
 		}
 	}
@@ -132,9 +136,9 @@ int main(int argc, char **argv)
 	 * outputting numerically, we will have nothing to display at all.
 	 */
 	if ((0 == isatty(STDERR_FILENO))
-	    && (0 == opts->force)
-	    && (0 == opts->numeric)) {
-		opts->no_op = 1;
+	    && (false == opts->force)
+	    && (false == opts->numeric)) {
+		opts->no_op = true;
 		debug("%s", "nothing to display - setting no_op");
 	}

@@ -191,6 +195,7 @@ int main(int argc, char **argv)
 	pv_state_wait_set(state, opts->wait);
 	pv_state_delay_start_set(state, opts->delay_start);
 	pv_state_linemode_set(state, opts->linemode);
+	pv_state_bits_set(state, opts->bits);
 	pv_state_null_set(state, opts->null);
 	pv_state_skip_errors_set(state, opts->skip_errors);
 	pv_state_stop_at_size_set(state, opts->stop_at_size);
@@ -202,6 +207,7 @@ int main(int argc, char **argv)
 	pv_state_format_string_set(state, opts->format);
 	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, opts->eta,
 			    opts->fineta, opts->rate, opts->average_rate,
@@ -219,6 +225,13 @@ int main(int argc, char **argv)
 	      O_NONBLOCK | fcntl(STDOUT_FILENO, F_GETFL));
 #endif				/* MAKE_STDOUT_NONBLOCKING */

+	/*
+	 * Keep track of whether we've saved the terminal attributes and
+	 * whether we need to reset them at the end.
+	 */
+	t_saved = false;
+	t_needs_reset = false;
+
 	/*
 	 * Set terminal option TOSTOP so we get signal SIGTTOU if we try to
 	 * write to the terminal while backgrounded.
@@ -226,25 +239,56 @@ int main(int argc, char **argv)
 	 * Also, save the current terminal attributes for later restoration.
 	 */
 	memset(&t, 0, sizeof(t));
-	tcgetattr(STDERR_FILENO, &t);
+	if (0 != isatty(STDERR_FILENO)) {
+		if (0 == tcgetattr(STDERR_FILENO, &t)) {
+			debug("%s", "saved terminal attributes");
+			t_saved = true;
+		} else {
+			fprintf(stderr, "%s: %s: %s\n", opts->program_name,
+				_("failed to read terminal attributes"),
+				strerror(errno));
+		}
+	}
 	t_save = t;
-	t.c_lflag |= TOSTOP;
-	tcsetattr(STDERR_FILENO, TCSANOW, &t);
+	if (t_saved && pv_in_foreground()) {
+		t.c_lflag |= TOSTOP;
+		(void) tcsetattr(STDERR_FILENO, TCSANOW, &t);
+		t_needs_reset = true;
+		debug("%s", "set terminal TOSTOP attribute");
+	}

 	if (0 != opts->watch_pid) {
 		if (0 <= opts->watch_fd) {
 			pv_sig_init(state);
 			retcode = pv_watchfd_loop(state);
-			tcsetattr(STDERR_FILENO, TCSANOW, &t_save);
-			if (opts->pidfile != NULL)
-				remove(opts->pidfile);
+			if (t_needs_reset && pv_in_foreground()) {
+				(void) tcsetattr(STDERR_FILENO, TCSANOW,
+						 &t_save);
+			}
+			if (opts->pidfile != NULL) {
+				if (0 != remove(opts->pidfile)) {
+					fprintf(stderr, "%s: %s: %s\n",
+						opts->program_name,
+						opts->pidfile,
+						strerror(errno));
+				}
+			}
 			pv_sig_fini(state);
 		} else {
 			pv_sig_init(state);
 			retcode = pv_watchpid_loop(state);
-			tcsetattr(STDERR_FILENO, TCSANOW, &t_save);
-			if (opts->pidfile != NULL)
-				remove(opts->pidfile);
+			if (t_needs_reset && pv_in_foreground()) {
+				(void) tcsetattr(STDERR_FILENO, TCSANOW,
+						 &t_save);
+			}
+			if (opts->pidfile != NULL) {
+				if (0 != remove(opts->pidfile)) {
+					fprintf(stderr, "%s: %s: %s\n",
+						opts->program_name,
+						opts->pidfile,
+						strerror(errno));
+				}
+			}
 			pv_sig_fini(state);
 		}
 	} else {
@@ -252,9 +296,16 @@ int main(int argc, char **argv)
 		pv_remote_init();
 		retcode = pv_main_loop(state);
 		pv_remote_fini();
-		tcsetattr(STDERR_FILENO, TCSANOW, &t_save);
-		if (opts->pidfile != NULL)
-			remove(opts->pidfile);
+		if (t_needs_reset && pv_in_foreground()) {
+			(void) tcsetattr(STDERR_FILENO, TCSANOW, &t_save);
+		}
+		if (opts->pidfile != NULL) {
+			if (0 != remove(opts->pidfile)) {
+				fprintf(stderr, "%s: %s: %s\n",
+					opts->program_name, opts->pidfile,
+					strerror(errno));
+			}
+		}
 		pv_sig_fini(state);
 	}

@@ -8,11 +8,13 @@
 #include "options.h"
 #include "library/getopt.h"
 #include "pv.h"
+#include "pv-internal.h"

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <unistd.h>


@@ -27,7 +29,7 @@ void opts_free(opts_t opts)
 {
 	if (!opts)
 		return;
-	if (opts->argv)
+	if (NULL != opts->argv)
 		free(opts->argv);
 	free(opts);
 }
@@ -47,45 +49,47 @@ opts_t opts_parse(int argc, char **argv)
 {
 #ifdef HAVE_GETOPT_LONG
 	struct option long_options[] = {
-		{"help", 0, 0, 'h'},
-		{"version", 0, 0, 'V'},
-		{"progress", 0, 0, 'p'},
-		{"timer", 0, 0, 't'},
-		{"eta", 0, 0, 'e'},
-		{"fineta", 0, 0, 'I'},
-		{"rate", 0, 0, 'r'},
-		{"average-rate", 0, 0, 'a'},
-		{"bytes", 0, 0, 'b'},
-		{"buffer-percent", 0, 0, 'T'},
-		{"last-written", 1, 0, 'A'},
-		{"force", 0, 0, 'f'},
-		{"numeric", 0, 0, 'n'},
-		{"quiet", 0, 0, 'q'},
-		{"cursor", 0, 0, 'c'},
-		{"wait", 0, 0, 'W'},
-		{"delay-start", 1, 0, 'D'},
-		{"size", 1, 0, 's'},
-		{"line-mode", 0, 0, 'l'},
-		{"null", 0, 0, '0'},
-		{"interval", 1, 0, 'i'},
-		{"width", 1, 0, 'w'},
-		{"height", 1, 0, 'H'},
-		{"name", 1, 0, 'N'},
-		{"format", 1, 0, 'F'},
-		{"rate-limit", 1, 0, 'L'},
-		{"buffer-size", 1, 0, 'B'},
-		{"no-splice", 0, 0, 'C'},
-		{"skip-errors", 0, 0, 'E'},
-		{"stop-at-size", 0, 0, 'S'},
-		{"remote", 1, 0, 'R'},
-		{"pidfile", 1, 0, 'P'},
-		{"watchfd", 1, 0, 'd'},
-		{0, 0, 0, 0}
+		{"help", 0, NULL, (int) 'h'},
+		{"version", 0, NULL, (int) 'V'},
+		{"progress", 0, NULL, (int) 'p'},
+		{"timer", 0, NULL, (int) 't'},
+		{"eta", 0, NULL, (int) 'e'},
+		{"fineta", 0, NULL, (int) 'I'},
+		{"rate", 0, NULL, (int) 'r'},
+		{"average-rate", 0, NULL, (int) 'a'},
+		{"bytes", 0, NULL, (int) 'b'},
+		{"bits", 0, NULL, (int) '8'},
+		{"buffer-percent", 0, NULL, (int) 'T'},
+		{"last-written", 1, NULL, (int) 'A'},
+		{"force", 0, NULL, (int) 'f'},
+		{"numeric", 0, NULL, (int) 'n'},
+		{"quiet", 0, NULL, (int) 'q'},
+		{"cursor", 0, NULL, (int) 'c'},
+		{"wait", 0, NULL, (int) 'W'},
+		{"delay-start", 1, NULL, (int) 'D'},
+		{"size", 1, NULL, (int) 's'},
+		{"line-mode", 0, NULL, (int) 'l'},
+		{"null", 0, NULL, (int) '0'},
+		{"interval", 1, NULL, (int) 'i'},
+		{"width", 1, NULL, (int) 'w'},
+		{"height", 1, NULL, (int) 'H'},
+		{"name", 1, NULL, (int) 'N'},
+		{"format", 1, NULL, (int) 'F'},
+		{"rate-limit", 1, NULL, (int) 'L'},
+		{"buffer-size", 1, NULL, (int) 'B'},
+		{"no-splice", 0, NULL, (int) 'C'},
+		{"skip-errors", 0, NULL, (int) 'E'},
+		{"stop-at-size", 0, NULL, (int) 'S'},
+		{"remote", 1, NULL, (int) 'R'},
+		{"pidfile", 1, NULL, (int) 'P'},
+		{"watchfd", 1, NULL, (int) 'd'},
+		{"average-rate-window", 1, NULL, (int) 'm'},
+		{NULL, 0, NULL, 0}
 	};
 	int option_index = 0;
 #endif
 	char *short_options =
-	    "hVpteIrabTA:fnqcWD:s:l0i:w:H:N:F:L:B:CESR:P:d:";
+	    "hVpteIrab8TA:fnqcWD:s:l0i:w:H:N:F:L:B:CESR:P:d:m:";
 	int c, numopts;
 	unsigned int check_pid;
 	int check_fd;
@@ -94,28 +98,25 @@ opts_t opts_parse(int argc, char **argv)

 	opts = calloc(1, sizeof(*opts));
 	if (!opts) {
-		fprintf(stderr,
-			_("%s: option structure allocation failed (%s)"),
-			argv[0], strerror(errno));
-		fprintf(stderr, "\n");
-		return 0;
+		fprintf(stderr, "%s: %s: %s\n", argv[0],
+			_("option structure allocation failed"),
+			strerror(errno));
+		return NULL;
 	}

 	opts->program_name = argv[0];
 	ptr = strrchr(opts->program_name, '/');
 	if (NULL != ptr)
-		opts->program_name = &(ptr[1]);
+		opts->program_name = 1 + ptr;

 	opts->argc = 0;
-	opts->argv = calloc(argc + 1, sizeof(char *));
-	if (!opts->argv) {
-		fprintf(stderr,
-			_
-			("%s: option structure argv allocation failed (%s)"),
-			opts->program_name, strerror(errno));
-		fprintf(stderr, "\n");
+	opts->argv = calloc((size_t) (argc + 1), sizeof(char *));
+	if (NULL == opts->argv) {
+		fprintf(stderr, "%s: %s: %s\n", opts->program_name,
+			_("option structure argv allocation failed"),
+			strerror(errno));
 		opts_free(opts);
-		return 0;
+		return NULL;
 	}

 	numopts = 0;
@@ -124,6 +125,7 @@ opts_t opts_parse(int argc, char **argv)
 	opts->delay_start = 0;
 	opts->watch_pid = 0;
 	opts->watch_fd = -1;
+	opts->average_rate_window = 30;

 	do {
 #ifdef HAVE_GETOPT_LONG
@@ -141,19 +143,23 @@ opts_t opts_parse(int argc, char **argv)
 		 */
 		switch (c) {
 		case 's':
+			/* "-s @" is valid, so allow it. */
+			if ('@' == *optarg)
+				break;
 		case 'A':
 		case 'w':
 		case 'H':
 		case 'L':
 		case 'B':
 		case 'R':
+		case 'm':
 			if (pv_getnum_check(optarg, PV_NUMTYPE_INTEGER) !=
 			    0) {
 				fprintf(stderr, "%s: -%c: %s\n",
 					opts->program_name, c,
 					_("integer argument expected"));
 				opts_free(opts);
-				return 0;
+				return NULL;
 			}
 			break;
 		case 'i':
@@ -164,7 +170,7 @@ opts_t opts_parse(int argc, char **argv)
 					opts->program_name, c,
 					_("numeric argument expected"));
 				opts_free(opts);
-				return 0;
+				return NULL;
 			}
 			break;
 		case 'd':
@@ -175,14 +181,14 @@ opts_t opts_parse(int argc, char **argv)
 					_
 					("process ID or pid:fd pair expected"));
 				opts_free(opts);
-				return 0;
+				return NULL;
 			}
 			if (check_pid < 1) {
 				fprintf(stderr, "%s: -%c: %s\n",
 					opts->program_name, c,
 					_("invalid process ID"));
 				opts_free(opts);
-				return 0;
+				return NULL;
 			}
 			break;
 		default:
@@ -195,109 +201,137 @@ opts_t opts_parse(int argc, char **argv)
 		switch (c) {
 		case 'h':
 			display_help();
-			opts->do_nothing = 1;
-			return opts;
-			break;
+			opts->do_nothing = true;
+			return opts;	    /* early return */
 		case 'V':
 			display_version();
-			opts->do_nothing = 1;
-			return opts;
-			break;
+			opts->do_nothing = true;
+			return opts;	    /* early return */
 		case 'p':
-			opts->progress = 1;
+			opts->progress = true;
 			numopts++;
 			break;
 		case 't':
-			opts->timer = 1;
+			opts->timer = true;
 			numopts++;
 			break;
 		case 'I':
-			opts->fineta = 1;
+			opts->fineta = true;
 			numopts++;
 			break;
 		case 'e':
-			opts->eta = 1;
+			opts->eta = true;
 			numopts++;
 			break;
 		case 'r':
-			opts->rate = 1;
+			opts->rate = true;
 			numopts++;
 			break;
 		case 'a':
-			opts->average_rate = 1;
+			opts->average_rate = true;
 			numopts++;
 			break;
 		case 'b':
-			opts->bytes = 1;
+			opts->bytes = true;
+			numopts++;
+			break;
+		case '8':
+			opts->bytes = true;
+			opts->bits = true;
 			numopts++;
 			break;
 		case 'T':
-			opts->bufpercent = 1;
+			opts->bufpercent = true;
 			numopts++;
+			opts->no_splice = true;
 			break;
 		case 'A':
-			opts->lastwritten = pv_getnum_i(optarg);
+			opts->lastwritten = pv_getnum_ui(optarg);
 			numopts++;
+			opts->no_splice = true;
 			break;
 		case 'f':
-			opts->force = 1;
+			opts->force = true;
 			break;
 		case 'n':
-			opts->numeric = 1;
+			opts->numeric = true;
 			numopts++;
 			break;
 		case 'q':
-			opts->no_op = 1;
+			opts->no_op = true;
 			numopts++;
 			break;
 		case 'c':
-			opts->cursor = 1;
+			opts->cursor = true;
 			break;
 		case 'W':
-			opts->wait = 1;
+			opts->wait = true;
 			break;
 		case 'D':
 			opts->delay_start = pv_getnum_d(optarg);
 			break;
 		case 's':
-			opts->size = pv_getnum_ll(optarg);
+			/* Permit "@<filename>" as well as just a number. */
+			if ('@' == *optarg) {
+				const char *size_file = 1 + optarg;
+				struct stat64 sb;
+				int rc;
+
+				rc = 0;
+				memset(&sb, 0, sizeof(sb));
+				rc = stat64(size_file, &sb);
+				if (0 == rc) {
+					opts->size = sb.st_size;
+				} else {
+					fprintf(stderr, "%s: %s %s: %s\n",
+						opts->program_name,
+						_("failed to stat file"),
+						size_file,
+						strerror(errno));
+					opts_free(opts);
+					return NULL;
+				}
+			} else {
+				opts->size = pv_getnum_ull(optarg);
+			}
 			break;
 		case 'l':
-			opts->linemode = 1;
+			opts->linemode = true;
 			break;
 		case '0':
-			opts->null = 1;
-			opts->linemode = 1;
+			opts->null = true;
+			opts->linemode = true;
 			break;
 		case 'i':
 			opts->interval = pv_getnum_d(optarg);
 			break;
 		case 'w':
-			opts->width = pv_getnum_i(optarg);
+			opts->width = pv_getnum_ui(optarg);
 			break;
 		case 'H':
-			opts->height = pv_getnum_i(optarg);
+			opts->height = pv_getnum_ui(optarg);
 			break;
 		case 'N':
 			opts->name = optarg;
 			break;
 		case 'L':
-			opts->rate_limit = pv_getnum_ll(optarg);
+			opts->rate_limit = pv_getnum_ull(optarg);
 			break;
 		case 'B':
-			opts->buffer_size = pv_getnum_ll(optarg);
+			opts->buffer_size = pv_getnum_ull(optarg);
+			opts->no_splice = true;
 			break;
 		case 'C':
-			opts->no_splice = 1;
+			opts->no_splice = true;
 			break;
 		case 'E':
 			opts->skip_errors++;
 			break;
 		case 'S':
-			opts->stop_at_size = 1;
+			opts->stop_at_size = true;
 			break;
 		case 'R':
-			opts->remote = pv_getnum_i(optarg);
+			opts->remote = pv_getnum_ui(optarg);
 			break;
 		case 'P':
 			opts->pidfile = optarg;
@@ -308,8 +342,12 @@ opts_t opts_parse(int argc, char **argv)
 		case 'd':
 			opts->watch_pid = 0;
 			opts->watch_fd = -1;
-			sscanf(optarg, "%u:%d", &(opts->watch_pid),
-			       &(opts->watch_fd));
+			/* No syntax check here, already done earlier */
+			(void) sscanf(optarg, "%u:%d", &(opts->watch_pid),
+				      &(opts->watch_fd));
+			break;
+		case 'm':
+			opts->average_rate_window = pv_getnum_ui(optarg);
 			break;
 		default:
 #ifdef HAVE_GETOPT_LONG
@@ -323,8 +361,7 @@ opts_t opts_parse(int argc, char **argv)
 #endif
 			fprintf(stderr, "\n");
 			opts_free(opts);
-			return 0;
-			break;
+			return NULL;	    /* early return */
 		}

 	} while (c != -1);
@@ -333,65 +370,56 @@ opts_t opts_parse(int argc, char **argv)
 		if (opts->linemode || opts->null || opts->stop_at_size
 		    || (opts->skip_errors > 0) || (opts->buffer_size > 0)
 		    || (opts->rate_limit > 0)) {
-			fprintf(stderr,
+			fprintf(stderr, "%s: %s\n", opts->program_name,
 				_
-				("%s: cannot use line mode or transfer modifier options when watching file descriptors"),
-				opts->program_name);
-			fprintf(stderr, "\n");
+				("cannot use line mode or transfer modifier options when watching file descriptors"));
 			opts_free(opts);
-			return 0;
+			return NULL;
 		}

 		if (opts->cursor) {
-			fprintf(stderr,
+			fprintf(stderr, "%s: %s\n", opts->program_name,
 				_
-				("%s: cannot use cursor positioning when watching file descriptors"),
-				opts->program_name);
-			fprintf(stderr, "\n");
+				("cannot use cursor positioning when watching file descriptors"));
 			opts_free(opts);
-			return 0;
+			return NULL;
 		}

 		if (0 != opts->remote) {
-			fprintf(stderr,
+			fprintf(stderr, "%s: %s\n", opts->program_name,
 				_
-				("%s: cannot use remote control when watching file descriptors"),
-				opts->program_name);
-			fprintf(stderr, "\n");
+				("cannot use remote control when watching file descriptors"));
 			opts_free(opts);
-			return 0;
+			return NULL;
 		}

 		if (optind < argc) {
-			fprintf(stderr,
+			fprintf(stderr, "%s: %s\n", opts->program_name,
 				_
-				("%s: cannot transfer files when watching file descriptors"),
-				opts->program_name);
-			fprintf(stderr, "\n");
+				("cannot transfer files when watching file descriptors"));
 			opts_free(opts);
-			return 0;
+			return NULL;
 		}
-
+#ifndef __APPLE__
 		if (0 != access("/proc/self/fdinfo", X_OK)) {
-			fprintf(stderr,
+			fprintf(stderr, "%s: -d: %s\n", opts->program_name,
 				_
-				("%s: -d: not available on systems without /proc/self/fdinfo"),
-				opts->program_name);
-			fprintf(stderr, "\n");
+				("not available on systems without /proc/self/fdinfo"));
 			opts_free(opts);
-			return 0;
+			return NULL;
 		}
+#endif
 	}

 	/*
 	 * Default options: -pterb
 	 */
 	if (0 == numopts) {
-		opts->progress = 1;
-		opts->timer = 1;
-		opts->eta = 1;
-		opts->rate = 1;
-		opts->bytes = 1;
+		opts->progress = true;
+		opts->timer = true;
+		opts->eta = true;
+		opts->rate = true;
+		opts->bytes = true;
 	}

 	/*
@@ -25,14 +25,14 @@
 #ifdef HAVE_IPC
 struct remote_msg {
 	long mtype;
-	unsigned char progress;		 /* progress bar flag */
-	unsigned char timer;		 /* timer flag */
-	unsigned char eta;		 /* ETA flag */
-	unsigned char fineta;		 /* absolute ETA flag */
-	unsigned char rate;		 /* rate counter flag */
-	unsigned char average_rate;	 /* average rate counter flag */
-	unsigned char bytes;		 /* bytes transferred flag */
-	unsigned char bufpercent;	 /* transfer buffer percentage flag */
+	bool progress;			 /* progress bar flag */
+	bool timer;			 /* timer flag */
+	bool eta;			 /* ETA flag */
+	bool fineta;			 /* absolute ETA flag */
+	bool rate;			 /* rate counter flag */
+	bool average_rate;		 /* average rate counter flag */
+	bool bytes;			 /* bytes transferred flag */
+	bool bufpercent;		 /* transfer buffer percentage flag */
 	unsigned int lastwritten;	 /* last-written bytes count */
 	unsigned long long rate_limit;	 /* rate limit, in bytes per second */
 	unsigned long long buffer_size;	 /* buffer size, in bytes (0=default) */
@@ -59,14 +59,12 @@ static int remote__msgid = -1;
 */
 static key_t remote__genkey(void)
 {
-	int uid;
+	uid_t uid;
 	key_t key;

 	uid = geteuid();
-	if (uid < 0)
-		uid = 0;

-	key = ftok("/tmp", 'P') | uid;
+	key = ftok("/tmp", (int) 'P') | uid;

 	return key;
 }
@@ -79,7 +77,7 @@ static key_t remote__genkey(void)
 static int remote__msgget(void)
 {
 	/* Catch SIGSYS in case msgget() raises it, so we get ENOSYS */
-	signal(SIGSYS, SIG_IGN);
+	(void) signal(SIGSYS, SIG_IGN);
 	return msgget(remote__genkey(), IPC_CREAT | 0600);
 }

@@ -97,13 +95,13 @@ int pv_remote_set(opts_t opts)
 	struct msqid_ds qbuf;
 	long timeout;
 	int msgid;
-	long initial_qnum;
+	unsigned long initial_qnum;

 	/*
 	 * Check that the remote process exists.
 	 */
-	if (kill(opts->remote, 0) != 0) {
-		fprintf(stderr, "%s: %d: %s\n", opts->program_name,
+	if (kill((pid_t) (opts->remote), 0) != 0) {
+		fprintf(stderr, "%s: %u: %s\n", opts->program_name,
 			opts->remote, strerror(errno));
 		return 1;
 	}
@@ -111,15 +109,15 @@ int pv_remote_set(opts_t opts)
 	/*
 	 * Make sure parameters are within sensible bounds.
 	 */
-	if (opts->width < 0)
+	if (opts->width < 1)
 		opts->width = 80;
-	if (opts->height < 0)
+	if (opts->height < 1)
 		opts->height = 25;
 	if (opts->width > 999999)
 		opts->width = 999999;
 	if (opts->height > 999999)
 		opts->height = 999999;
-	if ((opts->interval != 0) && (opts->interval < 0.1))
+	if ((opts->interval > 0) && (opts->interval < 0.1))
 		opts->interval = 0.1;
 	if (opts->interval > 600)
 		opts->interval = 600;
@@ -128,7 +126,7 @@ int pv_remote_set(opts_t opts)
 	 * Copy parameters into message buffer.
 	 */
 	memset(&msgbuf, 0, sizeof(msgbuf));
-	msgbuf.mtype = opts->remote;
+	msgbuf.mtype = (long) (opts->remote);
 	msgbuf.progress = opts->progress;
 	msgbuf.timer = opts->timer;
 	msgbuf.eta = opts->eta;
@@ -159,6 +157,7 @@ int pv_remote_set(opts_t opts)
 		return 1;
 	}

+	memset(&qbuf, 0, sizeof(qbuf));
 	if (msgctl(msgid, IPC_STAT, &qbuf) < 0) {
 		fprintf(stderr, "%s: %s\n", opts->program_name,
 			strerror(errno));
@@ -178,14 +177,16 @@ int pv_remote_set(opts_t opts)
 	while (timeout > 10000) {
 		struct timeval tv;

+		memset(&tv, 0, sizeof(tv));
 		tv.tv_sec = 0;
 		tv.tv_usec = 10000;
-		select(0, NULL, NULL, NULL, &tv);
+		(void) select(0, NULL, NULL, NULL, &tv);
 		timeout -= 10000;

 		/*
 		 * If we can't stat the queue, it must have been deleted.
 		 */
+		memset(&qbuf, 0, sizeof(qbuf));
 		if (msgctl(msgid, IPC_STAT, &qbuf) < 0)
 			break;

@@ -201,20 +202,22 @@ int pv_remote_set(opts_t opts)
 	/*
 	 * Message not received - delete it.
 	 */
+	memset(&qbuf, 0, sizeof(qbuf));
 	if (msgctl(msgid, IPC_STAT, &qbuf) >= 0) {
-		msgrcv(msgid, &msgbuf, sizeof(msgbuf) - sizeof(long),
-		       opts->remote, IPC_NOWAIT);
+		(void) msgrcv(msgid, &msgbuf,
+			      sizeof(msgbuf) - sizeof(long),
+			      (long) (opts->remote), IPC_NOWAIT);
 		/*
 		 * If this leaves nothing on the queue, remove the
 		 * queue, in case we created one for no reason.
 		 */
 		if (msgctl(msgid, IPC_STAT, &qbuf) >= 0) {
 			if (qbuf.msg_qnum < 1)
-				msgctl(msgid, IPC_RMID, &qbuf);
+				(void) msgctl(msgid, IPC_RMID, &qbuf);
 		}
 	}

-	fprintf(stderr, "%s: %d: %s\n", opts->program_name, opts->remote,
+	fprintf(stderr, "%s: %u: %s\n", opts->program_name, opts->remote,
 		_("message not received"));
 	return 1;
 }
@@ -230,7 +233,7 @@ int pv_remote_set(opts_t opts)
 void pv_remote_check(pvstate_t state)
 {
 	struct remote_msg msgbuf;
-	int got;
+	ssize_t got;

 	if (remote__msgid < 0)
 		return;
@@ -261,7 +264,7 @@ void pv_remote_check(pvstate_t state)
 			    msgbuf.average_rate,
 			    msgbuf.bytes, msgbuf.bufpercent,
 			    msgbuf.lastwritten,
-			    0 ==
+			    '\0' ==
 			    msgbuf.name[0] ? NULL : strdup(msgbuf.name));

 	if (msgbuf.rate_limit > 0)
@@ -277,7 +280,7 @@ void pv_remote_check(pvstate_t state)
 		pv_state_width_set(state, msgbuf.width);
 	if (msgbuf.height > 0)
 		pv_state_height_set(state, msgbuf.height);
-	if (msgbuf.format[0] != 0)
+	if (msgbuf.format[0] != '\0')
 		pv_state_format_string_set(state, strdup(msgbuf.format));
 }

@@ -298,7 +301,8 @@ void pv_remote_fini(void)
 {
 	if (remote__msgid >= 0) {
 		struct msqid_ds qbuf;
-		msgctl(remote__msgid, IPC_RMID, &qbuf);
+		memset(&qbuf, 0, sizeof(qbuf));
+		(void) msgctl(remote__msgid, IPC_RMID, &qbuf);
 	}
 }

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 22:21+0100\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"POT-Creation-Date: 2023-07-17 21:52+0100\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Date: 1999-06-01 15:18:29+0100\n"
 "From: Andrew Wood <ivarch@ubik>\n"
 "Xgettext-Options: --default-domain=pkgbuild --directory=./.pkgdir --add-"
@@ -19,125 +19,137 @@ msgstr ""
 "nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
 "compat.c\n"

-#: src/pv/watchpid.c:51 src/pv/watchpid.c:66 src/pv/watchpid.c:76
-#: src/pv/watchpid.c:107 src/pv/loop.c:519 src/pv/loop.c:580 src/pv/loop.c:632
-msgid "pid"
-msgstr ""
-
-#: src/pv/watchpid.c:68 src/pv/watchpid.c:78 src/pv/watchpid.c:109
-msgid "fd"
-msgstr ""
-
-#: src/pv/watchpid.c:112
-msgid "not a regular file or block device"
-msgstr ""
-
-#: src/pv/cursor.c:53
-#, fuzzy
+#: src/pv/cursor.c:80
 msgid "failed to get terminal name"
-msgstr "Terminal konnte nicht geöffnet werden"
+msgstr "Terminalname konnte nicht gelesen werden"

-#: src/pv/cursor.c:96
-#, fuzzy
+#: src/pv/cursor.c:125
 msgid "failed to open lock file"
-msgstr "Datei konnte nicht geschlossen werden"
+msgstr "Sperrdatei konnte nicht geöffnet werden"

-#: src/pv/cursor.c:129
+#: src/pv/cursor.c:159
 msgid "lock attempt failed"
-msgstr ""
+msgstr "Sperrversuch fehlgeschlagen"

-#: src/pv/cursor.c:369
+#: src/pv/cursor.c:409
 msgid "failed to open terminal"
-msgstr "Terminal konnte nicht geöffnet werden"
+msgstr "Terminal konnte nicht geöffnet werden"

-#: src/pv/file.c:118
-#, fuzzy
+#: src/pv/file.c:119
 msgid "failed to seek to start of output"
-msgstr "Dateiinformationen für Ausgabe-Datei konnten nicht gelesen werden"
+msgstr "Konnte nicht versuchen, die Ausgabe zu starten"

-#: src/pv/file.c:214
+#: src/pv/file.c:215
 msgid "failed to close file"
 msgstr "Datei konnte nicht geschlossen werden"

-#: src/pv/file.c:237
+#: src/pv/file.c:238
 msgid "failed to read file"
 msgstr "Datei konnte nicht gelesen werden"

-#: src/pv/file.c:247
+#: src/pv/file.c:248 src/main/options.c:288
 msgid "failed to stat file"
 msgstr "Dateiinformationen konnten nicht gelesen werden"

-#: src/pv/file.c:256
+#: src/pv/file.c:257
 msgid "failed to stat output file"
-msgstr "Dateiinformationen für Ausgabe-Datei konnten nicht gelesen werden"
+msgstr "Dateiinformationen für Ausgabe-Datei konnten nicht gelesen werden"

-#: src/pv/file.c:279
+#: src/pv/file.c:280
 msgid "input file is output file"
 msgstr "Eingabe-Datei ist Ausgabe-Datei"

-#: src/pv/display.c:117
-msgid "yzafpnum kMGTPEZY"
+#: src/pv/loop.c:527 src/pv/loop.c:597 src/pv/loop.c:649 src/pv/watchpid.c:68
+#: src/pv/watchpid.c:79 src/pv/watchpid.c:93 src/pv/watchpid.c:104
+#: src/pv/watchpid.c:145 src/pv/watchpid.c:168 src/pv/watchpid.c:178
+#: src/pv/watchpid.c:192 src/pv/watchpid.c:285 src/pv/watchpid.c:294
+#: src/pv/watchpid.c:332 src/pv/watchpid.c:349
+msgid "pid"
 msgstr ""

-#: src/pv/display.c:122
-msgid "yzafpnum KMGTPEZY"
-msgstr ""
-
-#: src/pv/display.c:532 src/pv/transfer.c:679
-msgid "buffer allocation failed"
-msgstr "Puffer konnte nicht allokiert werden"
-
-#: src/pv/display.c:592 src/pv/transfer.c:458
-msgid "B"
-msgstr "B"
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "/s"
-msgstr ""
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "B/s"
-msgstr ""
-
-#: src/pv/display.c:671 src/pv/display.c:676 src/pv/display.c:738
-msgid "ETA"
-msgstr "ETA"
-
 #: src/pv/transfer.c:341
 msgid "read failed"
 msgstr "read-Aufruf fehlgeschlagen"

 #: src/pv/transfer.c:359
 msgid "warning: read errors detected"
-msgstr ""
+msgstr "warnung: lesefehler erkannt"

 #: src/pv/transfer.c:374
 msgid "file is not seekable"
-msgstr ""
+msgstr "datei ist nicht durchsuchbar"

 #: src/pv/transfer.c:437
-#, fuzzy
 msgid "failed to seek past error"
-msgstr "Dateiinformationen konnten nicht gelesen werden"
+msgstr "konnte den Fehler nicht überwinden"

 #: src/pv/transfer.c:456
 msgid "skipped past read error"
-msgstr ""
+msgstr "über den Lesefehler hinaus verschoben"
+
+#: src/pv/transfer.c:458 src/pv/display.c:687
+msgid "B"
+msgstr "B"

 #: src/pv/transfer.c:631
 msgid "write failed"
 msgstr "write-Aufruf fehlgeschlagen"

+#: src/pv/transfer.c:679 src/pv/display.c:618
+msgid "buffer allocation failed"
+msgstr "Puffer konnte nicht allokiert werden"
+
 #: src/pv/transfer.c:770
 msgid "select call failed"
 msgstr "select-Aufruf fehlgeschlagen"

-#: src/pv/state.c:33
+#: src/pv/state.c:25
+msgid "history structure allocation failed"
+msgstr ""
+
+#: src/pv/state.c:55
 msgid "none"
 msgstr ""

+#: src/pv/display.c:151
+msgid "yzafpnum kMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:156
+msgid "yzafpnum KMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:683
+msgid "b"
+msgstr ""
+
+#: src/pv/display.c:738 src/pv/display.c:752
+msgid "b/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:757
+msgid "/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:758
+msgid "B/s"
+msgstr ""
+
+#: src/pv/display.c:793 src/pv/display.c:798 src/pv/display.c:860
+msgid "ETA"
+msgstr "ETA"
+
+#: src/pv/watchpid.c:81 src/pv/watchpid.c:95 src/pv/watchpid.c:106
+#: src/pv/watchpid.c:170 src/pv/watchpid.c:180 src/pv/watchpid.c:194
+msgid "fd"
+msgstr ""
+
+#: src/pv/watchpid.c:109 src/pv/watchpid.c:197
+msgid "not a regular file or block device"
+msgstr "keine normale Datei oder Blockgerät"
+
 #: src/main/version.c:17
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s - Copyright %s %s"
 msgstr "%s %s - Copyright(C) %s %s"

@@ -160,85 +172,10 @@ msgid ""
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
-"Dieses Programm wird verbreitet unter der Annahme dass es nützlich ist,\n"
-"aber OHNE JEGLICHE GARANTIE; insbesondere ohne der impliziten Garantie\n"
-"einer MARKTGÄNGIGKEIT oder EIGNUNG ZU EINEM BESTIMMTEN ZWECK."
-
-#: src/main/main.c:73
-#, fuzzy
-msgid "state allocation failed"
-msgstr "Puffer konnte nicht allokiert werden"
-
-#: src/main/options.c:98
-#, c-format
-msgid "%s: option structure allocation failed (%s)"
-msgstr "%s: `option' konnte nicht allokiert werden (%s)"
-
-#: src/main/options.c:114
-#, c-format
-msgid "%s: option structure argv allocation failed (%s)"
-msgstr "%s: `option' (argv) konnte nicht allokiert werden (%s)"
-
-#: src/main/options.c:154
-msgid "integer argument expected"
-msgstr ""
-
-#: src/main/options.c:165
-msgid "numeric argument expected"
-msgstr ""
-
-#: src/main/options.c:176
-msgid "process ID or pid:fd pair expected"
-msgstr ""
-
-#: src/main/options.c:183
-msgid "invalid process ID"
-msgstr ""
-
-#: src/main/options.c:317
-#, c-format
-msgid "Try `%s --help' for more information."
-msgstr "`%s --help' zeigt weitere Informationen an."
-
-#: src/main/options.c:321
-#, fuzzy, c-format
-msgid "Try `%s -h' for more information."
-msgstr "`%s -h' zeigt weitere Informationen an."
-
-#: src/main/options.c:338
-#, c-format
-msgid ""
-"%s: cannot use line mode or transfer modifier options when watching file "
-"descriptors"
-msgstr ""
-
-#: src/main/options.c:348
-#, c-format
-msgid "%s: cannot use cursor positioning when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:358
-#, c-format
-msgid "%s: cannot use remote control when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:368
-#, c-format
-msgid "%s: cannot transfer files when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:378
-#, c-format
-msgid "%s: -d: not available on systems without /proc/self/fdinfo"
-msgstr ""
-
-#: src/main/remote.c:218
-msgid "message not received"
-msgstr ""
-
-#: src/main/remote.c:324
-msgid "IPC not supported on this system"
-msgstr ""
+"Dieses Programm wird in der Hoffnung verbreitet, dass es nützlich sein "
+"wird,\n"
+"aber OHNE JEGLICHE GARANTIE; ohne die implizite Garantie von\n"
+"MARKTGÄNGIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK."

 #: src/main/help.c:31
 msgid "show progress bar"
@@ -253,9 +190,8 @@ msgid "show estimated time of arrival (completion)"
 msgstr "zeige die erwartete Zeit bis zum Ende an"

 #: src/main/help.c:38
-#, fuzzy
 msgid "show absolute estimated time of arrival (completion)"
-msgstr "zeige die erwartete Zeit bis zum Ende an"
+msgstr "zeige die absolute geschätzte Zeit bis zur Fertigstellung"

 #: src/main/help.c:40
 msgid "show data transfer rate counter"
@@ -265,171 +201,177 @@ msgstr "zeige die Datentransferrate an"
 msgid "show data transfer average rate counter"
 msgstr ""

-#: src/main/help.c:44
-msgid "show number of bytes transferred"
-msgstr "zeige die Anzahl von Bytes, die transferiert worden sind"
-
-#: src/main/help.c:46
-msgid "show percentage of transfer buffer in use"
-msgstr ""
-
-#: src/main/help.c:47
-msgid "NUM"
-msgstr ""
-
-#: src/main/help.c:48
-msgid "show NUM bytes last written"
-msgstr ""
-
-#: src/main/help.c:49
-msgid "FORMAT"
-msgstr ""
-
-#: src/main/help.c:50
-msgid "set output format to FORMAT"
-msgstr ""
-
-#: src/main/help.c:52
-msgid "output percentages, not visual information"
-msgstr "Ausgabe von Prozent-Angaben statt visueller Darstellung"
-
-#: src/main/help.c:54
-msgid "do not output any transfer information at all"
-msgstr "sämtliche Transferinformationen unterdrücken"
-
-#: src/main/help.c:57
-msgid "display nothing until first byte transferred"
-msgstr "keine Ausgabe bevor das erste Byte übertragen wurde"
-
-#: src/main/help.c:58 src/main/help.c:66
+#: src/main/help.c:43 src/main/help.c:63 src/main/help.c:71
 msgid "SEC"
 msgstr ""

-#: src/main/help.c:59
-#, fuzzy
-msgid "display nothing until SEC seconds have passed"
-msgstr "keine Ausgabe bevor das erste Byte übertragen wurde"
+#: src/main/help.c:45
+msgid "compute average rate over past SEC seconds (default 30s)"
+msgstr ""

-#: src/main/help.c:60
+#: src/main/help.c:47
+msgid "show number of bytes transferred"
+msgstr "zeige die Anzahl von Bytes, die transferiert worden sind"
+
+#: src/main/help.c:49
+msgid "show number of bits transferred"
+msgstr ""
+
+#: src/main/help.c:51
+msgid "show percentage of transfer buffer in use"
+msgstr "zeige, wie viel Prozent des Übertragungsbuffers in Benutzung sind"
+
+#: src/main/help.c:52
+msgid "NUM"
+msgstr ""
+
+#: src/main/help.c:53
+msgid "show NUM bytes last written"
+msgstr "NUM zeige die zuletzt geschriebenen NUM Bytes"
+
+#: src/main/help.c:54
+msgid "FORMAT"
+msgstr ""
+
+#: src/main/help.c:55
+msgid "set output format to FORMAT"
+msgstr "setze das Ausgabeformat auf FORMAT"
+
+#: src/main/help.c:57
+msgid "output percentages, not visual information"
+msgstr "Ausgabe von Prozent-Angaben statt visueller Darstellung"
+
+#: src/main/help.c:59
+msgid "do not output any transfer information at all"
+msgstr "sämtliche Transferinformationen unterdrücken"
+
+#: src/main/help.c:62
+msgid "display nothing until first byte transferred"
+msgstr "keine Ausgabe bevor das erste Byte übertragen wurde"
+
+#: src/main/help.c:64
+msgid "display nothing until SEC seconds have passed"
+msgstr "SEC nichts anzeigen, bis SEC Sekunden vergangen sind"
+
+#: src/main/help.c:65
 msgid "SIZE"
 msgstr ""

-#: src/main/help.c:61
+#: src/main/help.c:66
 msgid "set estimated data size to SIZE bytes"
-msgstr "setze erwartete Daten-Länge auf SIZE Byte"
+msgstr "setze erwartete Datenlänge auf SIZE Byte"

-#: src/main/help.c:63
+#: src/main/help.c:68
 msgid "count lines instead of bytes"
-msgstr ""
+msgstr "zähle Zeilen anstelle von Bytes"

-#: src/main/help.c:65
+#: src/main/help.c:70
 msgid "lines are null-terminated"
-msgstr ""
+msgstr "Zeilen sind nullterminiert"

-#: src/main/help.c:67
+#: src/main/help.c:72
 msgid "update every SEC seconds"
 msgstr "aktualisiere Ausgabe nach SEC Sekunden Intervall"

-#: src/main/help.c:68
+#: src/main/help.c:73
 msgid "WIDTH"
 msgstr ""

-#: src/main/help.c:69
+#: src/main/help.c:74
 msgid "assume terminal is WIDTH characters wide"
 msgstr "setze Terminal-Breite auf WIDTH Zeichen"

-#: src/main/help.c:70
+#: src/main/help.c:75
 msgid "HEIGHT"
 msgstr ""

-#: src/main/help.c:71
+#: src/main/help.c:76
 msgid "assume terminal is HEIGHT rows high"
-msgstr "setze Terminal-Breite auf WIDTH Zeichen"
+msgstr "setze Terminal-Höhe auf HEIGHT Zeichen"

-#: src/main/help.c:72
+#: src/main/help.c:77
 msgid "NAME"
 msgstr ""

-#: src/main/help.c:73
+#: src/main/help.c:78
 msgid "prefix visual information with NAME"
-msgstr "setze den NAMEn für visuelle Darstellung"
+msgstr "setze den NAMEn für visuelle Darstellung"

-#: src/main/help.c:75
+#: src/main/help.c:80
 msgid "output even if standard error is not a terminal"
 msgstr ""
 "Ausgabe auch dann erzwingen, wenn der Fehlerausgabe-Kanal kein Terminal ist"

-#: src/main/help.c:77
+#: src/main/help.c:82
 msgid "use cursor positioning escape sequences"
 msgstr "benutze Escape-Sequenzen zur Cursor-Positionierung"

-#: src/main/help.c:79
+#: src/main/help.c:84
 msgid "RATE"
 msgstr ""

-#: src/main/help.c:80
+#: src/main/help.c:85
 msgid "limit transfer to RATE bytes per second"
-msgstr "beschränke die Transferrate auf RATE Byte pro Sekunde"
+msgstr "beschränke die Transferrate auf RATE Byte pro Sekunde"

-#: src/main/help.c:81
+#: src/main/help.c:86
 msgid "BYTES"
 msgstr ""

-#: src/main/help.c:82
+#: src/main/help.c:87
 msgid "use a buffer size of BYTES"
-msgstr ""
+msgstr "BYTES benutze einen Puffer in der Größe von BYTES"

-#: src/main/help.c:84
+#: src/main/help.c:89
 msgid "never use splice(), always use read/write"
-msgstr ""
+msgstr "anstelle von splice() immer read/write benutzen"

-#: src/main/help.c:86
+#: src/main/help.c:91
 msgid "skip read errors in input"
-msgstr ""
+msgstr "Lesefehler in der Eingabe nicht beachten"

-#: src/main/help.c:88
-#, fuzzy
+#: src/main/help.c:93
 msgid "stop after --size bytes have been transferred"
-msgstr "zeige die Anzahl von Bytes, die transferiert worden sind"
+msgstr "anhalten, nachdem --size Bytes übertragen wurden"

-#: src/main/help.c:90
+#: src/main/help.c:95
 msgid "PID"
 msgstr ""

-#: src/main/help.c:91
+#: src/main/help.c:96
 msgid "update settings of process PID"
-msgstr ""
+msgstr "Einstellungen der Prozess-PID updaten"

-#: src/main/help.c:94
+#: src/main/help.c:99
 msgid "FILE"
 msgstr ""

-#: src/main/help.c:95
+#: src/main/help.c:100
 msgid "save process ID in FILE"
-msgstr ""
+msgstr "Prozess-ID in FILE speichern"

-#: src/main/help.c:97
+#: src/main/help.c:102
 msgid "PID[:FD]"
 msgstr ""

-#: src/main/help.c:98
+#: src/main/help.c:103
 msgid "watch file FD opened by process PID"
-msgstr ""
+msgstr "die vom Prozess PID geöffnete Datei FD beobachten"

-#: src/main/help.c:101
+#: src/main/help.c:106
 msgid "show this help and exit"
 msgstr "zeige diese Hilfe und beende"

-#: src/main/help.c:103
+#: src/main/help.c:108
 msgid "show version information and exit"
 msgstr "zeige Versionsinformationen und beende"

-#: src/main/help.c:109
+#: src/main/help.c:114
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]..."
 msgstr "Syntax: %s [OPTION] [DATEI]..."

-#: src/main/help.c:112
+#: src/main/help.c:117
 msgid ""
 "Concatenate FILE(s), or standard input, to standard output,\n"
 "with monitoring."
@@ -437,16 +379,93 @@ msgstr ""
 "Verbindet DATEI(en) oder den Standard-Eingabe-Kanal mit dem\n"
 "Standard-Ausgabe-Kanal und misst den Datenstrom."

-#: src/main/help.c:201
+#: src/main/help.c:212
 msgid ""
 "Debugging is enabled; export the DEBUG environment variable to define the\n"
 "output filename.\n"
 msgstr ""
+"Das Debuggen ist aktiviert. Exportieren Sie die Umgebungsvariable DEBUG,\n"
+"um den Ausgabedateinamen zu definieren.\n"

-#: src/main/help.c:205
+#: src/main/help.c:216
 #, c-format
 msgid "Please report any bugs to %s."
 msgstr "Bitte senden Sie Fehlerberichte an %s."

-#~ msgid "failed to lock terminal"
-#~ msgstr "Terminal konnte nicht geöffnet werden"
+#: src/main/main.c:74
+msgid "state allocation failed"
+msgstr "Zustandszuweisung fehlgeschlagen"
+
+#: src/main/main.c:248
+msgid "failed to read terminal attributes"
+msgstr ""
+
+#: src/main/remote.c:221
+msgid "message not received"
+msgstr "Nachricht nicht empfangen"
+
+#: src/main/remote.c:328
+msgid "IPC not supported on this system"
+msgstr "IPC wird auf diesem System nicht unterstützt"
+
+#: src/main/options.c:102
+msgid "option structure allocation failed"
+msgstr "`option' konnte nicht allokiert werden"
+
+#: src/main/options.c:116
+msgid "option structure argv allocation failed"
+msgstr "`option' (argv) konnte nicht allokiert werden"
+
+#: src/main/options.c:160
+msgid "integer argument expected"
+msgstr "Ganzzahliges Argument erwartet"
+
+#: src/main/options.c:171
+msgid "numeric argument expected"
+msgstr "numerisches Argument erwartet"
+
+#: src/main/options.c:182
+msgid "process ID or pid:fd pair expected"
+msgstr "Prozess-ID oder PID:FD-Paar erwartet"
+
+#: src/main/options.c:189
+msgid "invalid process ID"
+msgstr "ungültige Prozess-ID"
+
+#: src/main/options.c:355
+#, c-format
+msgid "Try `%s --help' for more information."
+msgstr "`%s --help' zeigt weitere Informationen an."
+
+#: src/main/options.c:359
+#, c-format
+msgid "Try `%s -h' for more information."
+msgstr "`%s -h' zeigt weitere Informationen an."
+
+#: src/main/options.c:375
+msgid ""
+"cannot use line mode or transfer modifier options when watching file "
+"descriptors"
+msgstr ""
+"Beim Anzeigen von Dateideskriptoren können keine Optionen für den "
+"Zeilenmodus oder den Übertragungsmodifikator verwendet werden"
+
+#: src/main/options.c:383
+msgid "cannot use cursor positioning when watching file descriptors"
+msgstr ""
+"Beim Anzeigen von Dateideskriptoren können keine Zeilenmodus- oder "
+"Übertragungsmodifikatoroptionen verwendet werden."
+
+#: src/main/options.c:391
+msgid "cannot use remote control when watching file descriptors"
+msgstr ""
+"kann keine Fernbedienung verwenden, wenn Dateideskriptoren angezeigt werden"
+
+#: src/main/options.c:399
+msgid "cannot transfer files when watching file descriptors"
+msgstr ""
+"Dateien können beim Betrachten von Dateideskriptoren nicht übertragen werden"
+
+#: src/main/options.c:407
+msgid "not available on systems without /proc/self/fdinfo"
+msgstr "Nicht verfügbar auf Systemen ohne /proc/self/fdinfo"
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 22:21+0100\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"POT-Creation-Date: 2023-07-17 21:52+0100\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Date: 1999-06-01 15:18:29+0100\n"
 "From: Andrew Wood <ivarch@ubik>\n"
 "Xgettext-Options: --default-domain=pkgbuild --directory=./.pkgdir --add-"
@@ -19,126 +19,137 @@ msgstr ""
 "nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
 "compat.c\n"

-#: src/pv/watchpid.c:51 src/pv/watchpid.c:66 src/pv/watchpid.c:76
-#: src/pv/watchpid.c:107 src/pv/loop.c:519 src/pv/loop.c:580 src/pv/loop.c:632
+#: src/pv/cursor.c:80
+msgid "failed to get terminal name"
+msgstr "échec de lecture du nom du terminal"
+
+#: src/pv/cursor.c:125
+msgid "failed to open lock file"
+msgstr "échec de l'ouverture du fichier de verrouillage"
+
+#: src/pv/cursor.c:159
+msgid "lock attempt failed"
+msgstr "tentative de verrouillage échoué"
+
+#: src/pv/cursor.c:409
+msgid "failed to open terminal"
+msgstr "l'ouverture du terminal a échoué"
+
+#: src/pv/file.c:119
+msgid "failed to seek to start of output"
+msgstr "ne peut pas passer au début de la sortie"
+
+#: src/pv/file.c:215
+msgid "failed to close file"
+msgstr "la fermeture du fichier a échoué"
+
+#: src/pv/file.c:238
+msgid "failed to read file"
+msgstr "la lecture du fichier a échoué"
+
+#: src/pv/file.c:248 src/main/options.c:288
+msgid "failed to stat file"
+msgstr "échec à statuer sur le fichier"
+
+#: src/pv/file.c:257
+msgid "failed to stat output file"
+msgstr "échec à statuer sur le fichier de sortie"
+
+#: src/pv/file.c:280
+msgid "input file is output file"
+msgstr "fichiers d'entré et de sortie sont les mêmes"
+
+#: src/pv/loop.c:527 src/pv/loop.c:597 src/pv/loop.c:649 src/pv/watchpid.c:68
+#: src/pv/watchpid.c:79 src/pv/watchpid.c:93 src/pv/watchpid.c:104
+#: src/pv/watchpid.c:145 src/pv/watchpid.c:168 src/pv/watchpid.c:178
+#: src/pv/watchpid.c:192 src/pv/watchpid.c:285 src/pv/watchpid.c:294
+#: src/pv/watchpid.c:332 src/pv/watchpid.c:349
 msgid "pid"
 msgstr ""

-#: src/pv/watchpid.c:68 src/pv/watchpid.c:78 src/pv/watchpid.c:109
-msgid "fd"
-msgstr ""
-
-#: src/pv/watchpid.c:112
-msgid "not a regular file or block device"
-msgstr ""
-
-#: src/pv/cursor.c:53
-#, fuzzy
-msgid "failed to get terminal name"
-msgstr "l'ouverture du terminal a échoué"
-
-#: src/pv/cursor.c:96
-#, fuzzy
-msgid "failed to open lock file"
-msgstr "la fermeture du fichier a échoué"
-
-#: src/pv/cursor.c:129
-msgid "lock attempt failed"
-msgstr ""
-
-#: src/pv/cursor.c:369
-msgid "failed to open terminal"
-msgstr "l'ouverture du terminal a échoué"
-
-#: src/pv/file.c:118
-#, fuzzy
-msgid "failed to seek to start of output"
-msgstr "échec à statuer sur le fichier de sortie"
-
-#: src/pv/file.c:214
-msgid "failed to close file"
-msgstr "la fermeture du fichier a échoué"
-
-#: src/pv/file.c:237
-msgid "failed to read file"
-msgstr "la lecture du fichier a échoué"
-
-#: src/pv/file.c:247
-msgid "failed to stat file"
-msgstr "échec à statuer sur le fichier"
-
-#: src/pv/file.c:256
-msgid "failed to stat output file"
-msgstr "échec à statuer sur le fichier de sortie"
-
-#: src/pv/file.c:279
-msgid "input file is output file"
-msgstr "fichiers d'entré et de sortie sont les mêmes"
-
-#: src/pv/display.c:117
-msgid "yzafpnum kMGTPEZY"
-msgstr ""
-
-#: src/pv/display.c:122
-msgid "yzafpnum KMGTPEZY"
-msgstr ""
-
-#: src/pv/display.c:532 src/pv/transfer.c:679
-msgid "buffer allocation failed"
-msgstr "l'allocation de mémoire tampon a échoué"
-
-#: src/pv/display.c:592 src/pv/transfer.c:458
-msgid "B"
-msgstr "O"
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "/s"
-msgstr "/s"
-
-#: src/pv/display.c:628 src/pv/display.c:636
-#, fuzzy
-msgid "B/s"
-msgstr "O/s"
-
-#: src/pv/display.c:671 src/pv/display.c:676 src/pv/display.c:738
-msgid "ETA"
-msgstr "ETA"
-
 #: src/pv/transfer.c:341
 msgid "read failed"
-msgstr "la lecture a échoué"
+msgstr "la lecture a échoué"

 #: src/pv/transfer.c:359
 msgid "warning: read errors detected"
-msgstr ""
+msgstr "avertissement: erreurs de lecture détectées"

 #: src/pv/transfer.c:374
 msgid "file is not seekable"
-msgstr ""
+msgstr "ne peut pas se déplacer dans le fichier"

 #: src/pv/transfer.c:437
-#, fuzzy
 msgid "failed to seek past error"
-msgstr "échec à statuer sur le fichier"
+msgstr "n'a pas réussi à dépasser l'erreur"

 #: src/pv/transfer.c:456
 msgid "skipped past read error"
-msgstr ""
+msgstr "erreur de lecture dépassée"
+
+#: src/pv/transfer.c:458 src/pv/display.c:687
+msgid "B"
+msgstr "O"

 #: src/pv/transfer.c:631
 msgid "write failed"
-msgstr "l'écriture a échoué"
+msgstr "l'écriture a échoué"
+
+#: src/pv/transfer.c:679 src/pv/display.c:618
+msgid "buffer allocation failed"
+msgstr "l'allocation de mémoire tampon a échoué"

 #: src/pv/transfer.c:770
 msgid "select call failed"
-msgstr "appel de sélection a échoué"
+msgstr "appel de sélection a échoué"

-#: src/pv/state.c:33
+#: src/pv/state.c:25
+msgid "history structure allocation failed"
+msgstr ""
+
+#: src/pv/state.c:55
 msgid "none"
 msgstr ""

+#: src/pv/display.c:151
+msgid "yzafpnum kMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:156
+msgid "yzafpnum KMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:683
+msgid "b"
+msgstr ""
+
+#: src/pv/display.c:738 src/pv/display.c:752
+msgid "b/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:757
+msgid "/s"
+msgstr "/s"
+
+#: src/pv/display.c:742 src/pv/display.c:758
+msgid "B/s"
+msgstr "O/s"
+
+#: src/pv/display.c:793 src/pv/display.c:798 src/pv/display.c:860
+msgid "ETA"
+msgstr "ETA"
+
+#: src/pv/watchpid.c:81 src/pv/watchpid.c:95 src/pv/watchpid.c:106
+#: src/pv/watchpid.c:170 src/pv/watchpid.c:180 src/pv/watchpid.c:194
+msgid "fd"
+msgstr ""
+
+#: src/pv/watchpid.c:109 src/pv/watchpid.c:197
+msgid "not a regular file or block device"
+msgstr "pas un fichier ordinaire ou un périphérique de bloc"
+
 #: src/main/version.c:17
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s - Copyright %s %s"
 msgstr "%s %s - Copyright(C) %s %s"

@@ -152,7 +163,7 @@ msgid ""
 "This program is free software, and is being distributed under the\n"
 "terms of the Artistic License 2.0."
 msgstr ""
-"Ce programme est un logiciel libre et est distribué sous les termes\n"
+"Ce programme est un logiciel libre et est distribué sous les termes\n"
 "anglophone de la Licence Artistique 2.0 (Artistic License 2.0)."

 #: src/main/version.c:28
@@ -161,86 +172,10 @@ msgid ""
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
-"Ce programme est distribué dans l'espoir qu'il sera utile, mais\n"
-"SANS GARANTIE AUCUNE; ni même de garantie sous-entendu que le\n"
-"programme soit COMMERCIALISABLE ou APPLICABLE À UNE TÂCHE\n"
-"PARTICULIÈRE."
-
-#: src/main/main.c:73
-#, fuzzy
-msgid "state allocation failed"
-msgstr "l'allocation de mémoire tampon a échoué"
-
-#: src/main/options.c:98
-#, c-format
-msgid "%s: option structure allocation failed (%s)"
-msgstr "%s: l'allocation pour la structure d'une option a echoué (%s)"
-
-#: src/main/options.c:114
-#, c-format
-msgid "%s: option structure argv allocation failed (%s)"
-msgstr "%s: l'allocation pour la structure de l'option argv a echoué (%s)"
-
-#: src/main/options.c:154
-msgid "integer argument expected"
-msgstr "Valeur entière attendue"
-
-#: src/main/options.c:165
-msgid "numeric argument expected"
-msgstr "Valeur numérique attendue"
-
-#: src/main/options.c:176
-msgid "process ID or pid:fd pair expected"
-msgstr ""
-
-#: src/main/options.c:183
-msgid "invalid process ID"
-msgstr ""
-
-#: src/main/options.c:317
-#, c-format
-msgid "Try `%s --help' for more information."
-msgstr "Essayez `%s --help' pour plus d'information."
-
-#: src/main/options.c:321
-#, fuzzy, c-format
-msgid "Try `%s -h' for more information."
-msgstr "Essayez `%s -h' pour plus d'information."
-
-#: src/main/options.c:338
-#, c-format
-msgid ""
-"%s: cannot use line mode or transfer modifier options when watching file "
-"descriptors"
-msgstr ""
-
-#: src/main/options.c:348
-#, c-format
-msgid "%s: cannot use cursor positioning when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:358
-#, c-format
-msgid "%s: cannot use remote control when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:368
-#, c-format
-msgid "%s: cannot transfer files when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:378
-#, c-format
-msgid "%s: -d: not available on systems without /proc/self/fdinfo"
-msgstr ""
-
-#: src/main/remote.c:218
-msgid "message not received"
-msgstr ""
-
-#: src/main/remote.c:324
-msgid "IPC not supported on this system"
-msgstr ""
+"Ce programme est distribué dans l'espoir qu'il sera utile, mais\n"
+"SANS GARANTIE AUCUNE; ni même de garantie sous-entendu que le\n"
+"programme soit COMMERCIALISABLE ou APPLICABLE À UNE TÂCHE\n"
+"PARTICULIÈRE."

 #: src/main/help.c:31
 msgid "show progress bar"
@@ -248,207 +183,290 @@ msgstr "affiche la barre de progression"

 #: src/main/help.c:33
 msgid "show elapsed time"
-msgstr "affiche le temps écoulé"
+msgstr "affiche le temps écoulé"

 #: src/main/help.c:35
 msgid "show estimated time of arrival (completion)"
-msgstr "affiche l'heure approximative de l'achèvement de la tâche"
+msgstr "affiche l'heure approximative de l'achèvement de la tâche"

 #: src/main/help.c:38
-#, fuzzy
 msgid "show absolute estimated time of arrival (completion)"
-msgstr "affiche l'heure approximative de l'achèvement de la tâche"
+msgstr "affiche l'heure absolute de l'achèvement de la tâche"

 #: src/main/help.c:40
 msgid "show data transfer rate counter"
-msgstr "affiche le taux de tranfert des données"
+msgstr "affiche le taux de tranfert des données"

 #: src/main/help.c:42
 msgid "show data transfer average rate counter"
-msgstr ""
+msgstr "afficher le compteur de taux moyen de transfert de données"

-#: src/main/help.c:44
-msgid "show number of bytes transferred"
-msgstr "affiche le nombre d'octets transférés"
-
-#: src/main/help.c:46
-msgid "show percentage of transfer buffer in use"
-msgstr ""
-
-#: src/main/help.c:47
-msgid "NUM"
-msgstr ""
-
-#: src/main/help.c:48
-msgid "show NUM bytes last written"
-msgstr ""
-
-#: src/main/help.c:49
-#, fuzzy
-msgid "FORMAT"
-msgstr "TAUX"
-
-#: src/main/help.c:50
-msgid "set output format to FORMAT"
-msgstr ""
-
-#: src/main/help.c:52
-msgid "output percentages, not visual information"
-msgstr "imprime en pourcentage, pas les informations visuelles"
-
-#: src/main/help.c:54
-msgid "do not output any transfer information at all"
-msgstr "n'afficher aucune information de transfert"
-
-#: src/main/help.c:57
-msgid "display nothing until first byte transferred"
-msgstr "ne rien afficher avant qu'au moins un octet soit tranféré"
-
-#: src/main/help.c:58 src/main/help.c:66
+#: src/main/help.c:43 src/main/help.c:63 src/main/help.c:71
 msgid "SEC"
 msgstr "SEC"

-#: src/main/help.c:59
-#, fuzzy
-msgid "display nothing until SEC seconds have passed"
-msgstr "ne rien afficher avant qu'au moins un octet soit tranféré"
+#: src/main/help.c:45
+msgid "compute average rate over past SEC seconds (default 30s)"
+msgstr ""

-#: src/main/help.c:60
+#: src/main/help.c:47
+msgid "show number of bytes transferred"
+msgstr "affiche le nombre d'octets transférés"
+
+#: src/main/help.c:49
+msgid "show number of bits transferred"
+msgstr ""
+
+#: src/main/help.c:51
+msgid "show percentage of transfer buffer in use"
+msgstr "afficher le pourcentage de tampon de transfert utilisé"
+
+#: src/main/help.c:52
+msgid "NUM"
+msgstr ""
+
+#: src/main/help.c:53
+msgid "show NUM bytes last written"
+msgstr "affiche NUM octets pour la dernière fois écrits"
+
+#: src/main/help.c:54
+msgid "FORMAT"
+msgstr ""
+
+#: src/main/help.c:55
+msgid "set output format to FORMAT"
+msgstr "définir le format de sortie sur FORMAT"
+
+#: src/main/help.c:57
+msgid "output percentages, not visual information"
+msgstr "imprime en pourcentage, pas les informations visuelles"
+
+#: src/main/help.c:59
+msgid "do not output any transfer information at all"
+msgstr "n'afficher aucune information de transfert"
+
+#: src/main/help.c:62
+msgid "display nothing until first byte transferred"
+msgstr "ne rien afficher avant qu'au moins un octet soit tranféré"
+
+#: src/main/help.c:64
+msgid "display nothing until SEC seconds have passed"
+msgstr "n'afficher rien jusqu'à ce que SEC secondes se soient écoulées"
+
+#: src/main/help.c:65
 msgid "SIZE"
 msgstr "TAILLE"

-#: src/main/help.c:61
+#: src/main/help.c:66
 msgid "set estimated data size to SIZE bytes"
-msgstr "ajuste la taille estimée des données à TAILLE octets"
+msgstr "ajuste la taille estimée des données à TAILLE octets"

-#: src/main/help.c:63
+#: src/main/help.c:68
 msgid "count lines instead of bytes"
 msgstr "compte les lignes au lieu des octets"

-#: src/main/help.c:65
+#: src/main/help.c:70
 msgid "lines are null-terminated"
-msgstr ""
+msgstr "les lignes sont terminées par un nul"

-#: src/main/help.c:67
+#: src/main/help.c:72
 msgid "update every SEC seconds"
-msgstr "mise-à-jour toute les SEC secondes"
+msgstr "mise-à-jour toute les SEC secondes"

-#: src/main/help.c:68
+#: src/main/help.c:73
 msgid "WIDTH"
 msgstr "LARGEUR"

-#: src/main/help.c:69
+#: src/main/help.c:74
 msgid "assume terminal is WIDTH characters wide"
-msgstr "présumer la largeur du terminal à LARGEUR caractères"
+msgstr "présumer la largeur du terminal à LARGEUR caractères"

-#: src/main/help.c:70
+#: src/main/help.c:75
 msgid "HEIGHT"
 msgstr "HAUTEUR"

-#: src/main/help.c:71
+#: src/main/help.c:76
 msgid "assume terminal is HEIGHT rows high"
-msgstr "présumer la hauteur du terminal à HAUTEUR lignes"
+msgstr "présumer la hauteur du terminal à HAUTEUR lignes"

-#: src/main/help.c:72
+#: src/main/help.c:77
 msgid "NAME"
 msgstr "NOM"

-#: src/main/help.c:73
+#: src/main/help.c:78
 msgid "prefix visual information with NAME"
-msgstr "préfixer les informations visuelles avec NOM"
+msgstr "préfixer les informations visuelles avec NOM"

-#: src/main/help.c:75
+#: src/main/help.c:80
 msgid "output even if standard error is not a terminal"
-msgstr "imprime vers la sortie d'erreur même si ce n'est pas un terminal"
+msgstr "imprime vers la sortie d'erreur même si ce n'est pas un terminal"

-#: src/main/help.c:77
+#: src/main/help.c:82
 msgid "use cursor positioning escape sequences"
-msgstr "utiliser les séquences d'échappements de positionnement de curseur"
+msgstr "utiliser les séquences d'échappements de positionnement de curseur"

-#: src/main/help.c:79
+#: src/main/help.c:84
 msgid "RATE"
 msgstr "TAUX"

-#: src/main/help.c:80
+#: src/main/help.c:85
 msgid "limit transfer to RATE bytes per second"
-msgstr "limite le taux de transfer à TAUX octets par seconde"
+msgstr "limite le taux de transfer à TAUX octets par seconde"

-#: src/main/help.c:81
+#: src/main/help.c:86
 msgid "BYTES"
 msgstr "OCTETS"

-#: src/main/help.c:82
+#: src/main/help.c:87
 msgid "use a buffer size of BYTES"
-msgstr "Utiliser une mémoire tampon de OCTETS octets"
+msgstr "Utiliser une mémoire tampon de OCTETS octets"

-#: src/main/help.c:84
+#: src/main/help.c:89
 msgid "never use splice(), always use read/write"
-msgstr ""
+msgstr "n'utilisez jamais splice(), utilisez toujours read/write"

-#: src/main/help.c:86
+#: src/main/help.c:91
 msgid "skip read errors in input"
-msgstr ""
+msgstr "ignorer les erreurs de lecture dans l'entrée"

-#: src/main/help.c:88
-#, fuzzy
+#: src/main/help.c:93
 msgid "stop after --size bytes have been transferred"
-msgstr "affiche le nombre d'octets transférés"
+msgstr "arrêter après le transfert de --size octets"

-#: src/main/help.c:90
+#: src/main/help.c:95
 msgid "PID"
 msgstr "PID"

-#: src/main/help.c:91
+#: src/main/help.c:96
 msgid "update settings of process PID"
-msgstr "mettre-à-jour la configuration du processus PID"
+msgstr "mettre-à-jour la configuration du processus PID"

-#: src/main/help.c:94
+#: src/main/help.c:99
 msgid "FILE"
 msgstr ""

-#: src/main/help.c:95
+#: src/main/help.c:100
 msgid "save process ID in FILE"
-msgstr ""
+msgstr "enregistrer l'ID de processus dans FILE"

-#: src/main/help.c:97
+#: src/main/help.c:102
 msgid "PID[:FD]"
 msgstr ""

-#: src/main/help.c:98
+#: src/main/help.c:103
 msgid "watch file FD opened by process PID"
-msgstr ""
+msgstr "regarder le fichier FD ouvert par le processus PID"

-#: src/main/help.c:101
+#: src/main/help.c:106
 msgid "show this help and exit"
 msgstr "afficher cette aide puis quitter"

-#: src/main/help.c:103
+#: src/main/help.c:108
 msgid "show version information and exit"
 msgstr "afficher la version puis quitter"

-#: src/main/help.c:109
+#: src/main/help.c:114
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]..."
 msgstr "Utilisation : %s [OPTIONS] [FICHIER]..."

-#: src/main/help.c:112
+#: src/main/help.c:117
 msgid ""
 "Concatenate FILE(s), or standard input, to standard output,\n"
 "with monitoring."
 msgstr ""
-"Concatène FICHIER(s), ou l'entrée standard, sur la sortie standard\n"
+"Concatène FICHIER(s), ou l'entrée standard, sur la sortie standard\n"
 "avec monitorage."

-#: src/main/help.c:201
+#: src/main/help.c:212
 msgid ""
 "Debugging is enabled; export the DEBUG environment variable to define the\n"
 "output filename.\n"
 msgstr ""
+"Le débogage est activé; exportez la variable d'environnement DEBUG pour\n"
+"définir le nom du fichier de sortie.\n"

-#: src/main/help.c:205
+#: src/main/help.c:216
 #, c-format
 msgid "Please report any bugs to %s."
-msgstr "SVP rapporter touts bogues à %s."
+msgstr "SVP rapporter touts bogues à %s."

-#~ msgid "failed to lock terminal"
-#~ msgstr "l'ouverture du terminal a échoué"
+#: src/main/main.c:74
+msgid "state allocation failed"
+msgstr "échec de l'allocation de mémoire de condition"
+
+#: src/main/main.c:248
+msgid "failed to read terminal attributes"
+msgstr ""
+
+#: src/main/remote.c:221
+msgid "message not received"
+msgstr "message non reçu"
+
+#: src/main/remote.c:328
+msgid "IPC not supported on this system"
+msgstr "IPC non pris en charge sur ce système"
+
+#: src/main/options.c:102
+msgid "option structure allocation failed"
+msgstr "l'allocation pour la structure d'une option a echoué"
+
+#: src/main/options.c:116
+msgid "option structure argv allocation failed"
+msgstr "l'allocation pour la structure de l'option argv a echoué"
+
+#: src/main/options.c:160
+msgid "integer argument expected"
+msgstr "Valeur entière attendue"
+
+#: src/main/options.c:171
+msgid "numeric argument expected"
+msgstr "Valeur numérique attendue"
+
+#: src/main/options.c:182
+msgid "process ID or pid:fd pair expected"
+msgstr "ID de processus ou paire pid:fd attendue"
+
+#: src/main/options.c:189
+msgid "invalid process ID"
+msgstr "ID de processus non valide"
+
+#: src/main/options.c:355
+#, c-format
+msgid "Try `%s --help' for more information."
+msgstr "Essayez `%s --help' pour plus d'information."
+
+#: src/main/options.c:359
+#, c-format
+msgid "Try `%s -h' for more information."
+msgstr "Essayez `%s -h' pour plus d'information."
+
+#: src/main/options.c:375
+msgid ""
+"cannot use line mode or transfer modifier options when watching file "
+"descriptors"
+msgstr ""
+"impossible d'utiliser le mode ligne ou les options de modificateur de "
+"transfert lors de la visualisation des descripteurs de fichiers"
+
+#: src/main/options.c:383
+msgid "cannot use cursor positioning when watching file descriptors"
+msgstr ""
+"impossible d'utiliser le positionnement du curseur lors de la visualisation "
+"des descripteurs de fichier"
+
+#: src/main/options.c:391
+msgid "cannot use remote control when watching file descriptors"
+msgstr ""
+"impossible d'utiliser la télécommande lors de la visualisation des "
+"descripteurs de fichiers"
+
+#: src/main/options.c:399
+msgid "cannot transfer files when watching file descriptors"
+msgstr ""
+"impossible de transférer des fichiers lorsque vous regardez des descripteurs "
+"de fichiers"
+
+#: src/main/options.c:407
+msgid "not available on systems without /proc/self/fdinfo"
+msgstr "non disponible sur les systèmes sans /proc/self/fdinfo"
@@ -6,103 +6,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 22:21+0100\n"
+"POT-Creation-Date: 2023-07-17 21:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: src/pv/watchpid.c:51 src/pv/watchpid.c:66 src/pv/watchpid.c:76
-#: src/pv/watchpid.c:107 src/pv/loop.c:519 src/pv/loop.c:580 src/pv/loop.c:632
-msgid "pid"
-msgstr ""
-
-#: src/pv/watchpid.c:68 src/pv/watchpid.c:78 src/pv/watchpid.c:109
-msgid "fd"
-msgstr ""
-
-#: src/pv/watchpid.c:112
-msgid "not a regular file or block device"
-msgstr ""
-
-#: src/pv/cursor.c:53
-#, fuzzy
+#: src/pv/cursor.c:80
 msgid "failed to get terminal name"
-msgstr "nie uda³o siê otworzyæ terminala"
+msgstr ""

-# "Przewidywany czas ukoñczenia" for ETA is too long
-#: src/pv/cursor.c:96
-#, fuzzy
+# "Przewidywany czas ukończenia" for ETA is too long
+#: src/pv/cursor.c:125
 msgid "failed to open lock file"
-msgstr "nie uda³o siê zamkn±æ pliku"
+msgstr ""

-#: src/pv/cursor.c:129
+#: src/pv/cursor.c:159
 msgid "lock attempt failed"
 msgstr ""

-#: src/pv/cursor.c:369
+#: src/pv/cursor.c:409
 msgid "failed to open terminal"
-msgstr "nie uda³o siê otworzyæ terminala"
+msgstr "nie udało się otworzyć terminala"

-#: src/pv/file.c:118
-#, fuzzy
+#: src/pv/file.c:119
 msgid "failed to seek to start of output"
-msgstr "nie uda³o siê wykonaæ operacji stat na pliku wyj¶ciowym"
+msgstr ""

-# "Przewidywany czas ukoñczenia" for ETA is too long
-#: src/pv/file.c:214
+# "Przewidywany czas ukończenia" for ETA is too long
+#: src/pv/file.c:215
 msgid "failed to close file"
-msgstr "nie uda³o siê zamkn±æ pliku"
+msgstr "nie udało się zamknąć pliku"

-#: src/pv/file.c:237
+#: src/pv/file.c:238
 msgid "failed to read file"
-msgstr "nie uda³o siê odczytaæ pliku"
+msgstr "nie udało się odczytać pliku"

-#: src/pv/file.c:247
+#: src/pv/file.c:248 src/main/options.c:288
 msgid "failed to stat file"
-msgstr "nie uda³o siê wykonaæ operacji stat na pliku"
+msgstr "nie udało się wykonać operacji stat na pliku"

-#: src/pv/file.c:256
+#: src/pv/file.c:257
 msgid "failed to stat output file"
-msgstr "nie uda³o siê wykonaæ operacji stat na pliku wyj¶ciowym"
+msgstr "nie udało się wykonać operacji stat na pliku wyjściowym"

-#: src/pv/file.c:279
+#: src/pv/file.c:280
 msgid "input file is output file"
-msgstr "plik wej¶ciowy jest zarazem plikiem wyj¶ciowym"
+msgstr "plik wejściowy jest zarazem plikiem wyjściowym"

-#: src/pv/display.c:117
-msgid "yzafpnum kMGTPEZY"
+#: src/pv/loop.c:527 src/pv/loop.c:597 src/pv/loop.c:649 src/pv/watchpid.c:68
+#: src/pv/watchpid.c:79 src/pv/watchpid.c:93 src/pv/watchpid.c:104
+#: src/pv/watchpid.c:145 src/pv/watchpid.c:168 src/pv/watchpid.c:178
+#: src/pv/watchpid.c:192 src/pv/watchpid.c:285 src/pv/watchpid.c:294
+#: src/pv/watchpid.c:332 src/pv/watchpid.c:349
+msgid "pid"
 msgstr ""

-#: src/pv/display.c:122
-msgid "yzafpnum KMGTPEZY"
-msgstr ""
-
-#: src/pv/display.c:532 src/pv/transfer.c:679
-msgid "buffer allocation failed"
-msgstr "nie uda³o siê zaalokowaæ bufora"
-
-#: src/pv/display.c:592 src/pv/transfer.c:458
-msgid "B"
-msgstr "B"
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "/s"
-msgstr "/s"
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "B/s"
-msgstr "B/s"
-
-#: src/pv/display.c:671 src/pv/display.c:676 src/pv/display.c:738
-msgid "ETA"
-msgstr "ETA"
-
 #: src/pv/transfer.c:341
 msgid "read failed"
-msgstr "b³±d odczytu"
+msgstr "błąd odczytu"

 #: src/pv/transfer.c:359
 msgid "warning: read errors detected"
@@ -113,30 +77,78 @@ msgid "file is not seekable"
 msgstr ""

 #: src/pv/transfer.c:437
-#, fuzzy
 msgid "failed to seek past error"
-msgstr "nie uda³o siê wykonaæ operacji stat na pliku"
+msgstr ""

 #: src/pv/transfer.c:456
 msgid "skipped past read error"
 msgstr ""

+#: src/pv/transfer.c:458 src/pv/display.c:687
+msgid "B"
+msgstr "B"
+
 #: src/pv/transfer.c:631
 msgid "write failed"
-msgstr "b³±d zapisu"
+msgstr "błąd zapisu"
+
+#: src/pv/transfer.c:679 src/pv/display.c:618
+msgid "buffer allocation failed"
+msgstr "nie udało się zaalokować bufora"

 #: src/pv/transfer.c:770
 msgid "select call failed"
-msgstr "nie uda³o siê wywo³aæ funkcji select"
+msgstr "nie udało się wywołać funkcji select"

-#: src/pv/state.c:33
+#: src/pv/state.c:25
+msgid "history structure allocation failed"
+msgstr ""
+
+#: src/pv/state.c:55
 msgid "none"
 msgstr ""

+#: src/pv/display.c:151
+msgid "yzafpnum kMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:156
+msgid "yzafpnum KMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:683
+msgid "b"
+msgstr ""
+
+#: src/pv/display.c:738 src/pv/display.c:752
+msgid "b/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:757
+msgid "/s"
+msgstr "/s"
+
+#: src/pv/display.c:742 src/pv/display.c:758
+msgid "B/s"
+msgstr "B/s"
+
+#: src/pv/display.c:793 src/pv/display.c:798 src/pv/display.c:860
+msgid "ETA"
+msgstr "ETA"
+
+#: src/pv/watchpid.c:81 src/pv/watchpid.c:95 src/pv/watchpid.c:106
+#: src/pv/watchpid.c:170 src/pv/watchpid.c:180 src/pv/watchpid.c:194
+msgid "fd"
+msgstr ""
+
+#: src/pv/watchpid.c:109 src/pv/watchpid.c:197
+msgid "not a regular file or block device"
+msgstr ""
+
 #: src/main/version.c:17
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s - Copyright %s %s"
-msgstr "%s %s - Prawa autorskie (C) %s %s"
+msgstr ""

 #: src/main/version.c:20
 #, c-format
@@ -156,336 +168,286 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""

-#: src/main/main.c:73
-#, fuzzy
-msgid "state allocation failed"
-msgstr "nie uda³o siê zaalokowaæ bufora"
-
-#: src/main/options.c:98
-#, c-format
-msgid "%s: option structure allocation failed (%s)"
-msgstr "%s: nie uda³o siê zaalokowaæ struktur opcji (%s)"
-
-#: src/main/options.c:114
-#, c-format
-msgid "%s: option structure argv allocation failed (%s)"
-msgstr "%s: nie uda³o siê zaalokowaæ struktur opcji argv (%s)"
-
-#: src/main/options.c:154
-msgid "integer argument expected"
-msgstr ""
-
-#: src/main/options.c:165
-msgid "numeric argument expected"
-msgstr ""
-
-#: src/main/options.c:176
-msgid "process ID or pid:fd pair expected"
-msgstr ""
-
-#: src/main/options.c:183
-msgid "invalid process ID"
-msgstr ""
-
-#: src/main/options.c:317
-#, c-format
-msgid "Try `%s --help' for more information."
-msgstr "Spróbuj `%s --help' by uzyskaæ wiêcej informacji"
-
-#: src/main/options.c:321
-#, fuzzy, c-format
-msgid "Try `%s -h' for more information."
-msgstr "Spróbuj `%s -h' by uzyskaæ wiêcej informacji"
-
-#: src/main/options.c:338
-#, c-format
-msgid ""
-"%s: cannot use line mode or transfer modifier options when watching file "
-"descriptors"
-msgstr ""
-
-#: src/main/options.c:348
-#, c-format
-msgid "%s: cannot use cursor positioning when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:358
-#, c-format
-msgid "%s: cannot use remote control when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:368
-#, c-format
-msgid "%s: cannot transfer files when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:378
-#, c-format
-msgid "%s: -d: not available on systems without /proc/self/fdinfo"
-msgstr ""
-
-#: src/main/remote.c:218
-msgid "message not received"
-msgstr ""
-
-#: src/main/remote.c:324
-msgid "IPC not supported on this system"
-msgstr ""
-
 #: src/main/help.c:31
 msgid "show progress bar"
-msgstr "poka¿ pasek postêpu"
+msgstr "pokaż pasek postępu"

 #: src/main/help.c:33
 msgid "show elapsed time"
-msgstr "poka¿ up³ywaj±cy czas"
+msgstr "pokaż upływający czas"

 #: src/main/help.c:35
 msgid "show estimated time of arrival (completion)"
-msgstr "poka¿ szacowany czas ukoñczenia"
+msgstr "pokaż szacowany czas ukończenia"

 #: src/main/help.c:38
-#, fuzzy
 msgid "show absolute estimated time of arrival (completion)"
-msgstr "poka¿ szacowany czas ukoñczenia"
+msgstr ""

 #: src/main/help.c:40
 msgid "show data transfer rate counter"
-msgstr "poka¿ licznik prêdko¶ci przesy³ania"
+msgstr "pokaż licznik prędkości przesyłania"

 #: src/main/help.c:42
 msgid "show data transfer average rate counter"
 msgstr ""

-#: src/main/help.c:44
-msgid "show number of bytes transferred"
-msgstr "poka¿ ilo¶æ przes³anych bajtów"
+#: src/main/help.c:43 src/main/help.c:63 src/main/help.c:71
+msgid "SEC"
+msgstr "WARTOŚĆ"

-#: src/main/help.c:46
-msgid "show percentage of transfer buffer in use"
+#: src/main/help.c:45
+msgid "compute average rate over past SEC seconds (default 30s)"
 msgstr ""

 #: src/main/help.c:47
-msgid "NUM"
-msgstr ""
-
-#: src/main/help.c:48
-msgid "show NUM bytes last written"
-msgstr ""
+msgid "show number of bytes transferred"
+msgstr "pokaż ilość przesłanych bajtów"

 #: src/main/help.c:49
-msgid "FORMAT"
+msgid "show number of bits transferred"
 msgstr ""

-#: src/main/help.c:50
-msgid "set output format to FORMAT"
+#: src/main/help.c:51
+msgid "show percentage of transfer buffer in use"
 msgstr ""

 #: src/main/help.c:52
-msgid "output percentages, not visual information"
-msgstr "w¶wietl wyj¶cie procentowo, bez graficznej prezentacji"
+msgid "NUM"
+msgstr ""
+
+#: src/main/help.c:53
+msgid "show NUM bytes last written"
+msgstr ""

 #: src/main/help.c:54
-msgid "do not output any transfer information at all"
-msgstr "nie wy¶wietlaj ¿adnych informacji o przesy³aniu"
+msgid "FORMAT"
+msgstr ""
+
+#: src/main/help.c:55
+msgid "set output format to FORMAT"
+msgstr ""

 #: src/main/help.c:57
-msgid "display nothing until first byte transferred"
-msgstr "nie wy¶wietlaj nic a¿ do pierwszego przes³anego bajtu"
-
-#: src/main/help.c:58 src/main/help.c:66
-msgid "SEC"
-msgstr "WARTO¦Æ"
+msgid "output percentages, not visual information"
+msgstr "wświetl wyjście procentowo, bez graficznej prezentacji"

 #: src/main/help.c:59
-#, fuzzy
+msgid "do not output any transfer information at all"
+msgstr "nie wyświetlaj żadnych informacji o przesyłaniu"
+
+#: src/main/help.c:62
+msgid "display nothing until first byte transferred"
+msgstr "nie wyświetlaj nic aż do pierwszego przesłanego bajtu"
+
+#: src/main/help.c:64
 msgid "display nothing until SEC seconds have passed"
-msgstr "nie wy¶wietlaj nic a¿ do pierwszego przes³anego bajtu"
-
-#: src/main/help.c:60
-msgid "SIZE"
-msgstr "WARTO¦Æ"
-
-#: src/main/help.c:61
-msgid "set estimated data size to SIZE bytes"
-msgstr "ustaw oczekiwany rozmiar danych na WARTO¦Æ bajtów"
-
-#: src/main/help.c:63
-msgid "count lines instead of bytes"
 msgstr ""

 #: src/main/help.c:65
+msgid "SIZE"
+msgstr "WARTOŚĆ"
+
+#: src/main/help.c:66
+msgid "set estimated data size to SIZE bytes"
+msgstr "ustaw oczekiwany rozmiar danych na WARTOŚĆ bajtów"
+
+#: src/main/help.c:68
+msgid "count lines instead of bytes"
+msgstr ""
+
+#: src/main/help.c:70
 msgid "lines are null-terminated"
 msgstr ""

-#: src/main/help.c:67
+#: src/main/help.c:72
 msgid "update every SEC seconds"
-msgstr "aktualizuj co ka¿de WARTO¦Æ sekund"
+msgstr "aktualizuj co każde WARTOŚĆ sekund"

-#: src/main/help.c:68
+#: src/main/help.c:73
 msgid "WIDTH"
-msgstr "WARTO¦Æ"
+msgstr "WARTOŚĆ"

-#: src/main/help.c:69
+#: src/main/help.c:74
 msgid "assume terminal is WIDTH characters wide"
-msgstr "przyjmij, ¿e terminal ma szeroko¶æ WARTO¦Æ znaków"
+msgstr "przyjmij, że terminal ma szerokość WARTOŚĆ znaków"

-#: src/main/help.c:70
+#: src/main/help.c:75
 msgid "HEIGHT"
 msgstr ""

-#: src/main/help.c:71
+#: src/main/help.c:76
 msgid "assume terminal is HEIGHT rows high"
-msgstr "przyjmij, ¿e terminal ma szeroko¶æ WARTO¦Æ znaków"
+msgstr "przyjmij, że terminal ma szerokość WARTOŚĆ znaków"

-#: src/main/help.c:72
+#: src/main/help.c:77
 msgid "NAME"
 msgstr "NAZWA"

-#: src/main/help.c:73
+#: src/main/help.c:78
 msgid "prefix visual information with NAME"
-msgstr "poprzed¼ informacje prefiksem NAZWA"
+msgstr "poprzedź informacje prefiksem NAZWA"

-#: src/main/help.c:75
+#: src/main/help.c:80
 msgid "output even if standard error is not a terminal"
-msgstr "poka¿ wyj¶cie nawet gdy b³êdy nie s± typu terminal"
+msgstr "pokaż wyjście nawet gdy błędy nie są typu terminal"

-#: src/main/help.c:77
+#: src/main/help.c:82
 msgid "use cursor positioning escape sequences"
-msgstr "u¿ywaj sekwencji escape do pozycjonowania"
+msgstr "używaj sekwencji escape do pozycjonowania"

-#: src/main/help.c:79
+#: src/main/help.c:84
 msgid "RATE"
 msgstr ""

-#: src/main/help.c:80
+#: src/main/help.c:85
 msgid "limit transfer to RATE bytes per second"
-msgstr "ogranicz przesy³ane dane do RATE bajtów na sekundê"
+msgstr "ogranicz przesyłane dane do RATE bajtów na sekundę"

-#: src/main/help.c:81
+#: src/main/help.c:86
 msgid "BYTES"
 msgstr ""

-#: src/main/help.c:82
+#: src/main/help.c:87
 msgid "use a buffer size of BYTES"
 msgstr ""

-#: src/main/help.c:84
+#: src/main/help.c:89
 msgid "never use splice(), always use read/write"
 msgstr ""

-#: src/main/help.c:86
+#: src/main/help.c:91
 msgid "skip read errors in input"
 msgstr ""

-#: src/main/help.c:88
-#, fuzzy
+#: src/main/help.c:93
 msgid "stop after --size bytes have been transferred"
-msgstr "poka¿ ilo¶æ przes³anych bajtów"
-
-#: src/main/help.c:90
-msgid "PID"
-msgstr ""
-
-#: src/main/help.c:91
-msgid "update settings of process PID"
-msgstr ""
-
-#: src/main/help.c:94
-msgid "FILE"
 msgstr ""

 #: src/main/help.c:95
+msgid "PID"
+msgstr ""
+
+#: src/main/help.c:96
+msgid "update settings of process PID"
+msgstr ""
+
+#: src/main/help.c:99
+msgid "FILE"
+msgstr ""
+
+#: src/main/help.c:100
 msgid "save process ID in FILE"
 msgstr ""

-#: src/main/help.c:97
+#: src/main/help.c:102
 msgid "PID[:FD]"
 msgstr ""

-#: src/main/help.c:98
+#: src/main/help.c:103
 msgid "watch file FD opened by process PID"
 msgstr ""

-#: src/main/help.c:101
+#: src/main/help.c:106
 msgid "show this help and exit"
-msgstr "wy¶wietl te informacje z pomoc± i wyjd¼"
+msgstr "wyświetl te informacje z pomocą i wyjdź"

-#: src/main/help.c:103
+#: src/main/help.c:108
 msgid "show version information and exit"
-msgstr "wy¶wietl informacje o wersji i wyjd¼"
+msgstr "wyświetl informacje o wersji i wyjdź"

-#: src/main/help.c:109
+#: src/main/help.c:114
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]..."
-msgstr "Sposób u¿ycia: %s [OPCJA] [PLIK]..."
+msgstr "Sposób użycia: %s [OPCJA] [PLIK]..."

-#: src/main/help.c:112
+#: src/main/help.c:117
 msgid ""
 "Concatenate FILE(s), or standard input, to standard output,\n"
 "with monitoring."
 msgstr ""
-"£±czenie PLIK(ów) lub wej¶cia standardowego, do wyj¶cia standardowego\n"
+"Łączenie PLIK(ów) lub wejścia standardowego, do wyjścia standardowego\n"
 "z monitoringiem."

-#: src/main/help.c:201
+#: src/main/help.c:212
 msgid ""
 "Debugging is enabled; export the DEBUG environment variable to define the\n"
 "output filename.\n"
 msgstr ""

-#: src/main/help.c:205
+#: src/main/help.c:216
 #, c-format
 msgid "Please report any bugs to %s."
-msgstr "Proszê przesy³aæ zg³oszenia b³êdów do %s."
+msgstr "Proszę przesyłać zgłoszenia błędów do %s."

-#~ msgid "failed to lock terminal"
-#~ msgstr "nie uda³o siê otworzyæ terminala"
+#: src/main/main.c:74
+msgid "state allocation failed"
+msgstr ""

-#~ msgid "G"
-#~ msgstr "GB"
+#: src/main/main.c:248
+msgid "failed to read terminal attributes"
+msgstr ""

-#~ msgid "M"
-#~ msgstr "MB"
+#: src/main/remote.c:221
+msgid "message not received"
+msgstr ""

-#~ msgid "k"
-#~ msgstr "kB"
+#: src/main/remote.c:328
+msgid "IPC not supported on this system"
+msgstr ""

-#~ msgid "GB"
-#~ msgstr "GB"
+#: src/main/options.c:102
+msgid "option structure allocation failed"
+msgstr "nie udało się zaalokować struktur opcji"

-#~ msgid "MB"
-#~ msgstr "MB"
+#: src/main/options.c:116
+msgid "option structure argv allocation failed"
+msgstr "nie udało się zaalokować struktur opcji argv"

-#~ msgid "kB"
-#~ msgstr "kB"
+#: src/main/options.c:160
+msgid "integer argument expected"
+msgstr ""

-#~ msgid "M/s"
-#~ msgstr "MB/s"
+#: src/main/options.c:171
+msgid "numeric argument expected"
+msgstr ""

-#~ msgid "k/s"
-#~ msgstr "kB/s"
+#: src/main/options.c:182
+msgid "process ID or pid:fd pair expected"
+msgstr ""

-#~ msgid "/s "
-#~ msgstr "B/s"
+#: src/main/options.c:189
+msgid "invalid process ID"
+msgstr ""

-#~ msgid "GB/s"
-#~ msgstr "GB/s"
+#: src/main/options.c:355
+#, c-format
+msgid "Try `%s --help' for more information."
+msgstr "Spróbuj `%s --help' by uzyskać więcej informacji"

-#~ msgid "MB/s"
-#~ msgstr "MB/s"
+#: src/main/options.c:359
+#, c-format
+msgid "Try `%s -h' for more information."
+msgstr "Spróbuj `%s -h' by uzyskać więcej informacji"

-#~ msgid "kB/s"
-#~ msgstr "kB/s"
+#: src/main/options.c:375
+msgid ""
+"cannot use line mode or transfer modifier options when watching file "
+"descriptors"
+msgstr ""

-#~ msgid "For more information, please run `%s --license'."
-#~ msgstr "By uzyskaæ wiêcej informacji wprowad¼ `%s --license'."
+#: src/main/options.c:383
+msgid "cannot use cursor positioning when watching file descriptors"
+msgstr ""

-#~ msgid "For more information, please run `%s -l'."
-#~ msgstr "By uzyskaæ wiêcej informacji wprowad¼ `%s -l'."
+#: src/main/options.c:391
+msgid "cannot use remote control when watching file descriptors"
+msgstr ""

-#~ msgid "show the license this program is distributed under"
-#~ msgstr "wy¶wietl informacje o licencji pod któr± program jest rozprowadzany"
+#: src/main/options.c:399
+msgid "cannot transfer files when watching file descriptors"
+msgstr ""

-#~ msgid "%s %s - Copyright (C) %s %s"
-#~ msgstr "%s %s - Prawa autorskie (C) %s %s"
+#: src/main/options.c:407
+msgid "not available on systems without /proc/self/fdinfo"
+msgstr ""
@@ -6,133 +6,145 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 22:21+0100\n"
+"POT-Creation-Date: 2023-07-17 21:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: src/pv/watchpid.c:51 src/pv/watchpid.c:66 src/pv/watchpid.c:76
-#: src/pv/watchpid.c:107 src/pv/loop.c:519 src/pv/loop.c:580 src/pv/loop.c:632
-msgid "pid"
-msgstr ""
-
-#: src/pv/watchpid.c:68 src/pv/watchpid.c:78 src/pv/watchpid.c:109
-msgid "fd"
-msgstr ""
-
-#: src/pv/watchpid.c:112
-msgid "not a regular file or block device"
-msgstr ""
-
-#: src/pv/cursor.c:53
-#, fuzzy
+#: src/pv/cursor.c:80
 msgid "failed to get terminal name"
-msgstr "erro abrindo o terminal"
+msgstr "erro ao ler o nome do terminal"

-#: src/pv/cursor.c:96
-#, fuzzy
+#: src/pv/cursor.c:125
 msgid "failed to open lock file"
-msgstr "erro fechando o arquivo"
+msgstr "erro ao abrir arquivo de bloqueio"

-#: src/pv/cursor.c:129
+#: src/pv/cursor.c:159
 msgid "lock attempt failed"
-msgstr ""
+msgstr "tentativa de bloqueio falhou"

-#: src/pv/cursor.c:369
+#: src/pv/cursor.c:409
 msgid "failed to open terminal"
 msgstr "erro abrindo o terminal"

-#: src/pv/file.c:118
-#, fuzzy
+#: src/pv/file.c:119
 msgid "failed to seek to start of output"
-msgstr "erro obtendo informações do arquivo de saída"
+msgstr "não pode mover para o início da produção"

-#: src/pv/file.c:214
+#: src/pv/file.c:215
 msgid "failed to close file"
 msgstr "erro fechando o arquivo"

-#: src/pv/file.c:237
+#: src/pv/file.c:238
 msgid "failed to read file"
 msgstr "erro lendo o arquivo"

-#: src/pv/file.c:247
+#: src/pv/file.c:248 src/main/options.c:288
 msgid "failed to stat file"
-msgstr "erro obtendo informações do arquivo"
+msgstr "erro obtendo informações do arquivo"

-#: src/pv/file.c:256
+#: src/pv/file.c:257
 msgid "failed to stat output file"
-msgstr "erro obtendo informações do arquivo de saída"
+msgstr "erro obtendo informações do arquivo de saída"

-#: src/pv/file.c:279
+#: src/pv/file.c:280
 msgid "input file is output file"
-msgstr "os arquivos de entrada e saída são o mesmo"
+msgstr "os arquivos de entrada e saída são o mesmo"

-#: src/pv/display.c:117
-msgid "yzafpnum kMGTPEZY"
+#: src/pv/loop.c:527 src/pv/loop.c:597 src/pv/loop.c:649 src/pv/watchpid.c:68
+#: src/pv/watchpid.c:79 src/pv/watchpid.c:93 src/pv/watchpid.c:104
+#: src/pv/watchpid.c:145 src/pv/watchpid.c:168 src/pv/watchpid.c:178
+#: src/pv/watchpid.c:192 src/pv/watchpid.c:285 src/pv/watchpid.c:294
+#: src/pv/watchpid.c:332 src/pv/watchpid.c:349
+msgid "pid"
 msgstr ""

-#: src/pv/display.c:122
-msgid "yzafpnum KMGTPEZY"
-msgstr ""
-
-#: src/pv/display.c:532 src/pv/transfer.c:679
-msgid "buffer allocation failed"
-msgstr "erro alocando o buffer"
-
-#: src/pv/display.c:592 src/pv/transfer.c:458
-msgid "B"
-msgstr ""
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "/s"
-msgstr ""
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "B/s"
-msgstr "B/s"
-
-#: src/pv/display.c:671 src/pv/display.c:676 src/pv/display.c:738
-msgid "ETA"
-msgstr "ETA"
-
 #: src/pv/transfer.c:341
 msgid "read failed"
 msgstr "erro de leitura"

 #: src/pv/transfer.c:359
 msgid "warning: read errors detected"
-msgstr ""
+msgstr "aviso: erros de leitura detectados"

 #: src/pv/transfer.c:374
 msgid "file is not seekable"
-msgstr ""
+msgstr "não pode mover dentro do arquivo"

 #: src/pv/transfer.c:437
-#, fuzzy
 msgid "failed to seek past error"
-msgstr "erro obtendo informações do arquivo"
+msgstr "não pode ir além do erro"

 #: src/pv/transfer.c:456
 msgid "skipped past read error"
+msgstr "ignorado erro de leitura"
+
+#: src/pv/transfer.c:458 src/pv/display.c:687
+msgid "B"
 msgstr ""

 #: src/pv/transfer.c:631
 msgid "write failed"
-msgstr "erro de gravação"
+msgstr "erro de gravação"
+
+#: src/pv/transfer.c:679 src/pv/display.c:618
+msgid "buffer allocation failed"
+msgstr "erro alocando o buffer"

 #: src/pv/transfer.c:770
 msgid "select call failed"
-msgstr "erro na chamada da função select"
+msgstr "erro na chamada da função select"

-#: src/pv/state.c:33
+#: src/pv/state.c:25
+msgid "history structure allocation failed"
+msgstr ""
+
+#: src/pv/state.c:55
 msgid "none"
 msgstr ""

+#: src/pv/display.c:151
+msgid "yzafpnum kMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:156
+msgid "yzafpnum KMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:683
+msgid "b"
+msgstr ""
+
+#: src/pv/display.c:738 src/pv/display.c:752
+msgid "b/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:757
+msgid "/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:758
+msgid "B/s"
+msgstr "B/s"
+
+#: src/pv/display.c:793 src/pv/display.c:798 src/pv/display.c:860
+msgid "ETA"
+msgstr "ETA"
+
+#: src/pv/watchpid.c:81 src/pv/watchpid.c:95 src/pv/watchpid.c:106
+#: src/pv/watchpid.c:170 src/pv/watchpid.c:180 src/pv/watchpid.c:194
+msgid "fd"
+msgstr ""
+
+#: src/pv/watchpid.c:109 src/pv/watchpid.c:197
+msgid "not a regular file or block device"
+msgstr "não é um arquivo regular ou dispositivo de bloqueio"
+
 #: src/main/version.c:17
-#, fuzzy, c-format
+#, c-format
 msgid "%s %s - Copyright %s %s"
 msgstr "%s %s - Copyright(C) %s %s"

@@ -146,8 +158,8 @@ msgid ""
 "This program is free software, and is being distributed under the\n"
 "terms of the Artistic License 2.0."
 msgstr ""
-"Este programa é um software livre, distribuído sob os termos da\n"
-"Licença Artística."
+"Este programa é um software livre, distribuído sob os termos da\n"
+"Licença Artística."

 #: src/main/version.c:28
 msgid ""
@@ -155,89 +167,13 @@ msgid ""
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
-"Este programa é distribuído com o intuito de que seja útil,\n"
-"porém SEM QUAISQUER GARANTIAS; sem inclusive as garantias implícitas de\n"
-"COMERCIALIZAÇÃO e ADEQUAÇÃO A OBJETIVOS PARTICULARES."
-
-#: src/main/main.c:73
-#, fuzzy
-msgid "state allocation failed"
-msgstr "erro alocando o buffer"
-
-#: src/main/options.c:98
-#, c-format
-msgid "%s: option structure allocation failed (%s)"
-msgstr "%s: erro na alocação da estrutura de opções (%s)"
-
-#: src/main/options.c:114
-#, c-format
-msgid "%s: option structure argv allocation failed (%s)"
-msgstr "%s: erro na alocação da estrutura de opções argv (%s)"
-
-#: src/main/options.c:154
-msgid "integer argument expected"
-msgstr ""
-
-#: src/main/options.c:165
-msgid "numeric argument expected"
-msgstr ""
-
-#: src/main/options.c:176
-msgid "process ID or pid:fd pair expected"
-msgstr ""
-
-#: src/main/options.c:183
-msgid "invalid process ID"
-msgstr ""
-
-#: src/main/options.c:317
-#, c-format
-msgid "Try `%s --help' for more information."
-msgstr "Tente `%s --help' para maiores informações."
-
-#: src/main/options.c:321
-#, fuzzy, c-format
-msgid "Try `%s -h' for more information."
-msgstr "Tente `%s -h' para maiores informações."
-
-#: src/main/options.c:338
-#, c-format
-msgid ""
-"%s: cannot use line mode or transfer modifier options when watching file "
-"descriptors"
-msgstr ""
-
-#: src/main/options.c:348
-#, c-format
-msgid "%s: cannot use cursor positioning when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:358
-#, c-format
-msgid "%s: cannot use remote control when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:368
-#, c-format
-msgid "%s: cannot transfer files when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:378
-#, c-format
-msgid "%s: -d: not available on systems without /proc/self/fdinfo"
-msgstr ""
-
-#: src/main/remote.c:218
-msgid "message not received"
-msgstr ""
-
-#: src/main/remote.c:324
-msgid "IPC not supported on this system"
-msgstr ""
+"Este programa é distribuído com o intuito de que seja útil,\n"
+"porém SEM QUAISQUER GARANTIAS; sem inclusive as garantias implícitas de\n"
+"COMERCIALIZAÇÃO e ADEQUAÇÃO A OBJETIVOS PARTICULARES."

 #: src/main/help.c:31
 msgid "show progress bar"
-msgstr "exibe barra de progressão"
+msgstr "exibe barra de progressão"

 #: src/main/help.c:33
 msgid "show elapsed time"
@@ -245,202 +181,282 @@ msgstr "exibe tempo passado"

 #: src/main/help.c:35
 msgid "show estimated time of arrival (completion)"
-msgstr "exibe o tempo estimado de término"
+msgstr "exibe o tempo estimado de término"

 #: src/main/help.c:38
-#, fuzzy
 msgid "show absolute estimated time of arrival (completion)"
-msgstr "exibe o tempo estimado de término"
+msgstr "exibe o tempo absoluto estimado de término"

 #: src/main/help.c:40
 msgid "show data transfer rate counter"
-msgstr "exibe a taxa de transferência"
+msgstr "exibe a taxa de transferência"

 #: src/main/help.c:42
 msgid "show data transfer average rate counter"
-msgstr ""
+msgstr "exibe o contador da taxa média de transferência de dados"

-#: src/main/help.c:44
-msgid "show number of bytes transferred"
-msgstr "exibe a quantidade de bytes transferidos"
-
-#: src/main/help.c:46
-msgid "show percentage of transfer buffer in use"
-msgstr ""
-
-#: src/main/help.c:47
-msgid "NUM"
-msgstr ""
-
-#: src/main/help.c:48
-msgid "show NUM bytes last written"
-msgstr ""
-
-#: src/main/help.c:49
-msgid "FORMAT"
-msgstr ""
-
-#: src/main/help.c:50
-msgid "set output format to FORMAT"
-msgstr ""
-
-#: src/main/help.c:52
-msgid "output percentages, not visual information"
-msgstr "exibe apenas as porcentagens, sem informações visuais"
-
-#: src/main/help.c:54
-msgid "do not output any transfer information at all"
-msgstr "executa programa sem exibir quaisquer informações"
-
-#: src/main/help.c:57
-msgid "display nothing until first byte transferred"
-msgstr "não exibe nada até iniciar o processamento"
-
-#: src/main/help.c:58 src/main/help.c:66
+#: src/main/help.c:43 src/main/help.c:63 src/main/help.c:71
 msgid "SEC"
 msgstr ""

-#: src/main/help.c:59
-#, fuzzy
-msgid "display nothing until SEC seconds have passed"
-msgstr "não exibe nada até iniciar o processamento"
+#: src/main/help.c:45
+msgid "compute average rate over past SEC seconds (default 30s)"
+msgstr ""

-#: src/main/help.c:60
+#: src/main/help.c:47
+msgid "show number of bytes transferred"
+msgstr "exibe a quantidade de bytes transferidos"
+
+#: src/main/help.c:49
+msgid "show number of bits transferred"
+msgstr ""
+
+#: src/main/help.c:51
+msgid "show percentage of transfer buffer in use"
+msgstr "exibe a porcentagem de buffer de transferência em uso"
+
+#: src/main/help.c:52
+msgid "NUM"
+msgstr ""
+
+#: src/main/help.c:53
+msgid "show NUM bytes last written"
+msgstr "exibe NUM bytes gravados pela última vez"
+
+#: src/main/help.c:54
+msgid "FORMAT"
+msgstr ""
+
+#: src/main/help.c:55
+msgid "set output format to FORMAT"
+msgstr "definir o formato de saída para FORMAT"
+
+#: src/main/help.c:57
+msgid "output percentages, not visual information"
+msgstr "exibe apenas as porcentagens, sem informações visuais"
+
+#: src/main/help.c:59
+msgid "do not output any transfer information at all"
+msgstr "executa programa sem exibir quaisquer informações"
+
+#: src/main/help.c:62
+msgid "display nothing until first byte transferred"
+msgstr "não exibe nada até iniciar o processamento"
+
+#: src/main/help.c:64
+msgid "display nothing until SEC seconds have passed"
+msgstr "não exibir nada até que os segundos SEC tenham passado"
+
+#: src/main/help.c:65
 msgid "SIZE"
 msgstr ""

-#: src/main/help.c:61
+#: src/main/help.c:66
 msgid "set estimated data size to SIZE bytes"
 msgstr "seta a quantidade estimada de dados em SIZE bytes"

-#: src/main/help.c:63
-msgid "count lines instead of bytes"
-msgstr ""
-
-#: src/main/help.c:65
-msgid "lines are null-terminated"
-msgstr ""
-
-#: src/main/help.c:67
-msgid "update every SEC seconds"
-msgstr "atualiza informações a cada SEC segundos"
-
 #: src/main/help.c:68
+msgid "count lines instead of bytes"
+msgstr "contar linhas em vez de bytes"
+
+#: src/main/help.c:70
+msgid "lines are null-terminated"
+msgstr "linhas são terminadas em nulo"
+
+#: src/main/help.c:72
+msgid "update every SEC seconds"
+msgstr "atualiza informações a cada SEC segundos"
+
+#: src/main/help.c:73
 msgid "WIDTH"
 msgstr ""

-#: src/main/help.c:69
+#: src/main/help.c:74
 msgid "assume terminal is WIDTH characters wide"
-msgstr "assume que terminal possui WIDTH caracteres de largura"
+msgstr "presuma que o terminal tem WIDTH caracteres de largura"

-#: src/main/help.c:70
+#: src/main/help.c:75
 msgid "HEIGHT"
 msgstr ""

-#: src/main/help.c:71
+#: src/main/help.c:76
 msgid "assume terminal is HEIGHT rows high"
-msgstr "assume que terminal possui WIDTH caracteres de largura"
+msgstr "presuma que o terminal tem HEIGHT caracteres de altura"

-#: src/main/help.c:72
+#: src/main/help.c:77
 msgid "NAME"
 msgstr ""

-#: src/main/help.c:73
+#: src/main/help.c:78
 msgid "prefix visual information with NAME"
-msgstr "exibe NAME antes das demais informações"
+msgstr "exibe NAME antes das demais informações"

-#: src/main/help.c:75
+#: src/main/help.c:80
 msgid "output even if standard error is not a terminal"
-msgstr "gera dados mesmo que a saída de erro seja redirecionada"
+msgstr "gera dados mesmo que a saída de erro seja redirecionada"

-#: src/main/help.c:77
+#: src/main/help.c:82
 msgid "use cursor positioning escape sequences"
 msgstr "utiliza caracteres de escape para posicionar o cursor"

-#: src/main/help.c:79
+#: src/main/help.c:84
 msgid "RATE"
 msgstr ""

-#: src/main/help.c:80
+#: src/main/help.c:85
 msgid "limit transfer to RATE bytes per second"
-msgstr "limita a transferência a RATE bytes por segundo"
+msgstr "limita a transferência a RATE bytes por segundo"

-#: src/main/help.c:81
+#: src/main/help.c:86
 msgid "BYTES"
 msgstr ""

-#: src/main/help.c:82
+#: src/main/help.c:87
 msgid "use a buffer size of BYTES"
-msgstr ""
+msgstr "use um tamanho de buffer de BYTES"

-#: src/main/help.c:84
+#: src/main/help.c:89
 msgid "never use splice(), always use read/write"
-msgstr ""
+msgstr "nunca use splice(), sempre use read/write"

-#: src/main/help.c:86
+#: src/main/help.c:91
 msgid "skip read errors in input"
-msgstr ""
+msgstr "ignorar erros de leitura em entrada"

-#: src/main/help.c:88
-#, fuzzy
+#: src/main/help.c:93
 msgid "stop after --size bytes have been transferred"
-msgstr "exibe a quantidade de bytes transferidos"
+msgstr "parar após --size bytes terem sido transferidos"

-#: src/main/help.c:90
+#: src/main/help.c:95
 msgid "PID"
 msgstr ""

-#: src/main/help.c:91
+#: src/main/help.c:96
 msgid "update settings of process PID"
-msgstr ""
+msgstr "atualizar as configurações do processo PID"

-#: src/main/help.c:94
+#: src/main/help.c:99
 msgid "FILE"
 msgstr ""

-#: src/main/help.c:95
+#: src/main/help.c:100
 msgid "save process ID in FILE"
-msgstr ""
+msgstr "salvar ID do processo em FILE"

-#: src/main/help.c:97
+#: src/main/help.c:102
 msgid "PID[:FD]"
 msgstr ""

-#: src/main/help.c:98
+#: src/main/help.c:103
 msgid "watch file FD opened by process PID"
-msgstr ""
+msgstr "assistir arquivo FD aberto pelo processo PID"

-#: src/main/help.c:101
+#: src/main/help.c:106
 msgid "show this help and exit"
 msgstr "exibe esta tela de ajuda e termina"

-#: src/main/help.c:103
+#: src/main/help.c:108
 msgid "show version information and exit"
-msgstr "exibe a versão e termina"
+msgstr "exibe a versão e termina"

-#: src/main/help.c:109
+#: src/main/help.c:114
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]..."
-msgstr "Uso: %s [OPÇÕES] [ARQUIVOS]..."
+msgstr "Uso: %s [OPÇÕES] [ARQUIVOS]..."

-#: src/main/help.c:112
+#: src/main/help.c:117
 msgid ""
 "Concatenate FILE(s), or standard input, to standard output,\n"
 "with monitoring."
 msgstr ""
-"Concatena ARQUIVO(s) ou a entrada padrão e grava na saída padrão,\n"
+"Concatena ARQUIVO(s) ou a entrada padrão e grava na saída padrão,\n"
 "com monitoramento."

-#: src/main/help.c:201
+#: src/main/help.c:212
 msgid ""
 "Debugging is enabled; export the DEBUG environment variable to define the\n"
 "output filename.\n"
 msgstr ""
+"A depuração está habilitada; exporte a variável de ambiente DEBUG para\n"
+"definir o nome do arquivo de saída.\n"

-#: src/main/help.c:205
+#: src/main/help.c:216
 #, c-format
 msgid "Please report any bugs to %s."
 msgstr "Por favor, reporte quaisquer defeitos para %s."

-#~ msgid "failed to lock terminal"
-#~ msgstr "erro abrindo o terminal"
+#: src/main/main.c:74
+msgid "state allocation failed"
+msgstr "alocação de memória de status falhou"
+
+#: src/main/main.c:248
+msgid "failed to read terminal attributes"
+msgstr ""
+
+#: src/main/remote.c:221
+msgid "message not received"
+msgstr "mensagem não recebida"
+
+#: src/main/remote.c:328
+msgid "IPC not supported on this system"
+msgstr "IPC não suportado neste sistema"
+
+#: src/main/options.c:102
+msgid "option structure allocation failed"
+msgstr "erro na alocação da estrutura de opções"
+
+#: src/main/options.c:116
+msgid "option structure argv allocation failed"
+msgstr "erro na alocação da estrutura de opções argv"
+
+#: src/main/options.c:160
+msgid "integer argument expected"
+msgstr "argumento inteiro esperado"
+
+#: src/main/options.c:171
+msgid "numeric argument expected"
+msgstr "argumento numérico esperado"
+
+#: src/main/options.c:182
+msgid "process ID or pid:fd pair expected"
+msgstr "ID do processo ou par pid:fd esperado"
+
+#: src/main/options.c:189
+msgid "invalid process ID"
+msgstr "ID de processo inválido"
+
+#: src/main/options.c:355
+#, c-format
+msgid "Try `%s --help' for more information."
+msgstr "Tente `%s --help' para maiores informações."
+
+#: src/main/options.c:359
+#, c-format
+msgid "Try `%s -h' for more information."
+msgstr "Tente `%s -h' para maiores informações."
+
+#: src/main/options.c:375
+msgid ""
+"cannot use line mode or transfer modifier options when watching file "
+"descriptors"
+msgstr ""
+"não pode usar o modo de linha ou opções de modificador de transferência ao "
+"assistir os descritores de arquivo"
+
+#: src/main/options.c:383
+msgid "cannot use cursor positioning when watching file descriptors"
+msgstr ""
+"não pode usar o posicionamento do cursor ao observar os descritores de "
+"arquivo"
+
+#: src/main/options.c:391
+msgid "cannot use remote control when watching file descriptors"
+msgstr "não pode usar o controle remoto ao assistir os descritores de arquivo"
+
+#: src/main/options.c:399
+msgid "cannot transfer files when watching file descriptors"
+msgstr "não pode transferir arquivos ao assistir descritores de arquivo"
+
+#: src/main/options.c:407
+msgid "not available on systems without /proc/self/fdinfo"
+msgstr "não disponível em sistemas sem /proc/self/fdinfo"
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-30 22:21+0100\n"
+"POT-Creation-Date: 2023-07-17 21:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,85 +16,52 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: src/pv/watchpid.c:51 src/pv/watchpid.c:66 src/pv/watchpid.c:76
-#: src/pv/watchpid.c:107 src/pv/loop.c:519 src/pv/loop.c:580 src/pv/loop.c:632
-msgid "pid"
-msgstr ""
-
-#: src/pv/watchpid.c:68 src/pv/watchpid.c:78 src/pv/watchpid.c:109
-msgid "fd"
-msgstr ""
-
-#: src/pv/watchpid.c:112
-msgid "not a regular file or block device"
-msgstr ""
-
-#: src/pv/cursor.c:53
+#: src/pv/cursor.c:80
 msgid "failed to get terminal name"
 msgstr ""

-#: src/pv/cursor.c:96
+#: src/pv/cursor.c:125
 msgid "failed to open lock file"
 msgstr ""

-#: src/pv/cursor.c:129
+#: src/pv/cursor.c:159
 msgid "lock attempt failed"
 msgstr ""

-#: src/pv/cursor.c:369
+#: src/pv/cursor.c:409
 msgid "failed to open terminal"
 msgstr ""

-#: src/pv/file.c:118
+#: src/pv/file.c:119
 msgid "failed to seek to start of output"
 msgstr ""

-#: src/pv/file.c:214
+#: src/pv/file.c:215
 msgid "failed to close file"
 msgstr ""

-#: src/pv/file.c:237
+#: src/pv/file.c:238
 msgid "failed to read file"
 msgstr ""

-#: src/pv/file.c:247
+#: src/pv/file.c:248 src/main/options.c:288
 msgid "failed to stat file"
 msgstr ""

-#: src/pv/file.c:256
+#: src/pv/file.c:257
 msgid "failed to stat output file"
 msgstr ""

-#: src/pv/file.c:279
+#: src/pv/file.c:280
 msgid "input file is output file"
 msgstr ""

-#: src/pv/display.c:117
-msgid "yzafpnum kMGTPEZY"
-msgstr ""
-
-#: src/pv/display.c:122
-msgid "yzafpnum KMGTPEZY"
-msgstr ""
-
-#: src/pv/display.c:532 src/pv/transfer.c:679
-msgid "buffer allocation failed"
-msgstr ""
-
-#: src/pv/display.c:592 src/pv/transfer.c:458
-msgid "B"
-msgstr ""
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "/s"
-msgstr ""
-
-#: src/pv/display.c:628 src/pv/display.c:636
-msgid "B/s"
-msgstr ""
-
-#: src/pv/display.c:671 src/pv/display.c:676 src/pv/display.c:738
-msgid "ETA"
+#: src/pv/loop.c:527 src/pv/loop.c:597 src/pv/loop.c:649 src/pv/watchpid.c:68
+#: src/pv/watchpid.c:79 src/pv/watchpid.c:93 src/pv/watchpid.c:104
+#: src/pv/watchpid.c:145 src/pv/watchpid.c:168 src/pv/watchpid.c:178
+#: src/pv/watchpid.c:192 src/pv/watchpid.c:285 src/pv/watchpid.c:294
+#: src/pv/watchpid.c:332 src/pv/watchpid.c:349
+msgid "pid"
 msgstr ""

 #: src/pv/transfer.c:341
@@ -117,18 +84,67 @@ msgstr ""
 msgid "skipped past read error"
 msgstr ""

+#: src/pv/transfer.c:458 src/pv/display.c:687
+msgid "B"
+msgstr ""
+
 #: src/pv/transfer.c:631
 msgid "write failed"
 msgstr ""

+#: src/pv/transfer.c:679 src/pv/display.c:618
+msgid "buffer allocation failed"
+msgstr ""
+
 #: src/pv/transfer.c:770
 msgid "select call failed"
 msgstr ""

-#: src/pv/state.c:33
+#: src/pv/state.c:25
+msgid "history structure allocation failed"
+msgstr ""
+
+#: src/pv/state.c:55
 msgid "none"
 msgstr ""

+#: src/pv/display.c:151
+msgid "yzafpnum kMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:156
+msgid "yzafpnum KMGTPEZY"
+msgstr ""
+
+#: src/pv/display.c:683
+msgid "b"
+msgstr ""
+
+#: src/pv/display.c:738 src/pv/display.c:752
+msgid "b/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:757
+msgid "/s"
+msgstr ""
+
+#: src/pv/display.c:742 src/pv/display.c:758
+msgid "B/s"
+msgstr ""
+
+#: src/pv/display.c:793 src/pv/display.c:798 src/pv/display.c:860
+msgid "ETA"
+msgstr ""
+
+#: src/pv/watchpid.c:81 src/pv/watchpid.c:95 src/pv/watchpid.c:106
+#: src/pv/watchpid.c:170 src/pv/watchpid.c:180 src/pv/watchpid.c:194
+msgid "fd"
+msgstr ""
+
+#: src/pv/watchpid.c:109 src/pv/watchpid.c:197
+msgid "not a regular file or block device"
+msgstr ""
+
 #: src/main/version.c:17
 #, c-format
 msgid "%s %s - Copyright %s %s"
@@ -152,81 +168,6 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""

-#: src/main/main.c:73
-msgid "state allocation failed"
-msgstr ""
-
-#: src/main/options.c:98
-#, c-format
-msgid "%s: option structure allocation failed (%s)"
-msgstr ""
-
-#: src/main/options.c:114
-#, c-format
-msgid "%s: option structure argv allocation failed (%s)"
-msgstr ""
-
-#: src/main/options.c:154
-msgid "integer argument expected"
-msgstr ""
-
-#: src/main/options.c:165
-msgid "numeric argument expected"
-msgstr ""
-
-#: src/main/options.c:176
-msgid "process ID or pid:fd pair expected"
-msgstr ""
-
-#: src/main/options.c:183
-msgid "invalid process ID"
-msgstr ""
-
-#: src/main/options.c:317
-#, c-format
-msgid "Try `%s --help' for more information."
-msgstr ""
-
-#: src/main/options.c:321
-#, c-format
-msgid "Try `%s -h' for more information."
-msgstr ""
-
-#: src/main/options.c:338
-#, c-format
-msgid ""
-"%s: cannot use line mode or transfer modifier options when watching file "
-"descriptors"
-msgstr ""
-
-#: src/main/options.c:348
-#, c-format
-msgid "%s: cannot use cursor positioning when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:358
-#, c-format
-msgid "%s: cannot use remote control when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:368
-#, c-format
-msgid "%s: cannot transfer files when watching file descriptors"
-msgstr ""
-
-#: src/main/options.c:378
-#, c-format
-msgid "%s: -d: not available on systems without /proc/self/fdinfo"
-msgstr ""
-
-#: src/main/remote.c:218
-msgid "message not received"
-msgstr ""
-
-#: src/main/remote.c:324
-msgid "IPC not supported on this system"
-msgstr ""
-
 #: src/main/help.c:31
 msgid "show progress bar"
 msgstr ""
@@ -251,180 +192,260 @@ msgstr ""
 msgid "show data transfer average rate counter"
 msgstr ""

-#: src/main/help.c:44
-msgid "show number of bytes transferred"
-msgstr ""
-
-#: src/main/help.c:46
-msgid "show percentage of transfer buffer in use"
-msgstr ""
-
-#: src/main/help.c:47
-msgid "NUM"
-msgstr ""
-
-#: src/main/help.c:48
-msgid "show NUM bytes last written"
-msgstr ""
-
-#: src/main/help.c:49
-msgid "FORMAT"
-msgstr ""
-
-#: src/main/help.c:50
-msgid "set output format to FORMAT"
-msgstr ""
-
-#: src/main/help.c:52
-msgid "output percentages, not visual information"
-msgstr ""
-
-#: src/main/help.c:54
-msgid "do not output any transfer information at all"
-msgstr ""
-
-#: src/main/help.c:57
-msgid "display nothing until first byte transferred"
-msgstr ""
-
-#: src/main/help.c:58 src/main/help.c:66
+#: src/main/help.c:43 src/main/help.c:63 src/main/help.c:71
 msgid "SEC"
 msgstr ""

+#: src/main/help.c:45
+msgid "compute average rate over past SEC seconds (default 30s)"
+msgstr ""
+
+#: src/main/help.c:47
+msgid "show number of bytes transferred"
+msgstr ""
+
+#: src/main/help.c:49
+msgid "show number of bits transferred"
+msgstr ""
+
+#: src/main/help.c:51
+msgid "show percentage of transfer buffer in use"
+msgstr ""
+
+#: src/main/help.c:52
+msgid "NUM"
+msgstr ""
+
+#: src/main/help.c:53
+msgid "show NUM bytes last written"
+msgstr ""
+
+#: src/main/help.c:54
+msgid "FORMAT"
+msgstr ""
+
+#: src/main/help.c:55
+msgid "set output format to FORMAT"
+msgstr ""
+
+#: src/main/help.c:57
+msgid "output percentages, not visual information"
+msgstr ""
+
 #: src/main/help.c:59
+msgid "do not output any transfer information at all"
+msgstr ""
+
+#: src/main/help.c:62
+msgid "display nothing until first byte transferred"
+msgstr ""
+
+#: src/main/help.c:64
 msgid "display nothing until SEC seconds have passed"
 msgstr ""

-#: src/main/help.c:60
+#: src/main/help.c:65
 msgid "SIZE"
 msgstr ""

-#: src/main/help.c:61
+#: src/main/help.c:66
 msgid "set estimated data size to SIZE bytes"
 msgstr ""

-#: src/main/help.c:63
+#: src/main/help.c:68
 msgid "count lines instead of bytes"
 msgstr ""

-#: src/main/help.c:65
+#: src/main/help.c:70
 msgid "lines are null-terminated"
 msgstr ""

-#: src/main/help.c:67
+#: src/main/help.c:72
 msgid "update every SEC seconds"
 msgstr ""

-#: src/main/help.c:68
+#: src/main/help.c:73
 msgid "WIDTH"
 msgstr ""

-#: src/main/help.c:69
+#: src/main/help.c:74
 msgid "assume terminal is WIDTH characters wide"
 msgstr ""

-#: src/main/help.c:70
+#: src/main/help.c:75
 msgid "HEIGHT"
 msgstr ""

-#: src/main/help.c:71
+#: src/main/help.c:76
 msgid "assume terminal is HEIGHT rows high"
 msgstr ""

-#: src/main/help.c:72
+#: src/main/help.c:77
 msgid "NAME"
 msgstr ""

-#: src/main/help.c:73
+#: src/main/help.c:78
 msgid "prefix visual information with NAME"
 msgstr ""

-#: src/main/help.c:75
+#: src/main/help.c:80
 msgid "output even if standard error is not a terminal"
 msgstr ""

-#: src/main/help.c:77
+#: src/main/help.c:82
 msgid "use cursor positioning escape sequences"
 msgstr ""

-#: src/main/help.c:79
+#: src/main/help.c:84
 msgid "RATE"
 msgstr ""

-#: src/main/help.c:80
+#: src/main/help.c:85
 msgid "limit transfer to RATE bytes per second"
 msgstr ""

-#: src/main/help.c:81
+#: src/main/help.c:86
 msgid "BYTES"
 msgstr ""

-#: src/main/help.c:82
+#: src/main/help.c:87
 msgid "use a buffer size of BYTES"
 msgstr ""

-#: src/main/help.c:84
+#: src/main/help.c:89
 msgid "never use splice(), always use read/write"
 msgstr ""

-#: src/main/help.c:86
+#: src/main/help.c:91
 msgid "skip read errors in input"
 msgstr ""

-#: src/main/help.c:88
+#: src/main/help.c:93
 msgid "stop after --size bytes have been transferred"
 msgstr ""

-#: src/main/help.c:90
+#: src/main/help.c:95
 msgid "PID"
 msgstr ""

-#: src/main/help.c:91
+#: src/main/help.c:96
 msgid "update settings of process PID"
 msgstr ""

-#: src/main/help.c:94
+#: src/main/help.c:99
 msgid "FILE"
 msgstr ""

-#: src/main/help.c:95
+#: src/main/help.c:100
 msgid "save process ID in FILE"
 msgstr ""

-#: src/main/help.c:97
+#: src/main/help.c:102
 msgid "PID[:FD]"
 msgstr ""

-#: src/main/help.c:98
+#: src/main/help.c:103
 msgid "watch file FD opened by process PID"
 msgstr ""

-#: src/main/help.c:101
+#: src/main/help.c:106
 msgid "show this help and exit"
 msgstr ""

-#: src/main/help.c:103
+#: src/main/help.c:108
 msgid "show version information and exit"
 msgstr ""

-#: src/main/help.c:109
+#: src/main/help.c:114
 #, c-format
 msgid "Usage: %s [OPTION] [FILE]..."
 msgstr ""

-#: src/main/help.c:112
+#: src/main/help.c:117
 msgid ""
 "Concatenate FILE(s), or standard input, to standard output,\n"
 "with monitoring."
 msgstr ""

-#: src/main/help.c:201
+#: src/main/help.c:212
 msgid ""
 "Debugging is enabled; export the DEBUG environment variable to define the\n"
 "output filename.\n"
 msgstr ""

-#: src/main/help.c:205
+#: src/main/help.c:216
 #, c-format
 msgid "Please report any bugs to %s."
 msgstr ""
+
+#: src/main/main.c:74
+msgid "state allocation failed"
+msgstr ""
+
+#: src/main/main.c:248
+msgid "failed to read terminal attributes"
+msgstr ""
+
+#: src/main/remote.c:221
+msgid "message not received"
+msgstr ""
+
+#: src/main/remote.c:328
+msgid "IPC not supported on this system"
+msgstr ""
+
+#: src/main/options.c:102
+msgid "option structure allocation failed"
+msgstr ""
+
+#: src/main/options.c:116
+msgid "option structure argv allocation failed"
+msgstr ""
+
+#: src/main/options.c:160
+msgid "integer argument expected"
+msgstr ""
+
+#: src/main/options.c:171
+msgid "numeric argument expected"
+msgstr ""
+
+#: src/main/options.c:182
+msgid "process ID or pid:fd pair expected"
+msgstr ""
+
+#: src/main/options.c:189
+msgid "invalid process ID"
+msgstr ""
+
+#: src/main/options.c:355
+#, c-format
+msgid "Try `%s --help' for more information."
+msgstr ""
+
+#: src/main/options.c:359
+#, c-format
+msgid "Try `%s -h' for more information."
+msgstr ""
+
+#: src/main/options.c:375
+msgid ""
+"cannot use line mode or transfer modifier options when watching file "
+"descriptors"
+msgstr ""
+
+#: src/main/options.c:383
+msgid "cannot use cursor positioning when watching file descriptors"
+msgstr ""
+
+#: src/main/options.c:391
+msgid "cannot use remote control when watching file descriptors"
+msgstr ""
+
+#: src/main/options.c:399
+msgid "cannot transfer files when watching file descriptors"
+msgstr ""
+
+#: src/main/options.c:407
+msgid "not available on systems without /proc/self/fdinfo"
+msgstr ""
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <signal.h>

 #ifdef HAVE_IPC
 #include <sys/ipc.h>
@@ -34,6 +35,32 @@
 #endif				/* HAVE_IPC */


+/*
+ * Write the given buffer to the given file descriptor, retrying until all
+ * bytes have been written or an error has occurred.
+ */
+static void write_retry(int fd, const char *buf, size_t count)
+{
+	while (count > 0) {
+		ssize_t nwritten;
+
+		nwritten = write(fd, buf, count);
+
+		if (nwritten < 0) {
+			if ((EINTR == errno) || (EAGAIN == errno)) {
+				continue;
+			}
+			return;
+		}
+		if (nwritten < 1)
+			return;
+
+		count -= nwritten;
+		buf += nwritten;
+	}
+}
+
+
 /*
 * Create a per-euid, per-tty, lockfile in ${TMPDIR:-${TMP:-/tmp}} for the
 * tty on the given file descriptor.
@@ -69,15 +96,17 @@ static void pv_crs_open_lockfile(pvstate_t state, int fd)
 	if (!tmpdir)
 		tmpdir = "/tmp";

+	memset(state->crs_lock_file, 0, sizeof(state->crs_lock_file));
 #ifdef HAVE_SNPRINTF
-	snprintf(state->crs_lock_file, sizeof(state->crs_lock_file) - 1,
-		 "%s/pv-%s-%i.lock", tmpdir, basename(ttydev),
-		 (int) geteuid());
+	(void) snprintf(state->crs_lock_file,
+			sizeof(state->crs_lock_file) - 1,
+			"%s/pv-%s-%i.lock", tmpdir, basename(ttydev),
+			(int) geteuid());
 #else
-	sprintf(state->crs_lock_file,
-		"%.*s/pv-%8s-%i.lock",
-		sizeof(state->crs_lock_file) - 64, tmpdir,
-		basename(ttydev), (int) geteuid());
+	(void) sprintf(state->crs_lock_file,
+		       "%.*s/pv-%8s-%i.lock",
+		       sizeof(state->crs_lock_file) - 64, tmpdir,
+		       basename(ttydev), (int) geteuid());
 #endif

 	/*
@@ -113,8 +142,9 @@ static void pv_crs_lock(pvstate_t state, int fd)
 	if (state->crs_lock_fd >= 0)
 		lock_fd = state->crs_lock_fd;

-	lock.l_type = F_WRLCK;
-	lock.l_whence = SEEK_SET;
+	memset(&lock, 0, sizeof(lock));
+	lock.l_type = (short) F_WRLCK;
+	lock.l_whence = (short) SEEK_SET;
 	lock.l_start = 0;
 	lock.l_len = 1;
 	while (fcntl(lock_fd, F_SETLKW, &lock) < 0) {
@@ -155,11 +185,12 @@ static void pv_crs_unlock(pvstate_t state, int fd)
 	if (state->crs_lock_fd >= 0)
 		lock_fd = state->crs_lock_fd;

-	lock.l_type = F_UNLCK;
-	lock.l_whence = SEEK_SET;
+	memset(&lock, 0, sizeof(lock));
+	lock.l_type = (short) F_UNLCK;
+	lock.l_whence = (short) SEEK_SET;
 	lock.l_start = 0;
 	lock.l_len = 1;
-	fcntl(lock_fd, F_SETLK, &lock);
+	(void) fcntl(lock_fd, F_SETLK, &lock);

 	if (state->crs_lock_fd >= 0) {
 		debug("%s: %s", state->crs_lock_file,
@@ -181,10 +212,11 @@ static void pv_crs_ipccount(pvstate_t state)
 {
 	struct shmid_ds buf;

+	memset(&buf, 0, sizeof(buf));
 	buf.shm_nattch = 0;

-	shmctl(state->crs_shmid, IPC_STAT, &buf);
-	state->crs_pvcount = buf.shm_nattch;
+	(void) shmctl(state->crs_shmid, IPC_STAT, &buf);
+	state->crs_pvcount = (int) (buf.shm_nattch);

 	if (state->crs_pvcount > state->crs_pvmax)
 		state->crs_pvmax = state->crs_pvcount;
@@ -204,23 +236,29 @@ static int pv_crs_get_ypos(int terminalfd)
 	struct termios old_tty;
 	char cpr[32];
 	int ypos;
-	int r;
+	ssize_t r;
 #ifdef CURSOR_ANSWERBACK_BYTE_BY_BYTE
 	int got;
 #endif				/* CURSOR_ANSWERBACK_BYTE_BY_BYTE */

-	tcgetattr(terminalfd, &tty);
-	tcgetattr(terminalfd, &old_tty);
+	if (0 != tcgetattr(terminalfd, &tty)) {
+		debug("%s: %s", "tcgetattr (1) failed", strerror(errno));
+	}
+	if (0 != tcgetattr(terminalfd, &old_tty)) {
+		debug("%s: %s", "tcgetattr (2) failed", strerror(errno));
+	}
 	tty.c_lflag &= ~(ICANON | ECHO);
-	tcsetattr(terminalfd, TCSANOW | TCSAFLUSH, &tty);
+	if (0 != tcsetattr(terminalfd, TCSANOW | TCSAFLUSH, &tty)) {
+		debug("%s: %s", "tcsetattr (1) failed", strerror(errno));
+	}

-	write(terminalfd, "\033[6n", 4);
+	write_retry(terminalfd, "\033[6n", 4);

 	memset(cpr, 0, sizeof(cpr));

 #ifdef CURSOR_ANSWERBACK_BYTE_BY_BYTE
 	/* Read answerback byte by byte - fails on AIX */
-	for (got = 0, r = 0; got < sizeof(cpr) - 2; got += r) {
+	for (got = 0, r = 0; got < (int) (sizeof(cpr) - 2); got += r) {
 		r = read(terminalfd, cpr + got, 1);
 		if (r <= 0) {
 			debug("got=%d, r=%d: %s", got, r, strerror(errno));
@@ -249,9 +287,11 @@ static int pv_crs_get_ypos(int terminalfd)
 	}
 #endif				/* CURSOR_ANSWERBACK_BYTE_BY_BYTE */

-	ypos = pv_getnum_i(cpr + 2);
+	ypos = (int) pv_getnum_ui(cpr + 2);

-	tcsetattr(terminalfd, TCSANOW | TCSAFLUSH, &old_tty);
+	if (0 != tcsetattr(terminalfd, TCSANOW | TCSAFLUSH, &old_tty)) {
+		debug("%s: %s", "tcsetattr (2) failed", strerror(errno));
+	}

 	debug("%s: %d", "ypos", ypos);

@@ -281,7 +321,7 @@ static int pv_crs_ipcinit(pvstate_t state, char *ttyfile, int terminalfd)
 	 * we don't end up interfering in any way with instances of `pv'
 	 * running on another terminal.
 	 */
-	key = ftok(ttyfile, 'p');
+	key = ftok(ttyfile, (int) 'p');
 	if (-1 == key) {
 		debug("%s: %s\n", "ftok failed", strerror(errno));
 		return 1;
@@ -300,7 +340,7 @@ static int pv_crs_ipcinit(pvstate_t state, char *ttyfile, int terminalfd)
 		return 1;
 	}

-	state->crs_y_top = shmat(state->crs_shmid, 0, 0);
+	state->crs_y_top = shmat(state->crs_shmid, NULL, 0);

 	pv_crs_ipccount(state);

@@ -347,7 +387,7 @@ void pv_crs_init(pvstate_t state)
 	int fd;

 	state->crs_lock_fd = -2;
-	state->crs_lock_file[0] = 0;
+	state->crs_lock_file[0] = '\0';

 	if (!state->cursor)
 		return;
@@ -368,13 +408,13 @@ void pv_crs_init(pvstate_t state)
 		pv_error(state, "%s: %s: %s",
 			 _("failed to open terminal"), ttyfile,
 			 strerror(errno));
-		state->cursor = 0;
+		state->cursor = false;
 		return;
 	}
 #ifdef HAVE_IPC
 	if (pv_crs_ipcinit(state, ttyfile, fd) != 0) {
 		debug("%s", "ipcinit failed, setting noipc flag");
-		state->crs_noipc = 1;
+		state->crs_noipc = true;
 	}

 	/*
@@ -397,14 +437,14 @@ void pv_crs_init(pvstate_t state)
 		 * initial ypos.
 		 */
 		if (state->crs_y_start > 0)
-			write(STDERR_FILENO, "\n", 1);
+			write_retry(STDERR_FILENO, "\n", 1);
 		pv_crs_unlock(state, fd);

 		if (state->crs_y_start < 1)
 			state->cursor = 0;
 	}

-	close(fd);
+	(void) close(fd);
 }


@@ -465,7 +505,7 @@ void pv_crs_update(pvstate_t state, char *str)

 #ifdef HAVE_IPC
 	if (!state->crs_noipc) {
-		if (state->crs_needreinit)
+		if (state->crs_needreinit > 0)
 			pv_crs_reinit(state);

 		pv_crs_ipccount(state);
@@ -488,7 +528,8 @@ void pv_crs_update(pvstate_t state, char *str)
 	 * scroll the screen (only if we're the first `pv'), and then move
 	 * our initial Y co-ordinate up.
 	 */
-	if (((state->crs_y_start + state->crs_pvmax) > state->height)
+	if (((state->crs_y_start + state->crs_pvmax) >
+	     (int) (state->height))
 	    && (!state->crs_noipc)
 	    ) {
 		int offs;
@@ -509,10 +550,16 @@ void pv_crs_update(pvstate_t state, char *str)
 		if (0 == state->crs_y_offset) {
 			pv_crs_lock(state, STDERR_FILENO);

-			sprintf(pos, "\033[%d;1H", state->height);
-			write(STDERR_FILENO, pos, strlen(pos));
+			memset(pos, 0, sizeof(pos));
+# ifdef HAVE_SNPRINTF
+			(void) snprintf(pos, sizeof(pos) - 1, "\033[%u;1H",
+					state->height);
+# else
+			(void) sprintf(pos, "\033[%u;1H", state->height);
+# endif
+			write_retry(STDERR_FILENO, pos, strlen(pos));
 			for (; offs > 0; offs--) {
-				write(STDERR_FILENO, "\n", 1);
+				write_retry(STDERR_FILENO, "\n", 1);
 			}

 			pv_crs_unlock(state, STDERR_FILENO);
@@ -531,12 +578,18 @@ void pv_crs_update(pvstate_t state, char *str)
 	 */
 	if ((y < 1) || (y > 999999))
 		y = 1;
-	sprintf(pos, "\033[%d;1H", y);
+
+	memset(pos, 0, sizeof(pos));
+#ifdef HAVE_SNPRINTF
+	(void) snprintf(pos, sizeof(pos) - 1, "\033[%d;1H", y);
+#else
+	(void) sprintf(pos, "\033[%d;1H", y);
+#endif

 	pv_crs_lock(state, STDERR_FILENO);

-	write(STDERR_FILENO, pos, strlen(pos));
-	write(STDERR_FILENO, str, strlen(str));
+	write_retry(STDERR_FILENO, pos, strlen(pos));
+	write_retry(STDERR_FILENO, str, strlen(str));

 	pv_crs_unlock(state, STDERR_FILENO);
 }
@@ -548,11 +601,11 @@ void pv_crs_update(pvstate_t state, char *str)
 void pv_crs_fini(pvstate_t state)
 {
 	char pos[32];
-	int y;
+	unsigned int y;

 	debug("%s", "fini");

-	y = state->crs_y_start;
+	y = (unsigned int) (state->crs_y_start);

 #ifdef HAVE_IPC
 	if ((state->crs_pvmax > 0) && (!state->crs_noipc))
@@ -568,34 +621,39 @@ void pv_crs_fini(pvstate_t state)
 	if ((y < 1) || (y > 999999))
 		y = 1;

-	sprintf(pos, "\033[%d;1H\n", y);
+	memset(pos, 0, sizeof(pos));
+#ifdef HAVE_SNPRINTF
+	(void) snprintf(pos, sizeof(pos) - 1, "\033[%u;1H\n", y);
+#else
+	(void) sprintf(pos, "\033[%u;1H\n", y);
+#endif

 	pv_crs_lock(state, STDERR_FILENO);

-	write(STDERR_FILENO, pos, strlen(pos));
+	write_retry(STDERR_FILENO, pos, strlen(pos));

 #ifdef HAVE_IPC
 	pv_crs_ipccount(state);
-	shmdt((void *) state->crs_y_top);
+	(void) shmdt((void *) state->crs_y_top);

 	/*
 	 * If we are the last instance detaching from the shared memory,
 	 * delete it so it's not left lying around.
 	 */
 	if (state->crs_pvcount < 2)
-		shmctl(state->crs_shmid, IPC_RMID, 0);
+		(void) shmctl(state->crs_shmid, IPC_RMID, NULL);

 #endif				/* HAVE_IPC */

 	pv_crs_unlock(state, STDERR_FILENO);

 	if (state->crs_lock_fd >= 0) {
-		close(state->crs_lock_fd);
+		(void) close(state->crs_lock_fd);
 		/*
 		 * We can get away with removing this on exit because all
 		 * the other PVs will be finishing at the same sort of time.
 		 */
-		remove(state->crs_lock_file);
+		(void) remove(state->crs_lock_file);
 	}
 }

@@ -28,12 +28,48 @@ void pv_error(pvstate_t state, char *format, ...)
 		fprintf(stderr, "\n");
 	fprintf(stderr, "%s: ", state->program_name);
 	va_start(ap, format);
-	vfprintf(stderr, format, ap);
+	(void) vfprintf(stderr, format, ap);
 	va_end(ap);
 	fprintf(stderr, "\n");
 }


+/*
+ * Return true if we are the foreground process on the terminal, or if we
+ * aren't outputting to a terminal; false otherwise.
+ */
+bool pv_in_foreground(void)
+{
+	pid_t our_process_group;
+	pid_t tty_process_group;
+
+	if (0 == isatty(STDERR_FILENO)) {
+		debug("%s: true: %s", "pv_in_foreground", "not a tty");
+		return true;
+	}
+
+	our_process_group = getpgrp();
+	tty_process_group = tcgetpgrp(STDERR_FILENO);
+
+	if (tty_process_group == -1 && errno == ENOTTY) {
+		debug("%s: true: %s", "pv_in_foreground",
+		      "tty_process_group is -1, errno is ENOTTY");
+		return true;
+	}
+
+	if (our_process_group == tty_process_group) {
+		debug("%s: true: %s", "pv_in_foreground",
+		      "our_process_group == tty_process_group");
+		return true;
+	}
+
+	debug("%s: false: our_process_group=%d, tty_process_group=%d",
+	      "pv_in_foreground", our_process_group, tty_process_group);
+
+	return false;
+}
+
+
 /*
 * Fill in *width and *height with the current terminal size,
 * if possible.
@@ -43,7 +79,7 @@ void pv_screensize(unsigned int *width, unsigned int *height)
 #ifdef TIOCGWINSZ
 	struct winsize wsz;

-	if (isatty(STDERR_FILENO)) {
+	if (0 != isatty(STDERR_FILENO)) {
 		if (0 == ioctl(STDERR_FILENO, TIOCGWINSZ, &wsz)) {
 			*width = wsz.ws_col;
 			*height = wsz.ws_row;
@@ -74,16 +110,14 @@ static long pv__calc_percentage(long long so_far, const long long total)
 * number of seconds until completion.
 */
 static long pv__calc_eta(const long long so_far, const long long total,
-			 const long elapsed)
+			 const long rate)
 {
 	long long amount_left;

-	if (so_far < 1)
+	if ((so_far < 1) || (0 == rate))
 		return 0;

-	amount_left = total - so_far;
-	amount_left *= (long long) elapsed;
-	amount_left /= so_far;
+	amount_left = (total - so_far) / rate;

 	return (long) amount_left;
 }
@@ -213,7 +247,11 @@ static void pv__sizestr(char *buffer, int bufsize, char *format,
 			str_disp, si_prefix, suffix);
 	}

+#ifdef HAVE_SNPRINTF
 	snprintf(buffer, bufsize, format, sizestr_buffer);
+#else
+	sprintf(buffer, format, sizestr_buffer);
+#endif
 }


@@ -274,7 +312,7 @@ static void pv__format_init(pvstate_t state)
 	for (strpos = 0; formatstr[strpos] != 0 && segment < 99;
 	     strpos++, segment++) {
 		if ('%' == formatstr[strpos]) {
-			int num;
+			unsigned int num;
 			strpos++;
 			num = 0;
 			while (isdigit(formatstr[strpos])) {
@@ -405,6 +443,52 @@ static long bound_long(long x, long min, long max)
 	return x < min ? min : x > max ? max : x;
 }

+/* Update history and current average rate */
+static void update_history_avg_rate(pvstate_t state, long long total_bytes,
+				    long double elapsed_sec,
+				    long double rate)
+{
+	int first = state->history_first;
+	int last = state->history_last;
+	long double last_elapsed;
+
+	if (NULL == state->history)
+		return;
+
+	last_elapsed = state->history[last].elapsed_sec;
+
+	/*
+	 * Do nothing if this is not the first call but not enough time has
+	 * elapsed since the previous call yet.
+	 */
+	if ((last_elapsed > 0.0)
+	    && (elapsed_sec < (last_elapsed + state->history_interval)))
+		return;
+
+	/*
+	 * This is not the first call, so add a new entry to the circular
+	 * buffer.
+	 */
+	if (last_elapsed > 0.0) {
+		int len = state->history_len;
+		state->history_last = last = (last + 1) % len;
+		if (last == first)
+			state->history_first = first = (first + 1) % len;
+	}
+
+	state->history[last].elapsed_sec = elapsed_sec;
+	state->history[last].total_bytes = total_bytes;
+
+	if (first == last) {
+		state->current_avg_rate = rate;
+	} else {
+		long long bytes = (state->history[last].total_bytes -
+				   state->history[first].total_bytes);
+		long double sec = (state->history[last].elapsed_sec -
+				   state->history[first].elapsed_sec);
+		state->current_avg_rate = bytes / sec;
+	}
+}

 /*
 * Return a pointer to a string (which must not be freed), containing status
@@ -465,13 +549,16 @@ static char *pv__format(pvstate_t state,
 	}
 	state->prev_rate = rate;

+	/* Update history and current average rate for ETA. */
+	update_history_avg_rate(state, total_bytes, elapsed_sec, rate);
+	average_rate = state->current_avg_rate;
+
 	/*
-	 * We only calculate the overall average rate if this is the last
-	 * update or if the average rate display is enabled. Otherwise it's
-	 * not worth the extra CPU cycles.
+	 * If this is the final update at the end of the transfer, we
+	 * recalculate the rate - and the average rate - across the whole
+	 * period of the transfer.
 	 */
-	if ((bytes_since_last < 0)
-	    || ((state->components_used & PV_DISPLAY_AVERAGERATE) != 0)) {
+	if (bytes_since_last < 0) {
 		/* Sanity check to avoid division by zero */
 		if (elapsed_sec < 0.000001)
 			elapsed_sec = 0.000001;
@@ -479,8 +566,7 @@ static char *pv__format(pvstate_t state,
 		    (((long double) total_bytes) -
 		     ((long double) state->initial_offset)) /
 		    (long double) elapsed_sec;
-		if (bytes_since_last < 0)
-			rate = average_rate;
+		rate = average_rate;
 	}

 	if (state->size <= 0) {
@@ -554,12 +640,15 @@ static char *pv__format(pvstate_t state,
 			sprintf(numericprefix, "%.4Lf ", elapsed_sec);

 		if ((state->components_used & PV_DISPLAY_BYTES) != 0) {
-			sprintf(state->display_buffer, "%.99s%lld\n",
-				numericprefix, total_bytes);
-		} else if (state->percentage > 100) {
-			/* As mentioned above, we go 0-100, then 100-0. */
-			sprintf(state->display_buffer, "%.99s%ld\n",
-				numericprefix, 200 - state->percentage);
+			if (state->bits) {
+				sprintf(state->display_buffer,
+					"%.99s%lld\n", numericprefix,
+					8 * total_bytes);
+			} else {
+				sprintf(state->display_buffer,
+					"%.99s%lld\n", numericprefix,
+					total_bytes);
+			}
 		} else {
 			sprintf(state->display_buffer, "%.99s%ld\n",
 				numericprefix, state->percentage);
@@ -587,10 +676,17 @@ static char *pv__format(pvstate_t state,

 	/* If we're showing bytes transferred, set up the display string. */
 	if ((state->components_used & PV_DISPLAY_BYTES) != 0) {
-		pv__sizestr(state->str_transferred,
-			    sizeof(state->str_transferred), "%s",
-			    (long double) total_bytes, "", _("B"),
-			    state->linemode ? 0 : 1);
+		if (state->bits && !state->linemode) {
+			pv__sizestr(state->str_transferred,
+				    sizeof(state->str_transferred), "%s",
+				    (long double) total_bytes * 8, "",
+				    _("b"), 1);
+		} else {
+			pv__sizestr(state->str_transferred,
+				    sizeof(state->str_transferred), "%s",
+				    (long double) total_bytes, "", _("B"),
+				    state->linemode ? 0 : 1);
+		}
 	}

 	/* Transfer buffer percentage - set up the display string. */
@@ -616,25 +712,51 @@ static char *pv__format(pvstate_t state,
 		if (elapsed_sec > (long double) 360000000.0L)
 			elapsed_sec = (long double) 360000000.0L;

-		sprintf(state->str_timer, "%ld:%02ld:%02ld",
-			((long) elapsed_sec) / 3600,
-			(((long) elapsed_sec) / 60) % 60,
-			((long) elapsed_sec) % 60);
+		/*
+		 * If the elapsed time is more than a day, include a day count as
+		 * well as hours, minutes, and seconds.
+		 */
+		if (elapsed_sec > (long double) 86400.0L) {
+			sprintf(state->str_timer, "%ld:%02ld:%02ld:%02ld",
+				((long) elapsed_sec) / 86400,
+				(((long) elapsed_sec) / 3600) % 24,
+				(((long) elapsed_sec) / 60) % 60,
+				((long) elapsed_sec) % 60);
+		} else {
+			sprintf(state->str_timer, "%ld:%02ld:%02ld",
+				((long) elapsed_sec) / 3600,
+				(((long) elapsed_sec) / 60) % 60,
+				((long) elapsed_sec) % 60);
+		}
 	}

 	/* Rate - set up the display string. */
 	if ((state->components_used & PV_DISPLAY_RATE) != 0) {
-		pv__sizestr(state->str_rate, sizeof(state->str_rate),
-			    "[%s]", rate, _("/s"), _("B/s"),
-			    state->linemode ? 0 : 1);
+		if (state->bits && !state->linemode) {
+			pv__sizestr(state->str_rate,
+				    sizeof(state->str_rate), "[%s]",
+				    8 * rate, "", _("b/s"), 1);
+		} else {
+			pv__sizestr(state->str_rate,
+				    sizeof(state->str_rate), "[%s]", rate,
+				    _("/s"), _("B/s"),
+				    state->linemode ? 0 : 1);
+		}
 	}

 	/* Average rate - set up the display string. */
 	if ((state->components_used & PV_DISPLAY_AVERAGERATE) != 0) {
-		pv__sizestr(state->str_average_rate,
-			    sizeof(state->str_average_rate), "[%s]",
-			    average_rate, _("/s"), _("B/s"),
-			    state->linemode ? 0 : 1);
+		if (state->bits && !state->linemode) {
+			pv__sizestr(state->str_average_rate,
+				    sizeof(state->str_average_rate),
+				    "[%s]", 8 * average_rate, "", _("b/s"),
+				    1);
+		} else {
+			pv__sizestr(state->str_average_rate,
+				    sizeof(state->str_average_rate),
+				    "[%s]", average_rate, _("/s"),
+				    _("B/s"), state->linemode ? 0 : 1);
+		}
 	}

 	/* Last output bytes - set up the display string. */
@@ -654,7 +776,7 @@ static char *pv__format(pvstate_t state,
 		eta =
 		    pv__calc_eta(total_bytes - state->initial_offset,
 				 state->size - state->initial_offset,
-				 elapsed_sec);
+				 state->current_avg_rate);

 		/*
 		 * Bounds check, so we don't overrun the suffix buffer. This
@@ -682,7 +804,7 @@ static char *pv__format(pvstate_t state,
 		 * ETA used to be.
 		 */
 		if (bytes_since_last < 0) {
-			int i;
+			unsigned int i;
 			for (i = 0; i < sizeof(state->str_eta)
 			     && state->str_eta[i] != 0; i++) {
 				state->str_eta[i] = ' ';
@@ -706,7 +828,7 @@ static char *pv__format(pvstate_t state,
 		eta =
 		    pv__calc_eta(total_bytes - state->initial_offset,
 				 state->size - state->initial_offset,
-				 elapsed_sec);
+				 state->current_avg_rate);

 		/*
 		 * Bounds check, so we don't overrun the suffix buffer. This
@@ -744,7 +866,7 @@ static char *pv__format(pvstate_t state,
 		}

 		if (!show_eta) {
-			int i;
+			unsigned int i;
 			for (i = 0; i < sizeof(state->str_fineta)
 			     && state->str_fineta[i] != 0; i++) {
 				state->str_fineta[i] = ' ';
@@ -796,7 +918,7 @@ static char *pv__format(pvstate_t state,
 				available_width = 0;

 			if (available_width >
-			    sizeof(state->str_progress) - 16)
+			    (int) (sizeof(state->str_progress)) - 16)
 				available_width =
 				    sizeof(state->str_progress) - 16;

@@ -826,7 +948,7 @@ static char *pv__format(pvstate_t state,
 				available_width = 0;

 			if (available_width >
-			    sizeof(state->str_progress) - 16)
+			    (int) (sizeof(state->str_progress)) - 16)
 				available_width =
 				    sizeof(state->str_progress) - 16;

@@ -882,7 +1004,8 @@ static char *pv__format(pvstate_t state,
 		if (segment_length < 1)
 			break;
 		/* Skip segment if it would make the display too wide */
-		if (segment_length + display_string_length > state->width)
+		if (segment_length + display_string_length >
+		    (int) (state->width))
 			break;
 		strncat(state->display_buffer,
 			state->format[segment].string, segment_length);
@@ -895,7 +1018,7 @@ static char *pv__format(pvstate_t state,
 	 */
 	output_length = strlen(state->display_buffer);
 	if ((output_length < state->prev_length)
-	    && (state->width >= state->prev_width)) {
+	    && ((int) (state->width) >= state->prev_width)) {
 		char spaces[32];
 		int spaces_to_add;
 		spaces_to_add = state->prev_length - output_length;
@@ -954,12 +1077,16 @@ void pv_display(pvstate_t state, long double esec, long long sl,
 	if (state->numeric) {
 		write(STDERR_FILENO, display, strlen(display));
 	} else if (state->cursor) {
-		pv_crs_update(state, display);
-		state->display_visible = 1;
+		if (state->force || pv_in_foreground()) {
+			pv_crs_update(state, display);
+			state->display_visible = true;
+		}
 	} else {
-		write(STDERR_FILENO, display, strlen(display));
-		write(STDERR_FILENO, "\r", 1);
-		state->display_visible = 1;
+		if (state->force || pv_in_foreground()) {
+			write(STDERR_FILENO, display, strlen(display));
+			write(STDERR_FILENO, "\r", 1);
+			state->display_visible = true;
+		}
 	}

 	debug("%s: [%s]", "display", display);
@@ -36,6 +36,7 @@ unsigned long long pv_calc_total_size(pvstate_t state)

 	total = 0;
 	rc = 0;
+	memset(&sb, 0, sizeof(sb));

 	/*
 	 * No files specified - check stdin.
@@ -151,10 +151,17 @@ int pv_main_loop(pvstate_t state)
 			    || (cur_time.tv_sec == next_ratecheck.tv_sec
 				&& cur_time.tv_usec >=
 				next_ratecheck.tv_usec)) {
+
 				target +=
 				    ((long double) (state->rate_limit)) /
 				    (long double) (1000000 /
 						   RATE_GRANULARITY);
+				long double burstMax =
+				    ((long double) (state->rate_limit *
+						    RATE_BURST_WINDOW));
+				if (target > burstMax) {
+					target = burstMax;
+				}
 				pv_timeval_add_usec(&next_ratecheck,
 						    RATE_GRANULARITY);
 			}
@@ -166,7 +173,8 @@ int pv_main_loop(pvstate_t state)
 		 * try to write more than we're allowed to.
 		 */
 		if ((0 < state->size) && (state->stop_at_size)) {
-			if ((state->size < (total_written + cansend))
+			if (((long) (state->size) <
+			     (total_written + cansend))
 			    || ((0 == cansend)
 				&& (0 == state->rate_limit))) {
 				cansend = state->size - total_written;
@@ -505,7 +513,7 @@ int pv_watchpid_loop(pvstate_t state)
 	struct pvstate_s *state_array = NULL;
 	int array_length = 0;
 	int fd_to_idx[FD_SETSIZE] = { 0, };
-	struct timeval next_update, cur_time, next_remotecheck;
+	struct timeval next_update, cur_time;
 	int idx;
 	int prev_displayed_lines, blank_lines;
 	int first_pass = 1;
@@ -535,16 +543,28 @@ int pv_watchpid_loop(pvstate_t state)
 	    state->format_string ? state->
 	    format_string : state->default_format;
 	if (NULL == strstr(original_format_string, "%N")) {
+#ifdef HAVE_SNPRINTF
 		snprintf(new_format_string, sizeof(new_format_string) - 1,
-			 "%%N %s", original_format_string);
+#else
+		sprintf(new_format_string,
+#endif
+			"%%N %s", original_format_string);
 	} else {
+#ifdef HAVE_SNPRINTF
 		snprintf(new_format_string, sizeof(new_format_string) - 1,
-			 "%s", original_format_string);
+#else
+		sprintf(new_format_string,
+#endif
+			"%s", original_format_string);
 	}
 	state_copy.format_string = NULL;
+#ifdef HAVE_SNPRINTF
 	snprintf(state_copy.default_format,
-		 sizeof(state_copy.default_format) - 1, "%s",
-		 new_format_string);
+		 sizeof(state_copy.default_format) - 1,
+#else
+	sprintf(state_copy.default_format,
+#endif
+		"%.510s", new_format_string);

 	/*
 	 * Get things ready for the main loop.
@@ -552,9 +572,6 @@ int pv_watchpid_loop(pvstate_t state)

 	gettimeofday(&cur_time, NULL);

-	next_remotecheck.tv_sec = cur_time.tv_sec;
-	next_remotecheck.tv_usec = cur_time.tv_usec;
-
 	next_update.tv_sec = cur_time.tv_sec;
 	next_update.tv_usec = cur_time.tv_usec;
 	pv_timeval_add_usec(&next_update,
@@ -649,7 +666,7 @@ int pv_watchpid_loop(pvstate_t state)
 			struct timeval init_time;
 			long double elapsed;

-			if (displayed_lines >= state->height)
+			if (displayed_lines >= (int) (state->height))
 				break;

 			idx = fd_to_idx[fd];
@@ -733,7 +750,7 @@ int pv_watchpid_loop(pvstate_t state)
 			debug("%s: %d", "adding blank lines", blank_lines);

 		while (blank_lines > 0) {
-			int x;
+			unsigned int x;
 			if (displayed_lines > 0)
 				write(STDERR_FILENO, "\n", 1);
 			for (x = 0; x < state->width; x++)
@@ -756,7 +773,7 @@ int pv_watchpid_loop(pvstate_t state)
 	 */
 	blank_lines = prev_displayed_lines;
 	while (blank_lines > 0) {
-		int x;
+		unsigned int x;
 		for (x = 0; x < state->width; x++)
 			write(STDERR_FILENO, " ", 1);
 		write(STDERR_FILENO, "\r", 1);
@@ -2,6 +2,8 @@
 * Functions for converting strings to numbers.
 */

+#include <stddef.h>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -13,31 +15,31 @@
 * including <ctype.h> causes weird versioned glibc dependencies on certain
 * Red Hat systems, complicating package management.
 */
-static int pv__isdigit(char c)
+static bool pv__isdigit(char c)
 {
-	return ((c >= '0') && (c <= '9'));
+	return ((c >= '0') && (c <= '9')) ? true : false;
 }


 /*
- * Return the numeric value of "str", as a long long.
+ * Return the numeric value of "str", as an unsigned long long.
 */
-long long pv_getnum_ll(const char *str)
+unsigned long long pv_getnum_ull(const char *str)
 {
-	long long n = 0;
-	long long decimal = 0;
-	int decdivisor = 1;
-	int shift = 0;
+	unsigned long long n = 0;
+	unsigned long long decimal = 0;
+	unsigned int decdivisor = 1;
+	unsigned int shift = 0;

-	if (0 == str)
+	if (NULL == str)
 		return n;

-	while (str[0] != 0 && (!pv__isdigit(str[0])))
+	while (str[0] != '\0' && (!pv__isdigit(str[0])))
 		str++;

 	for (; pv__isdigit(str[0]); str++) {
 		n = n * 10;
-		n += (str[0] - '0');
+		n += (unsigned long long) (str[0] - '0');
 	}

 	/*
@@ -48,7 +50,8 @@ long long pv_getnum_ll(const char *str)
 		for (; pv__isdigit(str[0]); str++) {
 			if (decdivisor < 10000) {
 				decimal = decimal * 10;
-				decimal += (str[0] - '0');
+				decimal +=
+				    (unsigned long long) (str[0] - '0');
 				decdivisor = decdivisor * 10;
 			}
 		}
@@ -58,7 +61,7 @@ long long pv_getnum_ll(const char *str)
 	 * Parse any units given (K=KiB=*1024, M=MiB=1024KiB, G=GiB=1024MiB,
 	 * T=TiB=1024GiB).
 	 */
-	if (str[0]) {
+	if (str[0] != '\0') {
 		while ((' ' == str[0]) || ('\t' == str[0]))
 			str++;
 		switch (str[0]) {
@@ -89,7 +92,7 @@ long long pv_getnum_ll(const char *str)
 	 * more than 30 at a time to avoid overflows.
 	 */
 	while (shift > 0) {
-		int shiftby;
+		unsigned int shiftby;

 		shiftby = shift;
 		if (shiftby > 30)
@@ -118,15 +121,15 @@ double pv_getnum_d(const char *str)
 	double n = 0.0;
 	double step = 1;

-	if (0 == str)
+	if (NULL == str)
 		return n;

-	while (str[0] != 0 && (!pv__isdigit(str[0])))
+	while (str[0] != '\0' && (!pv__isdigit(str[0])))
 		str++;

 	for (; pv__isdigit(str[0]); str++) {
 		n = n * 10;
-		n += (str[0] - '0');
+		n += (double) (str[0] - '0');
 	}

 	if ((str[0] != '.') && (str[0] != ','))
@@ -136,7 +139,7 @@ double pv_getnum_d(const char *str)

 	for (; pv__isdigit(str[0]) && step < 1000000; str++) {
 		step = step * 10;
-		n += (str[0] - '0') / step;
+		n += ((double) (str[0] - '0')) / step;
 	}

 	return n;
@@ -144,11 +147,11 @@ double pv_getnum_d(const char *str)


 /*
- * Return the numeric value of "str", as an int.
+ * Return the numeric value of "str", as an unsigned int.
 */
-int pv_getnum_i(const char *str)
+unsigned int pv_getnum_ui(const char *str)
 {
-	return (int) pv_getnum_ll(str);
+	return (unsigned int) pv_getnum_ull(str);
 }


@@ -176,7 +179,7 @@ int pv_getnum_check(const char *str, pv_numtype_t type)
 		for (; pv__isdigit(str[0]); str++);
 	}

-	if (0 == str[0])
+	if ('\0' == str[0])
 		return 0;

 	/*
@@ -202,7 +205,7 @@ int pv_getnum_check(const char *str, pv_numtype_t type)
 		return 1;
 	}

-	if (str[0] != 0)
+	if (str[0] != '\0')
 		return 1;

 	return 0;
@@ -25,7 +25,8 @@ static pvstate_t pv_sig_state = NULL;
 * subsequent SIGCONT we can try writing to the terminal again, in case we
 * get backgrounded and later get foregrounded again.
 */
-static void pv_sig_ttou(int s)
+static void pv_sig_ttou( __attribute__ ((unused))
+			int s)
 {
 	int fd;

@@ -45,7 +46,8 @@ static void pv_sig_ttou(int s)
 * Handle SIGTSTP (stop typed at tty) by storing the time the signal
 * happened for later use by pv_sig_cont(), and then stopping the process.
 */
-static void pv_sig_tstp(int s)
+static void pv_sig_tstp( __attribute__ ((unused))
+			int s)
 {
 	gettimeofday(&(pv_sig_state->pv_sig_tstp_time), NULL);
 	raise(SIGSTOP);
@@ -57,7 +59,8 @@ static void pv_sig_tstp(int s)
 * last SIGTSTP to the elapsed time offset, and by trying to write to the
 * terminal again (by replacing the /dev/null stderr with the old stderr).
 */
-static void pv_sig_cont(int s)
+static void pv_sig_cont( __attribute__ ((unused))
+			int s)
 {
 	struct timeval tv;
 	struct termios t;
@@ -111,7 +114,8 @@ static void pv_sig_cont(int s)
 /*
 * Handle SIGWINCH (window size changed) by setting a flag.
 */
-static void pv_sig_winch(int s)
+static void pv_sig_winch( __attribute__ ((unused))
+			 int s)
 {
 	pv_sig_state->pv_sig_newsize = 1;
 }
@@ -120,7 +124,8 @@ static void pv_sig_winch(int s)
 /*
 * Handle termination signals by setting the abort flag.
 */
-static void pv_sig_term(int s)
+static void pv_sig_term( __attribute__ ((unused))
+			int s)
 {
 	pv_sig_state->pv_sig_abort = 1;
 }
@@ -211,7 +216,7 @@ void pv_sig_init(pvstate_t state)
 /*
 * Shut down signal handling.
 */
-void pv_sig_fini(pvstate_t state)
+void pv_sig_fini( __attribute__ ((unused)) pvstate_t state)
 {
 	sigaction(SIGPIPE, &(pv_sig_state->pv_sig_old_sigpipe), NULL);
 	sigaction(SIGTTOU, &(pv_sig_state->pv_sig_old_sigttou), NULL);
@@ -7,8 +7,30 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <errno.h>


+/* alloc / realloc history buffer */
+static void pv_alloc_history(pvstate_t state)
+{
+	if (NULL != state->history)
+		free(state->history);
+	state->history = NULL;
+
+	state->history =
+	    calloc(state->history_len, sizeof(state->history[0]));
+	if (NULL == state->history) {
+		fprintf(stderr, "%s: %s: %s\n", state->program_name,
+			_("history structure allocation failed"),
+			strerror(errno));
+		return;
+	}
+
+	state->history_first = state->history_last = 0;
+	state->history[0].elapsed_sec = 0.0;	/* to be safe, memset() not recommended for doubles */
+}
+
 /*
 * Create a new state structure, and return it, or 0 (NULL) on error.
 */
@@ -17,8 +39,8 @@ pvstate_t pv_state_alloc(const char *program_name)
 	pvstate_t state;

 	state = calloc(1, sizeof(*state));
-	if (0 == state)
-		return 0;
+	if (NULL == state)
+		return NULL;

 	state->program_name = program_name;
 	state->watch_pid = 0;
@@ -34,7 +56,20 @@ pvstate_t pv_state_alloc(const char *program_name)
 #ifdef HAVE_SPLICE
 	state->splice_failed_fd = -1;
 #endif				/* HAVE_SPLICE */
-	state->display_visible = 0;
+	state->display_visible = false;
+
+	/*
+	 * Get the current working directory, if possible, as a base for
+	 * showing relative filenames with --watchfd.
+	 */
+	if (NULL == getcwd(state->cwd, sizeof(state->cwd))) {
+		/* failed - will always show full path */
+		state->cwd[0] = '\0';
+	}
+	if ('\0' == state->cwd[1]) {
+		/* CWD is root directory - always show full path */
+		state->cwd[0] = '\0';
+	}

 	return state;
 }
@@ -48,14 +83,18 @@ void pv_state_free(pvstate_t state)
 	if (0 == state)
 		return;

-	if (state->display_buffer)
+	if (NULL != state->display_buffer)
 		free(state->display_buffer);
 	state->display_buffer = NULL;

-	if (state->transfer_buffer)
+	if (NULL != state->transfer_buffer)
 		free(state->transfer_buffer);
 	state->transfer_buffer = NULL;

+	if (NULL != state->history)
+		free(state->history);
+	state->history = NULL;
+
 	free(state);

 	return;
@@ -65,20 +104,20 @@ void pv_state_free(pvstate_t state)
 /*
 * Set the formatting string, given a set of old-style formatting options.
 */
-void pv_state_set_format(pvstate_t state, unsigned char progress,
-			 unsigned char timer, unsigned char eta,
-			 unsigned char fineta, unsigned char rate,
-			 unsigned char average_rate, unsigned char bytes,
-			 unsigned char bufpercent,
+void pv_state_set_format(pvstate_t state, bool progress,
+			 bool timer, bool eta,
+			 bool fineta, bool rate,
+			 bool average_rate, bool bytes,
+			 bool bufpercent,
 			 unsigned int lastwritten, const char *name)
 {
 #define PV_ADDFORMAT(x,y) if (x) { \
-		if (state->default_format[0] != 0) \
+		if (state->default_format[0] != '\0') \
 			strcat(state->default_format, " "); \
 		strcat(state->default_format, y); \
 	}

-	state->default_format[0] = 0;
+	state->default_format[0] = '\0';
 	PV_ADDFORMAT(name, "%N");
 	PV_ADDFORMAT(bytes, "%b");
 	PV_ADDFORMAT(bufpercent, "%T");
@@ -90,8 +129,14 @@ void pv_state_set_format(pvstate_t state, unsigned char progress,
 	PV_ADDFORMAT(fineta, "%I");
 	if (lastwritten > 0) {
 		char buf[16];
-		sprintf(buf, "%%%uA", lastwritten);
-		PV_ADDFORMAT(lastwritten, buf);
+		memset(buf, 0, sizeof(buf));
+#ifdef HAVE_SNPRINTF
+		(void) snprintf(buf, sizeof(buf) - 1, "%%%uA",
+				lastwritten);
+#else
+		(void) sprintf(buf, "%%%uA", lastwritten);
+#endif
+		PV_ADDFORMAT(lastwritten > 0, buf);
 	}

 	state->name = name;
@@ -99,22 +144,22 @@ void pv_state_set_format(pvstate_t state, unsigned char progress,
 }


-void pv_state_force_set(pvstate_t state, unsigned char val)
+void pv_state_force_set(pvstate_t state, bool val)
 {
 	state->force = val;
 }

-void pv_state_cursor_set(pvstate_t state, unsigned char val)
+void pv_state_cursor_set(pvstate_t state, bool val)
 {
 	state->cursor = val;
 };

-void pv_state_numeric_set(pvstate_t state, unsigned char val)
+void pv_state_numeric_set(pvstate_t state, bool val)
 {
 	state->numeric = val;
 };

-void pv_state_wait_set(pvstate_t state, unsigned char val)
+void pv_state_wait_set(pvstate_t state, bool val)
 {
 	state->wait = val;
 };
@@ -124,27 +169,32 @@ void pv_state_delay_start_set(pvstate_t state, double val)
 	state->delay_start = val;
 };

-void pv_state_linemode_set(pvstate_t state, unsigned char val)
+void pv_state_linemode_set(pvstate_t state, bool val)
 {
 	state->linemode = val;
 };

-void pv_state_null_set(pvstate_t state, unsigned char val)
+void pv_state_bits_set(pvstate_t state, bool bits)
+{
+	state->bits = bits;
+};
+
+void pv_state_null_set(pvstate_t state, bool val)
 {
 	state->null = val;
 };

-void pv_state_no_op_set(pvstate_t state, unsigned char val)
+void pv_state_no_op_set(pvstate_t state, bool val)
 {
 	state->no_op = val;
 };

-void pv_state_skip_errors_set(pvstate_t state, unsigned char val)
+void pv_state_skip_errors_set(pvstate_t state, unsigned int val)
 {
 	state->skip_errors = val;
 };

-void pv_state_stop_at_size_set(pvstate_t state, unsigned char val)
+void pv_state_stop_at_size_set(pvstate_t state, bool val)
 {
 	state->stop_at_size = val;
 };
@@ -160,7 +210,7 @@ void pv_state_target_buffer_size_set(pvstate_t state,
 	state->target_buffer_size = val;
 };

-void pv_state_no_splice_set(pvstate_t state, unsigned char val)
+void pv_state_no_splice_set(pvstate_t state, bool val)
 {
 	state->no_splice = val;
 };
@@ -205,6 +255,20 @@ void pv_state_watch_fd_set(pvstate_t state, int val)
 	state->watch_fd = val;
 };

+void pv_state_average_rate_window_set(pvstate_t state, int val)
+{
+	if (val < 1)
+		val = 1;
+	if (val >= 20) {
+		state->history_len = val / 5 + 1;
+		state->history_interval = 5;
+	} else {
+		state->history_len = val + 1;
+		state->history_interval = 1;
+	}
+	pv_alloc_history(state);
+};
+

 /*
 * Set the array of input files.
@@ -160,19 +160,20 @@ static ssize_t pv__transfer_write_repeated(int fd, void *buf, size_t count)
 		 * out of time - also on our gettimeofday() check.
 		 */
 		if (count > 0) {
+# if 0					    /* disabled after 1.6.0 - see comment above */
 			fd_set writefds;
 			struct timeval tv;
-
-			tv.tv_sec = 0;
-			tv.tv_usec = 0;
-			FD_ZERO(&writefds);
-			FD_SET(fd, &writefds);
+# endif

 			debug("%s %d: %s (%ld %s, %ld %s)", "fd", fd,
 			      "trying another write after partial buffer flush",
 			      nwritten, "written", count, "remaining");

 # if 0					    /* disabled after 1.6.0 - see comment above */
+			tv.tv_sec = 0;
+			tv.tv_usec = 0;
+			FD_ZERO(&writefds);
+			FD_SET(fd, &writefds);
 			if (select(fd + 1, NULL, &writefds, NULL, &tv) < 1)
 				break;
 # endif
@@ -211,8 +212,7 @@ static ssize_t pv__transfer_write_repeated(int fd, void *buf, size_t count)
 */
 static int pv__transfer_read(pvstate_t state, int fd,
 			     int *eof_in, int *eof_out,
-			     unsigned long long allowed,
-			     long *lineswritten)
+			     unsigned long long allowed)
 {
 	unsigned long bytes_can_read;
 	unsigned long amount_to_skip;
@@ -484,7 +484,7 @@ static int pv__transfer_read(pvstate_t state, int fd,
 * On error, sets *eof_out to 1, sets state->written to -1, and updates
 * state->exit_status.
 */
-static int pv__transfer_write(pvstate_t state, int fd,
+static int pv__transfer_write(pvstate_t state,
 			      int *eof_in, int *eof_out,
 			      long *lineswritten)
 {
@@ -531,8 +531,8 @@ static int pv__transfer_write(pvstate_t state, int fd,
 				for (ptr++;
 				     ptr -
 				     (char *) state->transfer_buffer -
-				     state->write_position < nwritten;
-				     ptr++) {
+				     state->write_position <
+				     (size_t) nwritten; ptr++) {
 					if (*ptr == '\0')
 						++lines;
 				}
@@ -738,7 +738,7 @@ long pv_transfer(pvstate_t state, int fd, int *eof_in, int *eof_out,
 	 */
 	state->to_write = state->read_position - state->write_position;
 	if ((state->rate_limit > 0) || (allowed > 0)) {
-		if (state->to_write > allowed) {
+		if ((unsigned long long) (state->to_write) > allowed) {
 			state->to_write = allowed;
 		}
 	}
@@ -784,8 +784,7 @@ long pv_transfer(pvstate_t state, int fd, int *eof_in, int *eof_out,
 	 */
 	if (FD_ISSET(fd, &readfds)) {
 		if (pv__transfer_read
-		    (state, fd, eof_in, eof_out, allowed,
-		     lineswritten) == 0)
+		    (state, fd, eof_in, eof_out, allowed) == 0)
 			return 0;
 	}

@@ -831,7 +830,7 @@ long pv_transfer(pvstate_t state, int fd, int *eof_in, int *eof_out,
 	    && (state->read_position > state->write_position)
 	    && (state->to_write > 0)) {
 		if (pv__transfer_write
-		    (state, fd, eof_in, eof_out, lineswritten) == 0)
+		    (state, eof_in, eof_out, lineswritten) == 0)
 			return 0;
 	}
 #ifdef MAXIMISE_BUFFER_FILL
@@ -20,6 +20,100 @@
 #include <sys/types.h>
 #include <dirent.h>

+#ifdef __APPLE__
+#include <libproc.h>
+#include <sys/proc_info.h>
+#endif
+
+int filesize(pvwatchfd_t info)
+{
+	if (S_ISBLK(info->sb_fd.st_mode)) {
+		int fd;
+
+		/*
+		 * Get the size of block devices by opening
+		 * them and seeking to the end.
+		 */
+		fd = open64(info->file_fdpath, O_RDONLY);
+		if (fd >= 0) {
+			info->size = lseek64(fd, 0, SEEK_END);
+			close(fd);
+		} else {
+			info->size = 0;
+		}
+	} else if (S_ISREG(info->sb_fd.st_mode)) {
+		if ((info->sb_fd_link.st_mode & S_IWUSR) == 0) {
+			info->size = info->sb_fd.st_size;
+		}
+	} else {
+		return 4;
+	}
+
+	return 0;
+}
+
+#ifdef __APPLE__
+int pv_watchfd_info(pvstate_t state, pvwatchfd_t info, int automatic)
+{
+	struct vnode_fdinfowithpath vnodeInfo = { };
+
+	if (NULL == state)
+		return -1;
+	if (NULL == info)
+		return -1;
+
+	if (kill(info->watch_pid, 0) != 0) {
+		if (!automatic)
+			pv_error(state, "%s %u: %s",
+				 _("pid"),
+				 info->watch_pid, strerror(errno));
+		return 1;
+	}
+
+	int32_t proc_fd = (int32_t) info->watch_fd;
+	int size = proc_pidfdinfo(info->watch_pid, proc_fd,
+				  PROC_PIDFDVNODEPATHINFO, &vnodeInfo,
+				  PROC_PIDFDVNODEPATHINFO_SIZE);
+	if (size != PROC_PIDFDVNODEPATHINFO_SIZE) {
+		pv_error(state, "%s %u: %s %d: %s",
+			 _("pid"),
+			 info->watch_pid,
+			 _("fd"), info->watch_fd, strerror(errno));
+		return 3;
+	}
+
+	strlcpy(info->file_fdpath, vnodeInfo.pvip.vip_path,
+		sizeof(info->file_fdpath));
+
+	info->size = 0;
+
+	if (!(0 == stat64(info->file_fdpath, &(info->sb_fd)))) {
+		if (!automatic)
+			pv_error(state, "%s %u: %s %d: %s: %s",
+				 _("pid"),
+				 info->watch_pid,
+				 _("fd"),
+				 info->watch_fd, info->file_fdpath,
+				 strerror(errno));
+		return 3;
+	}
+
+	if (filesize(info) != 0) {
+		if (!automatic)
+			pv_error(state, "%s %u: %s %d: %s: %s",
+				 _("pid"),
+				 info->watch_pid,
+				 _("fd"),
+				 info->watch_fd,
+				 info->file_fdpath,
+				 _("not a regular file or block device"));
+		return 4;
+	}
+
+	return 0;
+}
+
+#else

 /*
 * Fill in the given information structure with the file paths and stat
@@ -52,12 +146,20 @@ int pv_watchfd_info(pvstate_t state, pvwatchfd_t info, int automatic)
 				 info->watch_pid, strerror(errno));
 		return 1;
 	}
-
+#ifdef HAVE_SNPRINTF
 	snprintf(info->file_fdinfo, sizeof(info->file_fdinfo) - 1,
-		 "/proc/%u/fdinfo/%d", info->watch_pid, info->watch_fd);
+#else
+	sprintf(info->file_fdinfo,
+#endif
+		"/proc/%u/fdinfo/%d", info->watch_pid, info->watch_fd);
+#ifdef HAVE_SNPRINTF
 	snprintf(info->file_fd, sizeof(info->file_fd) - 1,
-		 "/proc/%u/fd/%d", info->watch_pid, info->watch_fd);
+#else
+	sprintf(info->file_fd,
+#endif
+		"/proc/%u/fd/%d", info->watch_pid, info->watch_fd);

+	memset(info->file_fdpath, 0, sizeof(info->file_fdpath));
 	if (readlink
 	    (info->file_fd, info->file_fdpath,
 	     sizeof(info->file_fdpath) - 1) < 0) {
@@ -83,25 +185,8 @@ int pv_watchfd_info(pvstate_t state, pvwatchfd_t info, int automatic)

 	info->size = 0;

-	if (S_ISBLK(info->sb_fd.st_mode)) {
-		int fd;
-
-		/*
-		 * Get the size of block devices by opening
-		 * them and seeking to the end.
-		 */
-		fd = open64(info->file_fdpath, O_RDONLY);
-		if (fd >= 0) {
-			info->size = lseek64(fd, 0, SEEK_END);
-			close(fd);
-		} else {
-			info->size = 0;
-		}
-	} else if (S_ISREG(info->sb_fd.st_mode)) {
-		if ((info->sb_fd_link.st_mode & S_IWUSR) == 0) {
-			info->size = info->sb_fd.st_size;
-		}
-	} else {
+	int ret = filesize(info);
+	if (ret != 0) {
 		if (!automatic)
 			pv_error(state, "%s %u: %s %d: %s: %s",
 				 _("pid"),
@@ -110,13 +195,19 @@ int pv_watchfd_info(pvstate_t state, pvwatchfd_t info, int automatic)
 				 info->watch_fd,
 				 info->file_fdpath,
 				 _("not a regular file or block device"));
-		return 4;
+		return ret;
 	}

 	return 0;
 }
+#endif

-
+#ifdef __APPLE__
+int pv_watchfd_changed(pvwatchfd_t info)
+{
+	return 1;
+}
+#else
 /*
 * Return nonzero if the given file descriptor has changed in some way since
 * we started looking at it (i.e.  changed destination or permissions).
@@ -139,8 +230,28 @@ int pv_watchfd_changed(pvwatchfd_t info)

 	return 0;
 }
+#endif

+#ifdef __APPLE__
+long long pv_watchfd_position(pvwatchfd_t info)
+{
+	long long position;
+	struct vnode_fdinfowithpath vnodeInfo = { };
+	int32_t proc_fd = (int32_t) info->watch_fd;

+	int size = proc_pidfdinfo(info->watch_pid, proc_fd,
+				  PROC_PIDFDVNODEPATHINFO, &vnodeInfo,
+				  PROC_PIDFDVNODEPATHINFO_SIZE);
+	if (size != PROC_PIDFDVNODEPATHINFO_SIZE) {
+		return -1;
+	}
+
+	position = (long long) vnodeInfo.pfi.fi_offset;
+
+	return position;
+}
+
+#else
 /*
 * Return the current file position of the given file descriptor, or -1 if
 * the fd has closed or has changed in some way.
@@ -162,8 +273,35 @@ long long pv_watchfd_position(pvwatchfd_t info)

 	return position;
 }
+#endif


+#ifdef __APPLE__
+int pidfds(pvstate_t state, unsigned int pid, struct proc_fdinfo **fds,
+	   int *count)
+{
+	int size_needed = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, 0, 0);
+	if (size_needed == -1) {
+		pv_error(state, "%s: unable to list pid fds: %s", _("pid"),
+			 strerror(errno));
+		return -1;
+	}
+
+	*count = size_needed / PROC_PIDLISTFD_SIZE;
+
+	*fds = (struct proc_fdinfo *) malloc(size_needed);
+	if (*fds == NULL) {
+		pv_error(state, "%s: alloc failed: %s", _("pid"),
+			 strerror(errno));
+		return -1;
+	}
+
+	proc_pidinfo(pid, PROC_PIDLISTFDS, 0, *fds, size_needed);
+
+	return 0;
+}
+#endif
+
 /*
 * Scan the given process and update the arrays with any new file
 * descriptors.
@@ -177,31 +315,56 @@ int pv_watchpid_scanfds(pvstate_t state, pvstate_t pristine,
 			pvstate_t * state_array_ptr, int *fd_to_idx)
 {
 	char fd_dir[512] = { 0, };
-	DIR *dptr;
-	struct dirent *d;
 	int array_length = 0;
 	struct pvwatchfd_s *info_array = NULL;
 	struct pvstate_s *state_array = NULL;

+#ifdef HAVE_SNPRINTF
 	snprintf(fd_dir, sizeof(fd_dir) - 1, "/proc/%u/fd", watch_pid);
+#else
+	sprintf(fd_dir, "/proc/%u/fd", watch_pid);
+#endif
+#ifdef __APPLE__
+	struct proc_fdinfo *fd_infos = NULL;
+	int fd_infos_count = 0;
+
+	if (pidfds(state, watch_pid, &fd_infos, &fd_infos_count) != 0) {
+		pv_error(state, "%s: pidfds failed", _("pid"));
+		return -1;
+	}
+#else
+	DIR *dptr;
+	struct dirent *d;
 	dptr = opendir(fd_dir);
 	if (NULL == dptr)
 		return 1;
+#endif

 	array_length = *array_length_ptr;
 	info_array = *info_array_ptr;
 	state_array = *state_array_ptr;

+#ifdef __APPLE__
+	if (fd_infos_count < 1) {
+		pv_error(state, "%s: no fds found", _("pid"));
+		return -1;
+	}
+	for (int i = 0; i < fd_infos_count; i++) {
+#else
 	while ((d = readdir(dptr)) != NULL) {
+#endif
 		int fd, check_idx, use_idx, rc;
 		long long position_now;

 		fd = -1;
+#ifdef __APPLE__
+		fd = fd_infos[i].proc_fd;
+#else
 		if (sscanf(d->d_name, "%d", &fd) != 1)
 			continue;
 		if ((fd < 0) || (fd >= FD_SETSIZE))
 			continue;
-
+#endif
 		/*
 		 * Skip if this fd is already known to us.
 		 */
@@ -284,6 +447,11 @@ int pv_watchpid_scanfds(pvstate_t state, pvstate_t pristine,

 		info_array[use_idx].watch_pid = watch_pid;
 		info_array[use_idx].watch_fd = fd;
+#ifdef __APPLE__
+		if (fd_infos[i].proc_fdtype != PROX_FDTYPE_VNODE) {
+			continue;
+		}
+#endif
 		rc = pv_watchfd_info(state, &(info_array[use_idx]), 1);

 		/*
@@ -342,7 +510,12 @@ int pv_watchpid_scanfds(pvstate_t state, pvstate_t pristine,
 		}
 	}

+
+#ifdef __APPLE__
+	free(fd_infos);
+#else
 	closedir(dptr);
+#endif

 	return 0;
 }
@@ -351,31 +524,52 @@ int pv_watchpid_scanfds(pvstate_t state, pvstate_t pristine,
 /*
 * Set the display name for the given watched file descriptor, truncating at
 * the relevant places according to the current screen width.
+ *
+ * If the file descriptor is pointing to a file under the current working
+ * directory, show its relative path, not the full path.
 */
 void pv_watchpid_setname(pvstate_t state, pvwatchfd_t info)
 {
-	int path_length, max_display_length;
+	int path_length, cwd_length, max_display_length;
+	char *file_fdpath = info->file_fdpath;

 	memset(info->display_name, 0, sizeof(info->display_name));

 	path_length = strlen(info->file_fdpath);
+	cwd_length = strlen(state->cwd);
+	if (cwd_length > 0 && path_length > cwd_length) {
+		if (0 ==
+		    strncmp(info->file_fdpath, state->cwd, cwd_length)) {
+			file_fdpath += cwd_length + 1;
+			path_length -= cwd_length + 1;
+		}
+	}

 	max_display_length = (state->width / 2) - 6;
 	if (max_display_length >= path_length) {
+#ifdef HAVE_SNPRINTF
 		snprintf(info->display_name,
-			 sizeof(info->display_name) - 1, "%4d:%s",
-			 info->watch_fd, info->file_fdpath);
+			 sizeof(info->display_name) - 1,
+#else
+		sprintf(info->display_name,
+#endif
+			"%4d:%.498s", info->watch_fd, file_fdpath);
 	} else {
 		int prefix_length, suffix_length;

 		prefix_length = max_display_length / 4;
 		suffix_length = max_display_length - prefix_length - 3;

+#ifdef HAVE_SNPRINTF
 		snprintf(info->display_name,
-			 sizeof(info->display_name) - 1, "%4d:%.*s...%.*s",
-			 info->watch_fd, prefix_length, info->file_fdpath,
-			 suffix_length,
-			 info->file_fdpath + path_length - suffix_length);
+			 sizeof(info->display_name) - 1,
+#else
+		sprintf(info->display_name,
+#endif
+			"%4d:%.*s...%.*s",
+			info->watch_fd, prefix_length, file_fdpath,
+			suffix_length,
+			file_fdpath + path_length - suffix_length);
 	}

 	debug("%s: %d: [%s]", "set name for fd", info->watch_fd,
@@ -13,8 +13,8 @@ NUM=`tr '\r' '\n' < $TMP1 | tr -d ' ' | sed '/^$/d' | sort | uniq | wc -l | tr -
 #
 test $NUM -gt 3 || exit 1

-# 8 or more - not OK, since even on a heavily loaded system that's too long.
+# 12 or more - not OK, since even on a heavily loaded system that's too long.
 #
-test $NUM -lt 8
+test $NUM -lt 12

 # EOF
Author	SHA1	Message	Date
Andrew Wood	88dd09393c	Set current release line	2023-07-17 22:05:29 +01:00
Andrew Wood	29124c585e	Minor updates	2023-07-17 21:57:56 +01:00
Andrew Wood	65828899ea	Version update pending new release	2023-07-17 21:53:54 +01:00
Andrew Wood	853190d36d	Updated acknowledgements for stat64 patch	2023-07-17 21:48:16 +01:00
Andrew Wood	f13f5e70c1	More macOS stat fixes	2023-07-17 21:37:54 +01:00
Andrew Wood	4e2ab087e5	Removed bug about no Cygwin output as it is not reproducible	2023-07-17 21:29:17 +01:00
Andrew Wood	242c19e4f6	Remove GH#27 as the rate limit changes have corrected this fault	2023-07-17 20:49:38 +01:00
Andrew Wood	3003f46313	Removed code that was making percentages go down after 100% in numeric mode	2023-07-17 12:28:32 +01:00
Andrew Wood	c718a00e2c	Note the translation file updates	2023-07-16 23:28:47 +01:00
Andrew Wood	01f627b2de	Recoded Polish PO file from ISO8859-2 to UTF-8, and removed potentially incorrect fuzzy matches from all PO files	2023-07-16 23:24:53 +01:00
Andrew Wood	461486ec4f	Added --bits option	2023-07-16 23:12:12 +01:00
Andrew Wood	fd46c9b1f6	Update manual month and year	2023-07-16 22:44:33 +01:00
Andrew Wood	001dfb71c2	Show elapsed time as D:HH:MM:SS after 1 day, to match the ETA format	2023-07-16 22:29:18 +01:00
Andrew Wood	bcb33ce2aa	Honour the --force setting when writing the progress display	2023-07-16 21:58:08 +01:00
Andrew Wood	c8090806f9	Added debugging output to pv_in_foreground()	2023-07-16 21:31:17 +01:00
Andrew Wood	3403ebd857	Adjust threshold to cope with new ETA calculation mechanism	2023-07-16 21:16:02 +01:00
Andrew Wood	4fddf40436	Rename --eta-window to --average-rate-window, since that is what it does, and correct the behaviour of the final update so the final rate shown is the average rate across the whole transfer.	2023-07-16 21:00:08 +01:00
Andrew Wood	62b5ac26df	Reverse the average rate history early-return logic to make it easier to understand	2023-07-16 20:49:59 +01:00
Andrew Wood	e8c0b6717f	Update documentation regarding ETA issues	2023-07-16 12:27:20 +01:00
Andrew Wood	2bf76577dd	Remove assertions from ETA history, set minimum boundary on ETA window, check for history structure allocation success	2023-07-16 12:14:07 +01:00
Andrew Wood	90d9638488	Minor format changes as per indent(1) standardisation	2023-07-16 11:53:36 +01:00
Andrew WoodandGitHub	f6d0135cc6	Merge pull request #65 from lemonsqueeze/eta_fix Alter ETA calculation to use the rate over the past 30 seconds instead of over the whole transfer, and allow that 30 second window to be adjusted.	2023-07-16 11:46:23 +01:00
Andrew WoodandGitHub	56adce8edf	Merge branch 'main' into eta_fix	2023-07-16 11:41:50 +01:00
Andrew Wood	008ee74a98	Update documentation to reflex bug fix GH#62, GH#32	2023-07-16 11:33:44 +01:00
Andrew Wood	fa8aa85248	Merge branch 'vbychkoviak-main' into main	2023-07-16 11:24:06 +01:00
Andrew Wood	442a298c38	Merge branch 'main' of https://github.com/vbychkoviak/pv into vbychkoviak-main	2023-07-16 11:23:46 +01:00
Andrew Wood	bb0c5bdfca	Applied standard indent(1) settings	2023-07-16 11:20:03 +01:00
Andrew Wood	29908cff6c	Remove "-s @" / issue 44 from TODO list	2023-07-16 11:14:05 +01:00
Andrew Wood	456ab7cebb	Applied OS X 11 stat64 configure.in patch from Dave Beckett	2023-07-16 11:11:09 +01:00
Andrew Wood	0d1d5b77ec	Applied patch from Dave Beckett to support "@filename" as a "--size" argument.	2023-07-16 11:07:06 +01:00
Andrew Wood	ff5efbe3eb	Added issue #56	2023-07-16 01:54:00 +01:00
Andrew Wood	81d008a325	Updated to include mention of latest pull request	2023-07-16 01:43:07 +01:00
Andrew Wood	288dd633d7	Merge branch 'christoph-zededa-mac_os_x_pidfds' into main	2023-07-16 01:37:21 +01:00
Andrew Wood	9dce037cdc	Merge branch 'mac_os_x_pidfds' of https://github.com/christoph-zededa/pv into christoph-zededa-mac_os_x_pidfds	2023-07-16 01:37:08 +01:00
Andrew Wood	6ae07496d2	Minor formatting fixes	2023-07-16 01:35:58 +01:00
Andrew Wood	cd60822380	Convert issue numbers to links, and bring the feature request list up to date.	2023-07-16 01:30:50 +01:00
Andrew Wood	0fdd9f0787	Formatting fix	2023-07-16 01:03:47 +01:00
Andrew Wood	0d520172ac	Added new contributors and cleaned up formatting	2023-07-16 01:02:50 +01:00
Andrew Wood	04ea58f786	Added details of latest pull request	2023-07-16 00:56:24 +01:00
Andrew Wood	94a9f658e1	Merge branch 'quitschbo-main' into main	2023-07-16 00:47:52 +01:00
Andrew Wood	0ec9e208df	Merge branch 'main' of https://github.com/quitschbo/pv into quitschbo-main	2023-07-16 00:47:33 +01:00
Andrew Wood	4c84060940	Markdown formatting cleanups	2023-07-16 00:44:21 +01:00
Andrew Wood	8fb3aecde5	Finalise pull from ikasty to show relative filenames in --watchfd	2023-07-16 00:28:58 +01:00
Andrew Wood	e228b3397d	Merge branch 'ikasty-main' into main	2023-07-16 00:16:03 +01:00
Andrew Wood	d1d1999334	Merge branch 'main' of https://github.com/ikasty/pv into ikasty-main	2023-07-16 00:14:34 +01:00
Andrew Wood	685c91a1cb	NEWS was renamed to NEWS.md.	2023-07-16 00:04:33 +01:00
Andrew Wood	50c0b329c9	Moved NEWS and TODO to UTF-8 Markdown format, and linked them in from the README.	2023-07-16 00:00:19 +01:00
Andrew Wood	5c8e2707a4	Removed support for Red Hat Enterprise Linux package builds	2023-07-15 23:41:27 +01:00
Kang Daeyoun	5768166460	Use relative filepath in watchpid if possible	2023-06-09 12:32:59 +09:00
lemonsqueeze	6bdb951af4	Added -m, --eta-window option: set time window for average rate computation (default 30s)	2023-05-29 15:11:37 +02:00
lemonsqueeze	06824aee2d	Fixed inaccurate ETAs: use current average rate over last 30 seconds instead of global rate using global rate gives wildly inacurrate ETAs if rate changes over time. this makes pv keep a history of progress over the last 30s interval and compute current average rate over that, which fixes the issue. fixed -a, --average-rate: show current average rate instead of global rate [ quick test ] - in one shell: $ dd if=/dev/zero of=/tmp/foo bs=1M count=5 # simulate fast initial rate, $ (while true; do ls /*; sleep 1; done) >> /tmp/foo # then slow rate. leave running ... - in another shell: $ tail -f -n +1 /tmp/foo \| pv -s 800M > /dev/null 5.62MiB 0:00:17 [33.1KiB/s] [> ] 0% ETA 0:40:02 bad: (pv 1.6.6 - 1.6.20) ETA of a few minutes that keeps increasing ever and ever ... 5.62MiB 0:00:16 [33.1KiB/s] [> ] 0% ETA 6:45:53 good: ETA of 6+ hours, which is how long it'll take to reach 800Mb at 33k/s	2023-05-29 15:09:36 +02:00
Michael Weiß	c5cd932fb0	pv/display: handle error of tcgetpgrp() in pv_in_foreground() Show pv progress bar even if no terminal is set, e.g., in a busybox init script. The description of pv_in_forground() states it will return true "if we aren't outputting to a terminal". However, this is not the case since tcgetpgrg() will return an error and set ERRNO to ENOTTY if the output fd is not an tty. We now handle this error correctly and pv_in_foreground() returns also true in that case. Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de>	2023-05-10 09:54:59 +02:00
Volodymyr Bychkovyak	a6ecf60ad1	fix rate limiting issues	2023-03-22 02:49:46 -07:00
Christoph Ostarek	b0cad6d3e3	implement fd watching for OS X	2023-02-19 18:20:00 +01:00
Andrew Wood	a9cef81657	Minor formatting corrections	2022-05-29 21:52:15 +01:00
Andrew Wood	cc95aa67a3	Renamed README to README.md and altered it to Markdown format; moved contributors from the README to docs/ACKNOWLEDGEMENTS.md	2022-05-29 21:45:13 +01:00
Andrew Wood	b78e58ab87	Moved all open issues into the GitHub issue tracker and copied in all related correspondence.	2022-05-29 21:00:43 +01:00
Andrew Wood	12d22b5ab0	Acknowledged new pull request	2022-05-29 17:12:09 +01:00
Andrew Wood	3255f72f39	Merge branch 'jwilk-forks-mojibake' into main	2022-05-29 12:47:33 +01:00
Jakub Wilk	c79eb8540a	Fixed encoding in README	2022-04-11 23:08:21 +02:00
Andrew Wood	0ca8ef5187	Dates bumped for release of 1.6.20	2021-09-12 17:13:24 +01:00
Andrew Wood	386e3ac5fa	Updated to include details of latest contributor	2021-09-08 17:26:13 +01:00
Andrew Wood	6e24924a23	Merge branch 'thesamesam-main' into main	2021-09-08 17:20:53 +01:00
Sam James	b0720194e1	src/pv/number.c: add missing <stddef.h> include for NULL	2021-09-08 01:06:29 +01:00
Andrew Wood	613642ba3d	Added TODO from Zach Riggle	2021-09-06 23:12:16 +01:00
Andrew WoodandGitHub	103df51a59	Create FUNDING.yml	2021-09-06 22:41:38 +01:00
Andrew Wood	0f7069796e	Minor updates in preparation for release of v1.6.19	2021-09-05 19:29:45 +01:00
Andrew Wood	adf9672b25	Cleanup	2021-09-05 19:17:58 +01:00
Andrew Wood	7d68a574ca	Added all changes made between v1.6.6 and June 2020	2021-09-04 21:00:00 +01:00
Andrew Wood	9dd06d8acb	Adjusted README for GitHub	2021-09-04 20:54:15 +01:00
@@ -1 +1 @@
 .6.6
 .7.0