1128 Commits
Author SHA1 Message Date
Andrew Wood 1fbd9b56a3 Commit to release date. 2026-06-11 22:05:37 +01:00
Andrew Wood bbfc794852 Datestamp update. 2026-06-11 22:02:55 +01:00
Andrew Wood 65edd8ff3a Add the missing new file. 2026-06-11 22:02:30 +01:00
Andrew Wood 5e8d201571 Link to the issue in which the benchmark script was introduced. 2026-06-10 22:56:44 +01:00
Andrew Wood 7523111d67 Message line number updates. 2026-06-10 21:28:26 +01:00
Andrew Wood d4a0d4ffdd Document the benchmark script. 2026-06-09 23:26:30 +01:00
Andrew Wood aeecd914cf Report the filename and then the error, the same as all other messages. 2026-06-08 21:56:00 +01:00
Andrew Wood 1190e70085 Report the system error message along with the syscall. 2026-06-08 21:50:32 +01:00
Andrew Wood 34ee909c59 Minor wording correction. 2026-06-08 21:33:21 +01:00
Andrew Wood ed14b56a7c Remove leftover "elapsed" file reference. 2026-06-07 20:38:51 +01:00
Andrew Wood ca7829b996 End the last command in the sed function with a semicolon to fix breakage on OpenBSD. 2026-06-07 20:35:21 +01:00
Andrew Wood 1c99a3820b Eliminate "\t" from sed substitutions. 2026-06-07 20:30:20 +01:00
Andrew Wood 9258cee615 Don't rely on "\n" substituting a newline in a sed replacement - doesn't work on OpenBSD sed. 2026-06-07 00:40:31 +01:00
Andrew Wood c427c367c1 Add alternative sorting for systems without "sort -V". 2026-06-07 00:28:11 +01:00
Andrew Wood f58ad83c95 Try to use "-r" with cksum since on OpenBSD that gives the hash first. 2026-06-07 00:10:19 +01:00
Andrew Wood 05f9adade5 Fall back to "cksum -a md5" if "md5sum" is not available. 2026-06-07 00:04:19 +01:00
Andrew Wood b29da37462 Use a maximum of 3/4 of the space in the temporary directory, to avoid the "quota exceeded" errors on /dev/shm seen on some OSes during testing. 2026-06-06 19:57:39 +01:00
Andrew Wood 827614dd66 Note the timer addition to splice (and copy_file_range) to match what happens with a write. 2026-06-06 00:52:37 +01:00
Andrew Wood d075ddf1ed Add timed signal interruption to the read side as well as the write, so that a non-write transfer method like splice or copy_file_range will still get interrupted if it takes too long. 2026-06-05 23:30:49 +01:00
Andrew Wood 5971d622bd Remove the TODO after testing confirmed that ENOSPC in copy_file_range causes fallback through splice() to read()/write() and eventually normal termination; and add more debugging. 2026-06-05 23:01:07 +01:00
Andrew Wood 14ee298bc3 Fall back through the different transfer methods in a consistent way, so that after a copy_file_range failure, splice through intermediate pipes can still be tried (#196). 2026-06-04 23:44:56 +01:00
Andrew Wood 07c1798b5e Re-order and re-word for clarity so the user-visible features come first, and mention the extension to %T. 2026-06-01 23:28:07 +01:00
Andrew Wood 4765b677e7 Message line number updates. 2026-06-01 23:25:47 +01:00
Andrew Wood 9dbec3cf50 Remove the build directory after running the benchmarks in -d mode (#198). 2026-06-01 21:41:32 +01:00
Andrew Wood 246d7701e4 Cap the amount passed to splice() and copy_file_range() to a specific value, don't just pass SIZE_MAX, since that value can cause errors, making the transfer fall back to read()/write(). 2026-06-01 21:36:38 +01:00
Andrew Wood 8f4bed3274 Remove the "directed output" tests since they give the same results as writing stdout to a file and can't be used with stdout going to a pipe; and add formatting options to show transfer buffer usage details (#198). 2026-06-01 21:11:18 +01:00
Andrew Wood 7e993ba14e Note the use of copy_file_range (#196). 2026-05-31 23:40:11 +01:00
Andrew Wood ae0fe82d8a Cast to unsigned long long to avoid issues on 32-bit systems (#196). 2026-05-31 23:33:28 +01:00
Andrew Wood 76a8da7dc1 Cast in the other direction because on 32-bit systems a size_t is smaller than an off_t (#196). 2026-05-31 22:29:54 +01:00
Andrew Wood 6130d65249 Use copy_file_range() for transfers if it is available (#196). 2026-05-31 22:18:18 +01:00
Andrew Wood 85918358a5 Clean up at the end of a benchmark run, before the next one, in multi-sources mode; and remove the output files before starting each measurement. 2026-05-31 01:43:54 +01:00
Andrew Wood 0331673e02 Minor documentation fixes, and update the version (#198). 2026-05-31 01:16:41 +01:00
Andrew Wood 542c91cdbc Correct the minimum temp space requirements since there are 2 input files and 2 output files, not 1 output file. 2026-05-31 01:01:23 +01:00
Andrew Wood 868a054366 Add an option to read source tar.gz files from a directory and extract, compile, and benchmark pv from each one. 2026-05-31 00:58:52 +01:00
Andrew Wood 549db120db Documentation cleanup. 2026-05-30 23:49:58 +01:00
Andrew Wood 0a1e53c2db Silence the warning about tr. 2026-05-30 23:24:49 +01:00
Andrew Wood ecfe1f72e3 Allow comparison between runs as well as between pv versions, with auto selection the default; add an option to only show the final line of each comparison so only the latest is shown; and add an option for a terse analysis format. 2026-05-30 23:22:42 +01:00
Andrew Wood 703cf06b7e Add an explanation to the version comparison report. 2026-05-30 22:38:03 +01:00
Andrew Wood 3628ed5072 Show each measurement command in the analysis. 2026-05-30 22:29:47 +01:00
Andrew Wood 067c9aa7a3 Line up the columns in the analysis report. 2026-05-30 22:24:20 +01:00
Andrew Wood 9b3f37c233 Make the awk variable names more consistent. 2026-05-30 21:59:04 +01:00
Andrew Wood b20598ff72 Move measurement definitions into a list so that individual measurements can be selected to be run on their own. 2026-05-30 21:52:29 +01:00
Andrew Wood 8bd5e89f92 Remove accidental extra field from mean and standard deviation reports, and add an analysis of how each measurement performs between PV versions. 2026-05-30 20:10:24 +01:00
Andrew Wood 905894f294 Rename the new benchmark script. 2026-05-29 22:17:27 +01:00
Andrew Wood 453bcec11a Accept command line options, and allow addition of an analysis step later. 2026-05-29 22:16:25 +01:00
Andrew Wood a984ab5dd3 Be less specific and so more accurate. 2026-05-29 21:24:33 +01:00
Andrew Wood 624097639f Message line number updates. 2026-05-29 21:09:47 +01:00
Andrew Wood 47ca0d8cf8 Provide a system ID to identify the host running test, the PV version, and a run ID for the whole test, as three separate fields in each output line, for easier processing later. 2026-05-29 20:03:37 +01:00
Andrew Wood 5944115d94 Measure each type of transfer several times, and calculate the mean and standard deviation afterwards. 2026-05-28 23:42:19 +01:00
Andrew Wood b99026d7d7 Add a benchmark script to measure transfer rate and CPU usage of various options (#198). 2026-05-27 23:27:56 +01:00
Andrew Wood f72486d4e8 Don't cap splice() amounts to the transfer buffer size, since the transfer buffer isn't being used. 2026-05-26 23:32:38 +01:00
Andrew Wood e74cab6985 If discarding input but /dev/null can't be used as a splice() destination, fall back to normal read() rather than exiting with an error (#192). 2026-05-26 22:36:58 +01:00
Andrew Wood a0a097decb Mention that the ETA will be displayed on the second part. 2026-05-24 15:51:06 +01:00
Andrew Wood d0b230bceb Reword the explanation. 2026-05-24 15:29:01 +01:00
Andrew Wood 63f4a0bc39 Datestamp update. 2026-05-24 15:03:42 +01:00
Andrew Wood 983f75c7df Message line number updates. 2026-05-23 00:33:08 +01:00
Andrew Wood e043efd259 Handle splice failures more robustly when the intermediate pipe is involved. 2026-05-23 00:32:50 +01:00
Andrew Wood 7e99aa5b13 Expand the description of --no-splice. 2026-05-22 21:43:30 +01:00
Andrew Wood 2d08b3208a Expand the explanation of "--name" and "--cursor" and remove "you". 2026-05-22 21:31:09 +01:00
Andrew Wood 944ae9aca1 Reword to remove implied agency. 2026-05-22 21:18:34 +01:00
Andrew Wood e82d5e48f4 Simplify the explanation of --delay-start. 2026-05-22 21:15:06 +01:00
Andrew Wood 98c92e0239 Make the --wait example a little clearer. 2026-05-22 20:52:42 +01:00
Andrew Wood 6c5d86c66f Add the missing closing bracket. 2026-05-22 20:44:43 +01:00
Andrew Wood 9d96c7d6eb Fill in more empty translations, using coreutils translations as a guide. 2026-05-21 21:31:43 +01:00
Andrew Wood 1f27ba3b35 Try to explain more clearly. 2026-05-20 22:58:53 +01:00
Andrew Wood 4aa73d5fc6 Note the updated translations. 2026-05-19 21:30:28 +01:00
Andrew Wood 50150d0d66 Fill in empty translations, move accidentally repeated comment. 2026-05-19 21:22:05 +01:00
Andrew Wood 192566a9fd Fill in empty translations and make capitalisation more consistent. 2026-05-19 21:21:24 +01:00
Andrew Wood 6dcb41f2fa Fill in empty translations. 2026-05-19 21:20:02 +01:00
Andrew Wood 54b0c8bc23 Datestamp update. 2026-05-18 22:00:54 +01:00
Andrew Wood 6609500d90 Note the addition of a partial Georgian translation catalogue. 2026-05-17 21:27:47 +01:00
Andrew Wood 905e27ad47 Remove overly specific edge-case error messages, where just the filename and the system error would suffice; replace all the different types of memory allocation error with "memory allocation failure", since the action for the end-user is the same in all cases; and use the error messages "memory allocation failure", "interrupted by a signal", "error closing file", "input file is also the output", and "write error" since these are all used by either coreutils and grep, in similar contexts, so their translations can be copied. 2026-05-17 00:31:46 +01:00
Andrew Wood df77b78e23 Merge pull request 'Translations update from Codeberg Translate' (#195) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/195
2026-05-16 21:27:26 +02:00
a-j-woodandCodeberg Translate 87f2326012 Translated using Weblate (Georgian)
Currently translated at 54.0% (80 of 148 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/ka/
2026-05-16 19:25:57 +00:00
Andrew Wood a0cd6a5d18 Describe the values in the --stats line in the correct order. 2026-05-16 20:21:31 +01:00
Andrew Wood e11d1dec19 Message line number updates. 2026-05-16 16:13:51 +01:00
Andrew Wood b51afc07e2 Correct the --bar-style description to use the same placeholder as in the option spec. 2026-05-16 16:13:26 +01:00
Andrew Wood 813f6aaeab Note the fixes in splice() handling. 2026-05-16 16:12:39 +01:00
Andrew Wood 49adee62c4 Merge pull request 'Translations update from Codeberg Translate' (#194) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/194
2026-05-16 17:06:10 +02:00
a-j-woodandCodeberg Translate 35d1e59f74 Translated using Weblate (Georgian)
Currently translated at 20.2% (30 of 148 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/ka/
2026-05-16 15:05:00 +00:00
Andrew Wood 1a00a7fdf5 Correct the off_t/size_t max_to_write overflow check. 2026-05-15 23:42:49 +01:00
Andrew Wood d546e90a94 Break pv__transfer_read() into smaller functions to separate out the different parts, and improve the splice() handling when rate limiting and when EOF / Control-D is typed into stdin. 2026-05-15 23:23:24 +01:00
Andrew Wood 82de6be6fd Adjust removal note now Georgian has been restored. 2026-05-14 21:54:07 +01:00
Andrew Wood 958cacf4bb Restore the empty Georgian language file as requested. 2026-05-14 21:53:11 +01:00
Andrew Wood 8198058bb2 Message line number updates. 2026-05-14 21:51:45 +01:00
Andrew Wood 60203aabf5 Add retries on signal interrupt to the splicing into and out of the intermediate input pipe, and add a TODO marker highlighting a problem with the way splice() is currently handled. 2026-05-13 22:19:03 +01:00
Andrew Wood d65dbd2f37 Make pv_format() static, as it is only used in one place (cppcheck recommendation). 2026-05-12 23:06:09 +01:00
Andrew Wood 65741d9b2e Remove needless "continue" in the empty "for" loop (cppcheck recommendation). 2026-05-11 20:59:42 +01:00
Andrew Wood 4fbcfebc6c Remove needless comparisons that would always be true here (cppcheck recommendation). 2026-05-11 20:56:10 +01:00
Andrew Wood 270bcb066e Make pv_watchfd_info() and pv_reset_watchfd() static, as they are only used in one place (cppcheck recommendation). 2026-05-11 20:50:43 +01:00
Andrew Wood 229aadf194 Make the struct dirent a const (cppcheck recommendation). 2026-05-11 20:43:45 +01:00
Andrew Wood 6b0f8477d0 Message line number updates. 2026-05-10 20:52:15 +01:00
Andrew Wood 61b412b0f1 Mark pointers to constant buffers as const (cppcheck recommendation). 2026-05-10 20:38:49 +01:00
Andrew Wood 6772d7e5a1 Read the EOF values in the debug statements by dereferencing the eof_in and eof_out pointers, not by using the pointers as a truth value. 2026-05-10 20:17:11 +01:00
Andrew Wood f6b2196369 Reduce the scope of offset (cppcheck recommendation). 2026-05-10 20:05:42 +01:00
Andrew Wood d2c183d234 Remove redundant assigment (cppcheck recommendation). 2026-05-10 19:55:02 +01:00
Andrew Wood e09976042d Reduce the scope of the first keyword_index (cppcheck recommendation), and in the formatter, guard against a size_t underflow by checking the write position each time it's used (implied by cppcheck). 2026-05-10 19:25:07 +01:00
Andrew Wood 7ddbc72525 Make the struct tm a const (cppcheck recommendation). 2026-05-10 19:19:30 +01:00
Andrew Wood 7c19f58e75 Mark pointers to constant buffers as const (cppcheck recommendation). 2026-05-10 19:18:01 +01:00
Andrew Wood 723d96b54b Mark argument as pointer to const, since only the pointer changes (cppcheck recommendation). 2026-05-10 19:17:12 +01:00
Andrew Wood 6b5d217e22 Reduce the scope of end_idx (cppcheck recommendation). 2026-05-10 19:15:54 +01:00
Andrew Wood d9eb83e1f5 Make the struct tm a const (cppcheck recommendation). 2026-05-10 19:15:17 +01:00
Andrew Wood 411f9529a2 Message line number updates. 2026-05-09 20:25:04 +01:00
Andrew Wood adf2767763 Additional commentary on total_written and rate limiting. 2026-05-09 20:24:49 +01:00
Andrew Wood 4fc5d10671 Remove spurious extra word. 2026-05-09 20:08:25 +01:00
Andrew Wood 19d1835d37 Message line number updates. 2026-05-09 20:04:09 +01:00
Andrew Wood 6f9e73f058 Add more detailed comments about the rate limiter. 2026-05-09 20:04:02 +01:00
Andrew Wood 5897576ca1 Message line number updates. 2026-05-09 17:23:50 +01:00
Andrew Wood 9b28da72eb Acknowledge the contribution. 2026-05-09 17:22:32 +01:00
Andrew Wood d49234eefe Update the notes about numbers passed to --rate-limit. 2026-05-09 17:18:42 +01:00
Andrew Wood 4bfe83a445 Note the --rate-limit change allowing decimal values. 2026-05-09 17:16:22 +01:00
Andrew Wood 228ff740bf Merge branch 'fractional_rate_limit' (#193). 2026-05-09 16:15:14 +01:00
Andrew Wood c69343856a Correct the broken pull links from before the repository move (/pull/ should be /pulls/ on Codeberg). 2026-05-09 16:12:38 +01:00
Andrew Wood d381a1c714 Correct the rate limit burst cap so it won't prevent output when the rate is below 0.2, and handle the case where more than one rate limit interval has passed since the last calculation (#193). 2026-05-09 00:37:29 +01:00
Andrew Wood 0a98062586 Define RATE_BURST_WINDOW as a floating point value since it's used in floating point calculations (#193). 2026-05-09 00:35:19 +01:00
Andrew Wood e7087b101d Allow "-L 0" to be propagated with "-R" so that a remote process can have its rate limiting turned off as well as on; and update the manual to note this (#193). 2026-05-08 21:07:29 +01:00
Andrew Wood eae06cf3c0 Correct the remote setting of the rate limit so that -R without -L does not turn off the current rate limiting of the remote process (#193). 2026-05-07 23:00:33 +01:00
Andrew Wood 0e7a77b42a Allow the rate limit to be specified as a fractional number (#193). 2026-05-06 23:24:51 +01:00
Andrew Wood a78a432f50 Message line number updates. 2026-05-05 21:05:27 +01:00
Andrew Wood 4867b641a7 Adjust the item ordering. 2026-05-05 21:03:55 +01:00
Andrew Wood 355d030ce0 Datestamp update. 2026-05-05 20:55:17 +01:00
Andrew Wood 547efed258 Set the exit status to 8 when /dev/null is not usable and --discard is active (#192). 2026-05-04 16:30:34 +01:00
Andrew Wood a4b90879a0 Add the messages for the pipe buffer size option and /dev/null detection. 2026-05-03 20:57:00 +01:00
Andrew Wood 3b1bad2334 Acknowledgements update. 2026-05-03 20:56:33 +01:00
Andrew Wood cfe7b4e97a Whitespace correction in comment. 2026-05-03 19:42:33 +01:00
Andrew Wood 10895792d2 When opening /dev/null internally, check that it really is a null device, and refuse to use it if not (#192). 2026-05-03 19:37:27 +01:00
Andrew Wood 6b19d8e31c Note the changes relating to the intermediate input pipe and the discard splice. 2026-05-03 18:30:57 +01:00
Andrew Wood f3ce23e7c7 Adjust the text relating to splice() in relation to the intermediate pipe development. 2026-05-03 18:26:55 +01:00
Andrew Wood 663a54bda0 Merge the changes for #188 and #191 which add an intermediate pipe on the input side to allow splice() to be used for all transfers. 2026-05-03 17:59:13 +01:00
Andrew Wood ae60fc0688 Move output_fd into HAVE_SPLICE. 2026-05-03 17:06:47 +01:00
Andrew Wood 11d727a88d In discard mode, if splice() is available, open a file descriptor to /dev/null and splice the input to that, to improve performance (#191). 2026-05-03 14:53:45 +01:00
Andrew Wood b75ecd79d5 Add comments explaining the steps (#188). 2026-05-03 13:42:27 +01:00
Andrew Wood 5fb7e49848 Start the intermediary pipe buffer size at 1MiB (#188). 2026-05-03 13:41:52 +01:00
Andrew Wood 21c8237a73 When splice() is available but neither the input nor the output are pipes, splice the input through an intermediary pipe (#188). 2026-05-03 01:12:33 +01:00
Andrew Wood b300046eb1 Acknowledgements update. 2026-05-02 17:12:21 +01:00
Andrew Wood 17cbab3045 Add an option "-J" / "--pipe-buffer-size" to set the size of the output pipe buffer when the output is a pipe, and when that option is not specified, automatically increase the output pipe buffer size to match that of the input, when the first input is also a pipe (#188). 2026-05-02 16:42:35 +01:00
Andrew Wood d421024fb8 Run through "make indent" for consistency, update message line numbers. 2026-05-01 19:47:10 +01:00
Andrew Wood 7a6ce0f0b6 Message line number updates. 2026-05-01 19:10:30 +01:00
Andrew Wood b1bf99c09b Datestamp update. 2026-05-01 19:10:04 +01:00
Andrew Wood 096b655bb8 Remove the note about getting stuck when writing to an exited reader, as it was fixed in #189. 2026-05-01 19:09:20 +01:00
Andrew Wood 7a276040ad Note the fix for the endless wait on EOF issue (#189). 2026-05-01 19:07:44 +01:00
Andrew Wood 89d2a7840f Acknowledge the contributor of the fix for endlessly waiting for an exited receiver to empty the pipe buffer (#189, #190). 2026-05-01 19:07:07 +01:00
Andrew Wood fb2b325e94 Merge pull request 'fix: avoid EOF hang on unread pipe output (#189)' (#190) from whoschek/pv:wip/eof_hang into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/190
Reviewed-by: Andrew Wood <a-j-wood@noreply.codeberg.org>
2026-05-01 19:42:43 +02:00
Wolfgang Hoschek e7d188ac65 fix: avoid EOF hang on unread pipe output (#189)
At EOF, pv waits for bytes already written to an output pipe to be consumed before finishing. If the downstream reader exits without reading those bytes, the pipe can keep reporting unread data forever. Since pv has no more input, there is no later write that would fail with EPIPE and break the wait.

Detect this EOF drain-wait case with a non-blocking poll() on the output pipe. When the pipe reports that its readers are gone, mark the pipe closed and stop waiting for bytes that can no longer be consumed. While a reader is still present, keep the existing behaviour and continue waiting for the pipe buffer to drain.

Add regression coverage for both ways pv can reach this state: direct input that leaves unread output bytes behind, and a pipeline where the original producer fails but an intermediate filter such as gzip still emits a valid empty stream. The latter matters because pv can still have pending output at EOF even when the command at the start of the pipeline failed immediately.

Signed-off-by: Wolfgang Hoschek <wolfgang.hoschek@mac.com>
2026-04-30 04:47:09 -04:00
Andrew Wood 79a6420fea Replace the fixed-sized buffer file_fdpath with a dynamically allocated equivalent. 2026-04-29 21:43:46 +01:00
Andrew Wood c54c3258a6 Acknowledge the reporter (#187). 2026-04-29 20:10:02 +01:00
Andrew Wood 0c28d017de Note the signal interrupt message feature (#187). 2026-04-29 19:54:27 +01:00
Andrew Wood 0a69501594 Add the new signal interrupt message (#187). 2026-04-29 19:53:43 +01:00
Andrew Wood a3f0caeab4 Record the received number before setting the exit trigger, so it will definitely be available for reporting (#187). 2026-04-28 22:55:16 +01:00
Andrew Wood 478039f539 Report which signal triggered the exit (#187). 2026-04-28 22:53:23 +01:00
Andrew Wood 2a25221eaf Suppress the error message about a signal interrupt in cursor mode in all but the first instance in a pipeline (#187). 2026-04-27 21:27:20 +01:00
Andrew Wood c763f1fcaa Write an error message if interrupted by a signal such as SIGINT (#187). 2026-04-26 21:45:36 +01:00
Andrew Wood 8b4fa8ade7 Clear the terminal flag ECHOCTL before starting, and set it again at the end, similar to how TOSTOP is dealt with (#187). 2026-04-26 20:01:22 +01:00
Andrew Wood 57f0b91d16 Adjust the watchfd changes for Apple builds. 2026-04-25 23:05:17 +01:00
Andrew Wood a66a1cc10c Message line number updates. 2026-04-25 22:06:18 +01:00
Andrew Wood 2a31b73a32 Replace the fixed-sized buffers file_fdinfo and file_fdsymlink with dynamically allocated equivalents. 2026-04-25 22:04:38 +01:00
Andrew Wood ee96f3f43b Specify which watched PID had the problem. 2026-04-25 21:04:41 +01:00
Andrew Wood 2b1d359281 Use pv_asprintf() to allocate fd_dir instead of having it statically sized. 2026-04-25 21:03:09 +01:00
Andrew Wood 4854d71aa9 Adjustment from "make indent". 2026-04-25 21:01:56 +01:00
Andrew Wood 18b1926d61 Replace the fixed-size "cwd" buffer with a dynamically allocated one. 2026-04-24 23:00:45 +01:00
Andrew Wood 43a54bd541 Rename the pvwatchfd "file_fd" item to "file_fdsymlink" to to better distinguish it from the other structure members. 2026-04-23 21:42:10 +01:00
Andrew Wood bf371e9a8c Tidy up comments. 2026-04-22 22:21:36 +01:00
Andrew Wood 239a20d13f Tidy up comments. 2026-04-21 23:45:56 +01:00
Andrew Wood a220e993af Adjust the wording as pv does not "know" things. 2026-04-21 22:18:13 +01:00
Andrew Wood a955038360 Document the behaviour exhibited when pv writes to a pipe and the reader exits with unread data in the pipe buffer. 2026-04-21 22:13:44 +01:00
Andrew Wood c0e530eefd Use awk instead of the non-portable "~" sed command. 2026-04-20 22:55:24 +01:00
Andrew Wood 1d28da18ce Add a basic test for monitoring, each of the "in" and "out" sides. 2026-04-19 23:12:10 +01:00
Andrew Wood 571c3bee06 Datestamp update. 2026-04-19 21:51:24 +01:00
Andrew Wood 618f1c1578 Message line number updates. 2026-04-19 21:49:12 +01:00
Andrew Wood 496b1e431e Return a boolean from pv__transfer_read/write, where false indicates a transient error. 2026-04-19 21:47:46 +01:00
Andrew Wood ef9240a7a5 Add another _ to the internal read/write_repeated functions so they are easier to distinguish from pv__transfer_read/write when searching. 2026-04-19 21:15:33 +01:00
Andrew Wood b2f44b6724 Clamp the calculated ETA to within the size of a long integer to avoid over/underflows, and round off the floating point value rather than just truncating the decimal portion. 2026-04-19 17:57:32 +01:00
Andrew Wood c19d16b3c8 Loosen the limits on this test slightly. 2026-04-19 17:47:52 +01:00
Andrew Wood 0440ba26da Adjust the ETA clamp note to mention 64-bit. 2026-04-19 16:58:55 +01:00
Andrew Wood 070bcb5acc Message line number updates. 2026-04-19 16:58:14 +01:00
Andrew Wood f3353cb4bd Adjust the ETA max to 68 years on systems where a long integer is 32 bits wide, as that is all that will fit. 2026-04-19 16:58:05 +01:00
Andrew Wood 9f63212a7c Add pv_asprintf() and change the way the terminal lock file is stored, so it is in a dynamically allocated buffer rather than using one of a fixed size. 2026-04-19 16:24:26 +01:00
Andrew Wood a59c91f03d Note the time clamping changes. 2026-04-19 13:06:59 +01:00
Andrew Wood f724ebe158 Message line number updates. 2026-04-19 13:04:30 +01:00
Andrew Wood 3bc102c334 Increase the ETA max cutoff to just under 1,000,000 days, not 100,000. 2026-04-19 13:04:05 +01:00
Andrew Wood d638cd50f4 Remove pv_bound_long() and the blanket 100,000 hour cutoff - instead, clamp the ETA to just under 100,000 hours (to keep it from getting too wide), clamp the FINETA to a max of 7,000 years (to keep the date the same width), and make the timer show an overflow message when 1,000,000 days is reached. 2026-04-19 13:02:03 +01:00
Andrew Wood ebbcdf4b4d Remove obsolete TODO - there is no open issue for it, and it doesn't explain what "better" means. 2026-04-19 12:16:48 +01:00
Andrew Wood b3410cf8c0 Adjust the lower boundary to make failure less likely on a heavily loaded system. 2026-04-19 00:19:29 +01:00
Andrew Wood dc51002ba4 Reword the introduction, and mention monitor mode. 2026-04-19 00:09:26 +01:00
Andrew Wood 9bc5903337 Remove the empty translation catalogues for Spanish and Georgian, as they are unmaintained and have never received any submissions. 2026-04-18 22:34:32 +01:00
Andrew Wood 26c4ad45bd Note the error reporting change. 2026-04-18 22:30:39 +01:00
Andrew Wood cb8cac81aa Message line number updates. 2026-04-18 22:24:09 +01:00
Andrew Wood 7dc02a475e Make pv_error() and pv_perror() available outside of src/pv/, and use them throughout the program. 2026-04-18 22:23:28 +01:00
Andrew Wood 25f43e129f Use pv_perror() rather than perror(), for consistency. 2026-04-18 21:46:16 +01:00
Andrew Wood b12681d667 Add a pv_perror() function to remove all the repeated strerror(errno) calls from pv_error() arguments, and standardise the error lines so the filename in question always comes first. 2026-04-18 21:07:08 +01:00
Andrew Wood 0af9cb2314 Use pv_error() instead of writing directly to stderr. 2026-04-18 20:33:07 +01:00
Andrew Wood fc364d381f Dynamically allocate the error message prefix, instead of copying it into a static buffer. 2026-04-18 20:30:39 +01:00
Andrew Wood 0481e99c2f Use pv_error() instead of writing directly to stderr. 2026-04-18 20:29:40 +01:00
Andrew Wood 7eedf884ea Add TODO markers for changes to make the code easier to understand. 2026-04-18 20:11:20 +01:00
Andrew Wood ebefc02f4e Tidy up comments. 2026-04-18 18:00:48 +01:00
Andrew Wood 17d9ee59e7 Tidy up comments. 2026-04-18 17:41:14 +01:00
Andrew Wood fec4253f07 Tidy up comments. 2026-04-18 17:23:13 +01:00
Andrew Wood 505a6d9d2b Tidy up comments. 2026-04-18 14:48:13 +01:00
Andrew Wood 3a90959f9c Tidy up comments. 2026-04-18 14:37:29 +01:00
Andrew Wood 73d1237f1b Tidy up comments. 2026-04-17 23:27:30 +01:00
Andrew Wood 1b5a936ebf Tidy up comments. 2026-04-16 21:59:49 +01:00
Andrew Wood 7de5e2ca33 Tidy up comments. 2026-04-16 20:49:44 +01:00
Andrew Wood 854186c942 Tidy up comments. 2026-04-16 20:46:07 +01:00
Andrew Wood 39c7d4f586 Tidy up comments. 2026-04-15 22:00:50 +01:00
Andrew Wood 2e08bbb20a Tidy up comments. 2026-04-14 22:17:00 +01:00
Andrew Wood bea21335c0 Add TODO markers for the removal of fprintf(stderr). 2026-04-14 21:54:33 +01:00
Andrew Wood ba80d546bc Tidy up comments. 2026-04-14 21:49:50 +01:00
Andrew Wood d120d654c6 Tidy up comments. 2026-04-13 21:25:03 +01:00
Andrew Wood b68560a5b6 Tidy up comments. 2026-04-13 20:16:48 +01:00
Andrew Wood d66343d6f6 Fix a typo in a comment. 2026-04-12 21:33:57 +01:00
Andrew Wood 7e1aa366b6 Note the cleanups made so far. 2026-04-12 20:14:37 +01:00
Andrew Wood 4749cdbb27 Tidy up comments, add a TODO marker for removal of a static buffer. 2026-04-12 20:08:21 +01:00
Andrew Wood 70fd445307 Fix a typo in a comment. 2026-04-12 18:41:15 +01:00
Andrew Wood 99d27893eb Add TODO markers for later improvements. 2026-04-12 18:39:38 +01:00
Andrew Wood ef730dda06 Minor corrections to the comments. 2026-04-12 17:42:16 +01:00
Andrew Wood e82aa71f26 Update message positions. 2026-04-11 15:52:28 +01:00
Andrew Wood e0f091384f Replace fgets() with getline() to eliminate buffers of a fixed size. 2026-04-11 15:51:42 +01:00
Andrew Wood bca6fc9542 Tidy up the comments. 2026-04-11 13:39:51 +01:00
Andrew Wood 937298eec2 Update message positions. 2026-04-11 13:39:35 +01:00
Andrew Wood 2ff99ab1cd Add TODO markers for elimination of fixed size buffers. 2026-04-09 22:01:54 +01:00
Andrew Wood 593723ba92 Explain the error branch. 2026-04-09 21:58:38 +01:00
Andrew Wood 989a34b7c7 Explain what's going on with realloc(). 2026-04-09 21:44:57 +01:00
Andrew Wood 49b6c71f42 Message line number updates. 2026-04-08 22:05:32 +01:00
Andrew Wood b3eacc71d0 Note the --help fix on small terminals. 2026-04-07 23:09:42 +01:00
Andrew Wood 0eab393715 Make it clearer what display_word_wrap() does and set the margins more appropriately when the terminal size is small. 2026-04-07 23:08:53 +01:00
Andrew Wood 52585447f0 Correct the wrapping width on lines after the first, improve the commenting, and avoid size_t underflow on very narrow terminals. 2026-04-07 22:20:55 +01:00
Andrew Wood 3eff81f1a6 Update the translations count for coralpink. 2026-04-06 16:58:15 +01:00
Andrew Wood 72376e2d29 Merge changes from weblate (#186). 2026-04-06 16:44:15 +01:00
Coral PinkandCodeberg Translate 7532f33c7d Translated using Weblate (Polish)
Currently translated at 100.0% (145 of 145 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/pl/
2026-04-06 15:34:16 +00:00
Andrew Wood cf68a17f33 Message line number updates. 2026-04-06 16:08:10 +01:00
Andrew Wood f4a3d61a17 Restructure the "monitor remaining side" part to avoid the need for a fallthrough in the case statement, getting rid of compiler warnings on CentOS 5, 6, and 7, and arguably making the code easier to follow. 2026-04-06 16:07:56 +01:00
Andrew Wood e01e456825 Note the cleanup of the OpenBSD warning. 2026-04-06 15:20:08 +01:00
Andrew Wood ba0738496e In the stub pv_remote_check() used where remote control is unavailable (OpenBSD), return false so there is a return value. 2026-04-06 15:19:24 +01:00
Andrew Wood bec0b6924e Update message positions, and add the new strings for monitor mode. 2026-04-06 14:12:59 +01:00
Andrew Wood 1f96f368bd Note the correction to --pidfile error checking. 2026-04-05 20:42:05 +01:00
Andrew Wood 3aac6a7b64 Tidy up the comments. 2026-04-05 20:23:38 +01:00
Andrew Wood fc23d71226 Return an error from pv__write_pidfile() if the final rename() fails. 2026-04-05 19:34:00 +01:00
Andrew Wood c2474f5c33 Tidy up the comments. 2026-04-05 19:30:51 +01:00
Andrew Wood 9427d210d8 Remove the "ratio" option flag, as it is not needed (#67). 2026-04-05 15:10:53 +01:00
Andrew Wood bd5b709dda Calculate the size, in monitor mode (#67). 2026-04-04 21:43:43 +01:00
Andrew Wood b79273bb91 At the end of the transfer, exchange information with the other monitor when in "monitor both" mode, so both sides learn each other's final transfer value, to give the correct final ratio (#67). 2026-04-04 21:07:04 +01:00
Andrew Wood f5fd94ef77 Note the warning cleanup. 2026-04-04 13:44:47 +01:00
Andrew Wood 7c0573c847 Version bump for feature addition. 2026-04-04 13:37:15 +01:00
Andrew Wood 02b3f215fc Update to match the source material, for --monitor (#67). 2026-04-04 13:35:52 +01:00
Andrew Wood 00b03fbfea Note the --monitor option (#67). 2026-04-04 13:34:14 +01:00
Andrew Wood 74de4e9a01 Merge branch 'wrap_process' 2026-04-04 13:30:50 +01:00
Andrew Wood d8cc637b56 Add the "%{ratio}" formatter (#67). 2026-04-03 21:49:41 +01:00
Andrew Wood 8f19633dd7 In "-M both" mode, exchange information about the total amount transferred with the other side (#67). 2026-04-03 21:12:13 +01:00
Andrew Wood 6c3a08af2b Document the ratio formatting sequence (#67). 2026-04-03 20:32:14 +01:00
Andrew Wood 7892e54d7e Rather than setting an option flag for ratio, add it to the default format string on the "out" side (#67). 2026-04-03 20:20:50 +01:00
Andrew Wood d7327aaf95 Replace pv_state_set_format() with pv_set_format_options(), which takes a structure rather than a long list of arguments, to make it easier to pass around - and rely on pv_state_name_set() being called first rather than doing it within this function, so it is only doing one job (#67). 2026-04-03 20:00:42 +01:00
Andrew Wood 80358e84f3 If no display options are passed and "-M both" is active, set a "ratio" option flag to display the in:out ratio as well (#67). 2026-04-02 23:08:49 +01:00
Andrew Wood 002780fbaf Ignore files autogenerated by "autoreconf" (#185). 2026-04-01 22:14:57 +01:00
Andrew Wood 1003bbb121 Remove src/include/config.h.in from the repository as it is generated by "autoreconf" and causes conflicts (#185). 2026-04-01 22:11:40 +01:00
Andrew Wood f36ff9b378 Remove po/Makefile.in.in from the repository as it is generated by "autoreconf" and causes conflicts (#185). 2026-04-01 22:09:19 +01:00
Andrew Wood ad834055db Acknowledge PR#180. 2026-03-31 22:18:00 +01:00
Andrew Wood 7ce6d275ba Merge pull request 'fix discard const qualifier from pointers' (#180) from heitbaum/pv:const into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/180
2026-03-31 23:10:13 +02:00
Andrew Wood 8ef4ff2e84 If an empty format string is supplied, such as -F "", make that imply -q and cancel -c, so that -F "" -F "%b %t %r %p %e" -M both will monitor both sides but only display the output side - which will be useful when ratio is added (#67). 2026-03-30 21:41:16 +01:00
Andrew Wood 00f06f2b2c Pass the othermonitor_* values into the main state, and add TODO markers for next steps (#67). 2026-03-29 21:49:47 +01:00
Andrew Wood 2a54d4edcc Set up a pair of pipes for the in and out monitors to use to pass progress details between each other, and replace repeated "close if open" code with a macro (#67). 2026-03-28 22:40:45 +00:00
Andrew Wood 8281b918ef Add a TODO marker for monitor mode suggesting another way to pass ratio information between in and out (#67). 2026-03-27 22:28:07 +00:00
Andrew Wood 3c8393f8be Note the translation updates. 2026-03-26 23:42:56 +00:00
Andrew Wood b1178b2ee2 Acknowledge Finnish translations submitter (#184). 2026-03-25 23:46:22 +00:00
Andrew Wood d670d47542 Merge pull request 'Translations update from Codeberg Translate' (#184) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/184
2026-03-26 00:43:49 +01:00
Ricky-TiggandCodeberg Translate 00cd3cfcc5 Translated using Weblate (Finnish)
Currently translated at 90.7% (127 of 140 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/fi/
2026-03-24 23:25:21 +00:00
Andrew Wood 7edbd3e951 Add a TODO about how to get ratio information (#67). 2026-03-24 23:06:36 +00:00
Andrew Wood d98237134b Adjust the -M help so it specifies the range of accepted values (#67). 2026-03-23 22:33:25 +00:00
Andrew Wood 53d9f81eee Update the translation totals. 2026-03-22 16:47:21 +00:00
Andrew Wood 7e504b2f47 Merge pull request 'Translations update from Codeberg Translate' (#183) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/183
Reviewed-by: Andrew Wood <a-j-wood@noreply.codeberg.org>
2026-03-22 17:42:33 +01:00
Andrew Wood 0e2e30a74c Add a release checklist step to check for updates translations. 2026-03-22 16:36:33 +00:00
Codeberg Translate 7373ccfaad Merge remote-tracking branch 'origin/main' 2026-03-22 16:32:04 +00:00
Coral PinkandCodeberg Translate 1442c148d8 Translated using Weblate (Polish)
Currently translated at 100.0% (140 of 140 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/pl/
2026-03-22 15:50:00 +00:00
Andrew Wood 59873f1d41 Commit to new version and release date. 2026-03-22 14:54:11 +00:00
Andrew Wood 805f66badf Timestamp update. 2026-03-22 14:53:43 +00:00
Andrew Wood a063b95005 Fix the rate calculation when --bits is used - patch from user mojohakase (#182). 2026-03-21 22:28:27 +00:00
Andrew Wood 5c84305817 Hide the __attribute__() definition from splint so it doesn't generate spurious warnings. 2026-03-21 15:48:35 +00:00
Andrew Wood c8e13d226b Wait for the other processes associated with monitoring mode before returning, closing stdout beforehand so the monitored command will end (#67). 2026-03-21 15:47:07 +00:00
Andrew Wood 6a20139f5c Add a macro to remove __attribute__(()) if not compiling with GCC. 2026-03-20 23:48:28 +00:00
Andrew Wood 7be959ece1 Add more debugging, and pass a dummy input file list of just "-" to the monitoring transfer loop (#67). 2026-03-20 23:13:33 +00:00
Andrew Wood b3896f93b2 Add more debugging, and set the pipefd entries to -1 after closing them to avoid double-close (#67). 2026-03-20 23:00:44 +00:00
Andrew Wood 09a55ef62a Put the constant on the left hand side to avoid accidental assignment if an "=" is omitted (#67). 2026-03-20 22:14:35 +00:00
Andrew Wood 149be3f9ab Run the transfer main loop for the in and out monitoring sides, using another process for "out" if monitoring both (#67). 2026-03-20 22:12:14 +00:00
Andrew Wood f647b12a2d Pass through "make indent" for consistency (#67). 2026-03-20 22:11:19 +00:00
Andrew Wood ff8e396500 Do not add the monitor command arguments as PV input files; and execute the monitor command in the monitor process (#67). 2026-03-19 22:58:47 +00:00
Andrew Wood 04f99c4951 Use a special type for opts->argv[] so that the whole array, and array entries, can both be NULL, and the array entries pointers to constant strings; and ensure that argv[] always has a NULL pointer on the end - all so argv can be passed to execvp() (#67). 2026-03-19 22:57:41 +00:00
Andrew Wood 29c65ad9e1 Set up stdin/stdout for the monitored command (#67). 2026-03-18 22:28:51 +00:00
Andrew Wood f84a668098 Fork for the command to monitor (#67). 2026-03-17 23:41:23 +00:00
Andrew Wood 06721c7be1 Create pipes for monitoring (#67). 2026-03-14 22:34:17 +00:00
Andrew Wood bd70b0c6cb Set exit status for --monitor errors (#67). 2026-03-14 22:33:52 +00:00
Andrew Wood 220625f370 Add TODO markers for the next steps of monitor mode (#67). 2026-03-14 21:50:50 +00:00
Andrew Wood 4606638567 Constrain the options so that -M cannot be used with -U (as it is a different action) and -M will report the right error message if mixed with -R or -Q (#67). 2026-03-14 17:20:30 +00:00
Andrew Wood 882428883a Remember both -N and -F values if two were given (#67). 2026-03-14 14:54:53 +00:00
Andrew Wood c2bbb8eef1 Parse the monitoring side setting from "--monitor" (#67). 2026-03-14 14:28:30 +00:00
Andrew Wood 111b687449 Give "--monitor" a parameter to set which side(s) of the command to monitor (#67). 2026-03-13 23:06:43 +00:00
Andrew Wood 547b52a313 Specify which command since pv is also a command. 2026-03-12 21:59:01 +00:00
Andrew Wood 5f1893f094 Draft documentation and option parsing for a "--monitor" option to run a command and monitor its input and output (#67). 2026-03-11 23:37:09 +00:00
Andrew Wood a33ee8ef26 Avoid a comparison of signed and unsigned values. 2026-03-09 20:28:05 +00:00
heitbaum 6d8fbbf848 fix discard const qualifier from pointers
Since glibc-2.43 and ISO C23, the functions bsearch, memchr, strchr, strpbrk, strrchr, strstr, wcschr, wcspbrk, wcsrchr, wcsstr and wmemchr that return pointers into their input arrays now have definitions as macros that return a pointer to a const-qualified type when the input argument is a pointer to a const-qualified type.

Fixes:
../src/pv/display.c: In function 'pv__format_init':
../src/pv/display.c:715:37: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  715 |                      strchr(format_component_array[component_idx].match, (int) ':');
      |                       ^~~~~~
2026-03-09 01:27:04 +01:00
Andrew Wood d28d2f3155 Address the splint warning due to not recognising strlcat(). 2026-03-08 11:23:08 +00:00
Andrew Wood 9566e7d7ea Run through "make indent" for consistency. 2026-03-08 11:21:38 +00:00
Andrew Wood c39601bbb2 Datestamp updates. 2026-03-08 11:20:54 +00:00
Andrew Wood e3fcc6ae71 Commit to release date. 2026-03-08 11:19:21 +00:00
Andrew Wood 9c18fecb98 Acknowledge #179. 2026-03-08 11:10:10 +00:00
Andrew Wood 521391a495 Version bump. 2026-03-07 23:23:35 +00:00
Andrew Wood f65caacfca Version bump, and note the change to "--size @x" (#179). 2026-03-07 23:23:13 +00:00
Andrew Wood 0a27a85b4a Update the copyright years. 2026-03-07 23:20:20 +00:00
Andrew Wood d186d618e3 Look up the right maxfds value to use with nftw() for the current system (#179). 2026-03-07 23:15:09 +00:00
Andrew Wood ae97565e13 Message line number updates. 2026-03-07 23:14:23 +00:00
Andrew Wood d028d5165c Make the gettext macros behave on Debian 13. 2026-03-07 22:34:28 +00:00
Andrew Wood e17f64fce7 Allow "--size @dir" to read the size of all files under "dir" (#179). 2026-03-07 22:23:10 +00:00
Andrew Wood e4bc770054 Timestamp update. 2025-12-15 20:11:17 +00:00
Andrew Wood a890e8e0c8 Update version and release date. 2025-12-15 20:09:56 +00:00
Andrew Wood 3af38221ee Correct the process title truncation. 2025-12-12 23:12:03 +00:00
Andrew Wood 579aebf6a7 Date update. 2025-11-22 15:08:13 +00:00
Andrew Wood d91bf78cac Timestamp update. 2025-11-22 15:08:00 +00:00
Andrew Wood 6e45fe0f8d Update translations count for Finnish. 2025-11-22 15:07:31 +00:00
Andrew Wood 8d7ced4195 Merge pull request 'Translations update from Codeberg Translate' (#175) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/175
2025-11-22 16:07:08 +01:00
artnayandCodeberg Translate cae6049edd Translated using Weblate (Finnish)
Currently translated at 43.5% (61 of 140 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/fi/
2025-11-22 15:06:06 +00:00
Andrew Wood 1293f70575 Link to the Debian bug as well, and commit to a release date. 2025-11-22 15:03:53 +00:00
Andrew Wood ff412009da Version bump for #174. 2025-11-21 23:27:47 +00:00
Andrew Wood 10bc46af6e Suppress by source file name rather than function name, since in an LTO build the function name is optimised out (#174). 2025-11-21 23:26:52 +00:00
Andrew Wood 1e5fae3b7b Note the Finnish translations. 2025-11-21 05:53:21 +00:00
Andrew Wood a6f72cf985 Merge pull request 'Translations update from Codeberg Translate' (#173) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/173
2025-11-21 06:46:29 +01:00
artnayandCodeberg Translate e617b92f2b Translated using Weblate (Finnish)
Currently translated at 24.2% (34 of 140 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/fi/
2025-11-21 05:43:17 +00:00
Andrew Wood b24771d224 Added empty Georgian language file as requested. 2025-11-20 21:18:50 +00:00
Andrew Wood 6de160192a Renamed to something more specific. 2025-11-15 15:37:43 +00:00
Andrew Wood 72774e34ff Timestamp update. 2025-11-12 15:03:02 +00:00
Andrew Wood 4ab9536733 Set the release date. 2025-11-12 14:56:16 +00:00
Andrew Wood bd9af0421c Note the fix for --watchfd with multiple arguments (#170). 2025-11-12 14:32:49 +00:00
Andrew Wood 7ba474509c Version bump. 2025-11-12 14:32:39 +00:00
Andrew Wood ac13765fa5 Test --watchfd with more than one argument (#170). 2025-11-12 14:31:57 +00:00
Andrew Wood ca7997fe7d Use the new watchfd_count to size the array, not the one we just zeroed, otherwise multiple --watchfd arguments result in a memory error (#170) 2025-11-12 14:31:22 +00:00
Andrew Wood 22b729f9ea Datestamp update. 2025-11-09 22:27:57 +00:00
Andrew Wood 864895f8f2 Commit to release date. 2025-11-07 23:08:21 +00:00
Andrew Wood 5d185398ac Position updates. 2025-10-31 19:48:12 +00:00
Andrew Wood 94b8b8625f Bump minor version, since there is a new feature. 2025-10-31 19:47:07 +00:00
Andrew Wood 282823f660 Correct the stub functions used when PV_REMOTE_CONTROL is not set. 2025-10-30 22:54:02 +00:00
Andrew Wood a5fd8d662e Version bump, and mention the fix to timer behaviour when "--watchfd" is paused and resumed (#169). 2025-10-30 21:18:26 +00:00
Andrew Wood 2904eacefe Use the per-fd stoppage time rather than the global one (#169). 2025-10-29 21:31:23 +00:00
Andrew Wood 5d538da63a Add the stoppage time to the each of currently watched fds' counters (#169). 2025-10-29 21:30:43 +00:00
Andrew Wood fdfceb79c6 Add a TODO marker for next planned steps. 2025-10-28 23:34:42 +00:00
Andrew Wood 5aff62414a Add a total stoppage time counter to the per-fd watchfd structure (#169). 2025-10-28 23:34:26 +00:00
Andrew Wood c7a6f85dd2 Remove unnecessary splint annotation. 2025-10-28 21:39:54 +00:00
Andrew Wood 22e9e00f63 Move the array of watchfd item information into the main state, instead of being local to the watchfd loop, so that in future we can add stoppage time to individual fd info and it will be accessible to the signal handler (#169). 2025-10-27 20:41:32 +00:00
Andrew Wood 60ca91209a Rename structure members for clarity - "tstp_time" becomes "when_tstp_arrived", and "toffset" becomes "total_stoppage_time". 2025-10-27 19:20:22 +00:00
Andrew Wood 8c440b5417 Move remote.c, line position updates, and new strings for --query / --remote option parsing. 2025-10-26 13:19:43 +00:00
Andrew Wood 07e6255e7e Version bump, and mention the new "--query" option (#101). 2025-10-26 13:14:28 +00:00
Andrew Wood 82283ee434 Remove the TODO now it is done. 2025-10-26 12:56:28 +00:00
Andrew Wood 42cf7ed628 Move the remote control code into the pv library. 2025-10-26 12:55:15 +00:00
Andrew Wood b1cac9b78d Record all old-style formatting options, and the full string for the extra display spec, in the control structure; make pv_remote_set only use internal pv state structures so it can be part of the internal pv library where it belongs, and not need to know about main()'s options array. 2025-10-26 12:53:51 +00:00
Andrew Wood 528889888c Always calculate the elapsed transfer time every time around the loop, even if not displaying anything; and take -W into account so the elapsed time doesn't start ticking up until the first byte or line transferred, even if not displaying anything - so that -Q will report the right thing when querying a "pv -n" (#101). 2025-10-26 12:06:32 +00:00
Andrew Wood e6e6ab3b6d Consolidate repeated code into new pv__elapsed_transfer_time function. 2025-10-26 11:49:35 +00:00
Andrew Wood d2d3ec1cde Add a TODO marker for the next step. 2025-10-26 01:35:53 +01:00
Andrew Wood f518257bc9 Consolidate repeated code into new pv__show_stats function. 2025-10-25 22:49:33 +01:00
Andrew Wood 96a411671c Consolidate repeated code into new pv__resize_display_on_signal function. 2025-10-25 00:43:59 +01:00
Andrew Wood f07a7b1c87 Correct the noise interrupting the display of the original pv if the querying pv is terminated. Correct the transfer of size information to main() so that ETA can still be shown. (#101) 2025-10-24 09:24:31 +01:00
Andrew Wood 7598b4d46c Add pv_query_loop() to run a main loop watching another pv (#101). 2025-10-24 09:00:10 +01:00
Andrew Wood 15ed99eee7 Implement --query message send/receive (#101). 2025-10-23 23:27:34 +01:00
Andrew Wood 4df6fbf6f7 Mention that the --query PID needs to be owned by the same user (#101). 2025-10-23 22:02:59 +01:00
Andrew Wood f125f41428 Correct the comment naming pv__target_bufsize, which should be control.target_buffer_size. 2025-10-23 21:26:34 +01:00
Andrew Wood 2e9fc77ccd Add -Q to the remote check comments (#101). 2025-10-22 17:55:43 +01:00
Andrew Wood 590a3535d8 Don't keep PV_REMOTE_QUERY separate from PV_REMOTE_CONTROL after all since they will need to work together; extend pv_remote_check() so it will check for both -R and -Q signals (#101). 2025-10-21 23:39:17 +01:00
Andrew Wood b34bba8b4a Remove unused pv_remote_init, pv_remote_fini functions; add initial stubs for -Q (#101). 2025-10-21 23:17:23 +01:00
Andrew Wood 4f82525c39 Correct the comment at the end of the conditional. 2025-10-21 23:03:30 +01:00
Andrew Wood a2191ff270 Mention --query where --remote was mentioned, since it has the same requirements (#101). 2025-10-21 23:01:46 +01:00
Andrew Wood 8361ed1fe2 Rename signal.sender to signal.sender_usr2 so it is specific to SIGUSR2 (#101). 2025-10-21 22:15:23 +01:00
Andrew Wood 9bd96614b3 Add an action type for query mode, and more TODOs to plan how it will work (#101). 2025-10-21 22:11:10 +01:00
Andrew Wood d27672b7a3 Declare pv_open_controlfile so it can be used for the query action (#101). 2025-10-21 22:10:38 +01:00
Andrew Wood 36d82e313a Rename pv__control_file to pv_open_controlfile, and move it in with the other file functions so it can be used by both the remote-control and the remote-query code (#101). 2025-10-21 22:09:44 +01:00
Andrew Wood 8b3b61e2d3 Separate the data transfer modifier options from the alternative operating mode options. 2025-10-21 21:13:27 +01:00
Andrew Wood 60067ed4ea Define whether --query should be available, based on the same criteria as --remote for now (#101). 2025-10-21 20:59:32 +01:00
Andrew Wood de71cc2389 Prevent the use of any non-option arguments with -R or -Q (#101). 2025-10-21 20:48:44 +01:00
Andrew Wood 3f1782a573 Draft manual entry, help text, and option parsing for "--query" option (#101). 2025-10-20 21:17:59 +01:00
Andrew Wood fc379727cc Add empty unreleased line for next changes. 2025-10-19 23:47:28 +01:00
Andrew Wood 0b687edfbe Remove the obsolete build-package script, and the scripts for the release process and lab testing (which are now maintained separately at https://codeberg.org/ivarch/scripts), and add a release config file for the new release script under the same location. 2025-10-19 00:20:03 +01:00
Andrew Wood 546074853e Datestamp update. 2025-10-18 19:35:10 +01:00
Andrew Wood 7deef78ea5 Set the release date. 2025-10-18 19:32:44 +01:00
Andrew Wood a38e05e749 Datestamp update. 2025-10-18 17:09:30 +01:00
Andrew Wood 493634e26c Cover more of the features in the description. 2025-10-17 23:49:08 +01:00
Andrew Wood f96a43e366 Line number updates. 2025-10-17 23:22:33 +01:00
Andrew Wood b434c858a2 Version and datestamp bump. 2025-10-17 23:21:52 +01:00
Andrew Wood 30e30f0196 Note and acknowledge the change (#81). 2025-10-17 23:09:38 +01:00
Andrew Wood 1a70cc228a Correction to the description and removal of the TODO marker; and use the transfer interval as the time to wait after closure (#81). 2025-10-17 22:50:33 +01:00
Andrew Wood 17ca4fc9c9 Keep displaying --watchfd fds for a short time after they are closed, and don't clear the display at the end but just move the cursor past it (#81). 2025-10-17 20:40:14 +01:00
Andrew Wood 0aac6d6aac Add comments and "pid_last_seen", "fd_last_seen" structure members for proposed new logic that will hold fd info on-screen a short time after closure, to retain the progress display when a watched process exits (#81). 2025-10-17 19:09:46 +01:00
Andrew Wood 61021eab6b Remove the TODO markers for #81 as this work will be done in a separate branch. 2025-10-17 17:52:33 +01:00
Andrew Wood e59452d765 Add a note describing the apparent lack of output file growth during transfer of null bytes with --sparse (#45). 2025-10-16 21:13:43 +01:00
Andrew Wood d2647ac55c Line number updates, and remove incorrect fuzzy entries. 2025-10-15 23:46:04 +01:00
Andrew Wood c2c58762f0 Datestamp update. 2025-10-15 23:28:24 +01:00
Andrew Wood 0a55710cfc Acknowledge the suggestions for --sparse (#45). 2025-10-15 23:28:18 +01:00
Andrew Wood 660d3da704 Note the new --sparse option (#45). 2025-10-15 23:27:53 +01:00
Andrew Wood 972f8b7df8 Re-order no_splice and sparse_output relative to other flags to more closely match the order they appear in the manual. 2025-10-15 23:23:16 +01:00
Andrew Wood a40bdfb55f Merge branch 'issue45_sparse' (#45). 2025-10-15 23:17:05 +01:00
Andrew Wood 3c9ab822fe Call lseek() at the start if output is appending, so that future lseek()s are relative to the right position, fixing the issue with incorrect truncation size (#45). 2025-10-15 23:08:33 +01:00
Andrew Wood fb5ce33518 Add debugging messages about truncation and seeking (#45). 2025-10-15 22:43:56 +01:00
Andrew Wood 5c15337662 Only call ftruncate() once, when the output file descriptor is closed at the end, instead of after every lseek() - this corrects the file growth on XFS but has the side effect that writing to stdout in >> (append) mode truncates the file to the wrong size (#45). 2025-10-15 22:32:21 +01:00
Andrew Wood 71f929e29c Add a TODO indicating the problems so far and what to try next (#45). 2025-10-15 17:49:38 +01:00
Andrew Wood c21ad6fdf1 For sparse output, instead of fstat(), ftruncate(), then lseek(), do lseek() then ftruncate(), like dd does (#45). 2025-10-14 23:38:15 +01:00
Andrew Wood f0895177e7 Remove comment lines from the lab-hosts config when reading it. 2025-10-14 22:11:40 +01:00
Andrew Wood 72686655cf Move the pv__transfer_write_completed label, jumped to on a sparse write, outside of the compound statement; and so, move all of the variables within that compound statement to the start of the function. The GCC on RHEL derivatives like AlmaLinux 9, Rocky 8, CentOS 7/6/5 throws an error if the label is at the end of that block rather than just outside it (#45). 2025-10-14 22:03:41 +01:00
Andrew Wood 2efe598855 Add a test for --sparse (#45). 2025-10-14 21:46:16 +01:00
Andrew Wood 54913fddbe First working draft of --sparse transfers, tests still needed (#45). 2025-10-13 22:13:54 +01:00
Andrew Wood 023cf22a59 Add --sparse / -O to the manual, to --help, and to option processing (#45). 2025-10-13 21:26:24 +01:00
Andrew Wood 164d7f7738 Add the extra --watchfd syntax to the help for that option. 2025-10-13 17:58:37 +01:00
Andrew Wood 6b8acd9e01 Add sparse_output option and control flags, and an output_not_seekable transfer flag, to structures for "sparse output" mode in future (#45). 2025-10-12 18:12:43 +01:00
Andrew Wood 3f6dc99aa5 Change the release process to build packages with parmo. 2025-10-11 22:01:59 +01:00
Andrew Wood d939d45c27 Commit to the release date. 2025-10-11 21:31:26 +01:00
Andrew Wood fc8326a2b4 Message position updates. 2025-10-11 16:00:44 +01:00
Andrew Wood 8d939c9b99 Provisional version bump. 2025-10-11 16:00:13 +01:00
Andrew Wood 72d9efc993 More specific TODOs for one way of implementing #81. 2025-10-07 22:17:10 +01:00
Andrew Wood 64c4e8efb9 Add TODO markers for one way of implementing #81. 2025-10-06 18:03:46 +01:00
Andrew Wood 25dadb2bfd Add a comment describing what this structure is for. 2025-10-06 18:01:57 +01:00
Andrew Wood 80b68a73ee Include -C in the test, since splice can have an effect (#166). 2025-10-05 21:50:09 +01:00
Andrew Wood 3437b75256 Position updates and new strings. 2025-10-05 21:41:51 +01:00
Andrew Wood 462415a88a Note the Turkish translation updates. 2025-10-05 21:40:52 +01:00
Andrew Wood d23a7e929e Acknowledge Turkish translation updates (#168). 2025-10-05 21:40:25 +01:00
Andrew Wood f18fa637c6 Merge pull request 'Translations update from Codeberg Translate' (#168) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/168
2025-10-05 22:34:50 +02:00
Oğuz ErsenandCodeberg Translate 9bff7f0bb5 Translated using Weblate (Turkish)
Currently translated at 100.0% (134 of 134 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/tr/
2025-10-05 20:33:46 +00:00
Andrew Wood 771b61db30 Add test for over-read when using stop-at-size (#166). 2025-10-05 21:33:32 +01:00
Andrew Wood 615c1d5321 Explicitly cast both sides of the comparison to "long long", otherwise there is an overflow on 32-bit systems and stop-at-size stops at the wrong point (#166). 2025-10-05 21:20:27 +01:00
Andrew Wood 3442d7651a Use a void *, not a char *, so the types are consistent throughout. 2025-10-05 21:16:34 +01:00
Andrew Wood 7982badb65 Write a debugging line when truncating transfers for stop-at-size. 2025-10-05 21:15:58 +01:00
Andrew Wood a83a549de5 Correct the value size in the debug statement, otherwise it overflows on 32-bits systems. 2025-10-05 21:02:27 +01:00
Andrew Wood b1797c51e6 Note the new "=NAME" and "@LISTFILE" syntax additions to --watchfd. 2025-10-05 18:10:41 +01:00
Andrew Wood 8504964f1a Remove old non-functional code relating to ETAs and --size in the --watchfd loop. 2025-10-05 18:07:02 +01:00
Andrew Wood f83aa2272b Fix incorrect usage of "optarg". 2025-10-04 21:51:26 +01:00
Andrew Wood fb7c05c262 Implement the "pgrep" call for --watchfd =NAME (#95). 2025-10-04 21:50:25 +01:00
Andrew Wood e6f611f4de Adjust formatting. 2025-10-04 20:27:24 +01:00
Andrew Wood bd4ca7301c Document the new "=NAME" (#95) and "@FILE" (#12) syntax for --watchfd options. 2025-10-04 20:17:46 +01:00
Andrew Wood 242297a3c6 Partial draft of "-d @filename" (#12) and "-d =processname" syntax (#95). 2025-10-04 17:46:43 +01:00
Andrew Wood 0a658f99bb In --watchfd, when deciding whether to insert %N into the format, check for %{name} in the current format as well as the existing check for %N. 2025-10-04 14:49:06 +01:00
Andrew Wood 8df1c29c37 Note the addition of an empty Finnish translation file. 2025-10-04 00:54:48 +01:00
Andrew Wood a8b7cd19bd Add an empty translation file for Finnish. 2025-10-03 23:03:38 +01:00
Andrew Wood b4f525fd79 Merge pull request 'Translations update from Codeberg Translate' (#167) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/167
Reviewed-by: Andrew Wood <a-j-wood@noreply.codeberg.org>
2025-10-02 22:31:05 +02:00
Coral PinkandCodeberg Translate 8caa977a35 Translated using Weblate (Polish)
Currently translated at 100.0% (134 of 134 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/pl/
2025-10-02 13:23:16 +00:00
Andrew Wood f6d398738e Note the behaviour change of --stop-at-size with a zero size. 2025-10-01 22:09:33 +01:00
Andrew Wood 11dc25966d If stop_at_size is true, do not read more than control.size even if that is 0 (#166). 2025-10-01 18:06:59 +01:00
Andrew Wood efc8b33e81 Position updates. 2025-09-30 22:30:36 +01:00
Andrew Wood be066f6c8c Restrict the amount to read when --stop-at-size is active so that reads, as well as writes, never go past --size bytes (#166). 2025-09-30 22:27:25 +01:00
Andrew Wood 6a1ad7d374 Note the improvement to the control of a --watchfd with a remote -R. 2025-09-29 22:05:47 +01:00
Andrew Wood 751263376b Adjust the format and reparse the display, if a remote update -R was received while in the --watchfd loop. 2025-09-29 21:42:48 +01:00
Andrew Wood d903a7d188 Add a return value to pv_remote_check() so its caller can know whether a message was received. 2025-09-29 21:31:05 +01:00
Andrew Wood a4e2243102 Position updates. 2025-09-29 17:55:39 +01:00
Andrew Wood 9fe604df1a Move the declaration of changes_made outside the conditional, so as to not break on macOS. 2025-09-29 17:53:56 +01:00
Andrew Wood 64cd9cd85c Move the watchfd %N format insertion into its own function, so it can be called separately elsewhere in future, and to make it easier to extend the %N detection to find %{name} later as well. 2025-09-28 17:22:56 +01:00
Andrew Wood 10ef5a8596 If watching more than one distinct PID with --watchfd, display the PID as well as the FD number (#12). 2025-09-28 16:36:06 +01:00
Andrew Wood 77ed2e5989 Another minor issue noted as a TODO. 2025-09-27 18:32:27 +01:00
Andrew Wood 8ae549c47f Mention the --watchfd multiple arguments feature (#12). 2025-09-27 18:31:24 +01:00
Andrew Wood 284ceba52b Add TODO marker after some testing showed an issue. 2025-09-27 18:24:59 +01:00
Andrew Wood 3ea19829d7 Merge pv_watchpid_loop into pv_watchfd_loop, and allow multiple PID / PID:FD sets to be watched at once (#12). 2025-09-27 17:55:18 +01:00
Andrew Wood c49fc4aa57 Eliminate the fd_to_idx array in --watchfd, so that file descriptors aren't constrained to FD_SETSIZE and so we don't have to track another array. 2025-09-26 23:40:39 +01:00
Andrew Wood 7fdb6716e1 In the pvwatchfd_s structure, use booleans "displayable" and "unused" instead of having values of watch_pid=0 for unused and watch_fd=-1 for not displayable, so that each item only means one thing. 2025-09-26 23:01:07 +01:00
Andrew Wood c61c589378 Typo correction in the comment. 2025-09-26 22:29:36 +01:00
Andrew Wood c688987087 Adjust the --watchfd documentation to say that multiple PID/PID:FD arguments are allowed (#12). 2025-09-25 06:21:55 +01:00
Andrew Wood 0b2f9ec397 Only call pv_watchfd_loop() from main, so that eventually pv_watchpid_loop() can be removed and multiple "-d" values supported (#12). 2025-09-24 22:11:44 +01:00
Andrew Wood 8a8e6d71a4 Reinstate the previously removed "cannot transfer files" message for "-d". 2025-09-23 05:46:53 +01:00
Andrew Wood a0a9d682ca Reject "-o" when using "-d". 2025-09-23 05:45:43 +01:00
Andrew Wood 05a72bf75e Position updates, two new strings, one old message removed. 2025-09-23 05:39:43 +01:00
Andrew Wood 22bf08f8e4 Accept additional arguments when -d is specified, expecting them to be more pid[:fd] values (#12). 2025-09-22 21:50:35 +01:00
Andrew Wood b5fbd1978e Replace watch_pid, watch_fd with arrays, though for now only use the first item in the arrays (#12). 2025-09-21 19:50:56 +01:00
Andrew Wood db80f838ff Explicitly set an action variable to say which action to perform, instead of inferring it from other settings like whether a watch PID was set (#12). 2025-09-18 06:18:18 +01:00
Andrew Wood 8c2e934768 Add a TODO marker for the next step to take. 2025-09-18 05:47:15 +01:00
Andrew Wood dbce5b355e Add --watchfd option values to an array in the main state, as well as to the currently used variables (#12). 2025-09-17 23:12:13 +01:00
Andrew Wood 12cc996d32 Add --watchfd option values to an array as well as to the currently used variables (#12). 2025-09-17 22:12:45 +01:00
Andrew Wood 4a0f9e713c Define struct pvwatchspec_s for future use in an array for --watchfd, and add a comment defining nullable_string_t. 2025-09-16 23:05:41 +01:00
Andrew Wood 8771b901d9 Add TODO markers as part of looking at supporting multiple "-d" options (#12). 2025-09-15 20:12:55 +01:00
Andrew Wood 48ac509af7 Line number updates. 2025-09-14 16:42:42 +01:00
Andrew Wood f70627c031 Pass through indent. 2025-09-14 16:42:08 +01:00
Andrew Wood 1e6c9704b1 Adjustments to remove the need for the unqualifiedtrans and nullstate splint workarounds. 2025-09-14 16:39:47 +01:00
Andrew Wood a629a488d7 Add TODO marker for the planned next step. 2025-07-28 20:39:05 +01:00
Andrew Wood ad1d0e1c9a In the watchfd info array, instead of using copies of the global state, each fd has its own flags, transfer, calc, and display sub-structures (#165). 2025-07-28 00:25:14 +01:00
Andrew Wood 4f9d746823 Split the state reset functions into smaller pieces, so sub-structures can be reset individually (#165). 2025-07-27 23:24:56 +01:00
Andrew Wood 9fc9b6a8ed Carry the fd info_array "size" into the global "control" structure just before calling pv_display() so it gets used without having to have a per-fd copy of "control" (#165). 2025-07-27 21:39:36 +01:00
Andrew Wood 9ab82cde1e Use the original info_aray size for comparison as the "control" structure may be made irrelevant here soon (#165). 2025-07-27 21:38:55 +01:00
Andrew Wood a7f392e3c3 Address splint warnings about setting and clearing state->control.name (#165). 2025-07-27 21:34:46 +01:00
Andrew Wood 574ea04502 Instead of adding an aliased display name and having to maintain it and treat it differently, go back to keeping the name only in the "control" sub-structure of the state, but share the global state "control" across all watched fds, and just change it before each pv_display() call so it points to the relevant fd display_name when needed (#165). 2025-07-27 21:23:41 +01:00
Andrew Wood 5282a521b5 Pass only the relevant sub-structure to pv_alloc_history (#165). 2025-07-27 20:59:21 +01:00
Andrew Wood 52634f01f9 Do not call pv_state_name_set when adjusting an fd display_name, but instead set the alias state->display.name ourselves. Since the fd display_name we are pointing to is within the info_array, if we extend info_array with realloc we then have to also reset those aliases since display_name may move if realloc rebases the array. (#165) 2025-07-27 20:51:00 +01:00
Andrew Wood a0f2d9c9c7 Use status, cursor from main state, and a null extra_display, to reduce the dependency on the per-watched-fd state (#165). 2025-07-27 20:46:51 +01:00
Andrew Wood 8386c05978 Explicitly check for non-NULL rather than treating NULL as boolean false. 2025-07-27 20:43:52 +01:00
Andrew Wood 6a2b9a2788 Add an alias for the name for %N to the display sub-structure, so that the name can be varied between displays without having to alter the control value (#165). 2025-07-27 19:53:28 +01:00
Andrew Wood e04f50f0dc Change all cursor positioning functions to use sub-structures rather than the whole state structure, and if turning off cursor positioning, do so via a new flag "cursor->disable" rather than changing the operator-supplied options in "control" (#165). 2025-07-27 17:05:04 +01:00
Andrew Wood 021dc6e054 Pass individual sub-structures to pv_display, but still keep state for now, until the functions cursor.c have been updated to take sub-structures rather than the whole state (#165). 2025-07-27 15:56:03 +01:00
Andrew Wood 7d7efac7c6 Move the terminal_supports_utf8, terminal_supports_colour, and checked_colour_support flags out of "control" and into "status", as they are not operator-supplied options, but are program-generated status flags; this will allow "control" to remain read-only for larger parts of the program (#165). 2025-07-27 15:37:16 +01:00
Andrew Wood f79bed3cb8 Rename "can_display_colour" and "can_display_utf8" to "terminal_supports_colour" and "terminal_supports_utf8" to make it clearer that these are not operator-supplied option settings, they are derived from terminal capabilities (colour) and the environment (UTF-8). 2025-07-27 15:20:05 +01:00
Andrew Wood 2171f40703 Address the splint warning. 2025-07-27 00:34:09 +01:00
Andrew Wood 960ff1572f Pass state->status, rather than state itself, to pv_format (#165). 2025-07-27 00:31:45 +01:00
Andrew Wood da2a2e6fd2 Remove the state from the pv_error arguments, by adding a new function pv_set_error_prefix to call on startup, eliminating the need for a state program_name string; and add a private boolean to track whether there has been any output which means errors need preceding by a newline, which is updated by pv_display directly (#165). 2025-07-27 00:22:57 +01:00
Andrew Wood 005bc2f841 Pass the sub-structures separately to pv_format and pv__format_init rather than the whole state; but still pass state for now, as pv_error needs it (#165). 2025-07-26 22:49:29 +01:00
Andrew Wood ecc0c0e414 Adjust the readonly structure pointer types so the pointer itself is not read-only but the thing it points to is; and change the display formatters to use pointers to control, transfer, and calc structures instead of the whole state, with read-only access enforced at compile time (#165). 2025-07-26 22:28:39 +01:00
Andrew Wood 18548d217b Rename struct pvipcstate_s to pvcursorstate_s since it is for cursor positioning, not for IPC (#165). 2025-07-26 21:30:16 +01:00
Andrew Wood 653326ca9b Rename struct pvcursorstate_s to pvipccursorstate_s for clarity since it is only for IPC (#165). 2025-07-26 21:29:20 +01:00
Andrew Wood 0cf8902d9b Rename display structure member "display_visible" to "output_produced" for clarity. 2025-07-26 21:25:54 +01:00
Andrew Wood 762676f4e1 Make pv_tty_write take only the transient flags part of the state rather than the whole state, and rename the "flag" part of the state to "flags" for better readability (#165). 2025-07-26 21:18:13 +01:00
Andrew Wood 3bd49a0c3f Ensure the current average rate calculation can't accidentally divide by zero. 2025-07-26 20:53:22 +01:00
Andrew Wood 870dfad9fd Introduce read-only structure pointer typedefs for each of the state sub-structures, so the compiler will catch anywhere that a function would alter a structure it isn't expected to (#165). 2025-07-26 20:51:28 +01:00
Andrew Wood 3b0891b128 Pass more specific structures to pv_calculate_transfer_rate rather than the whole state (#165). 2025-07-26 19:22:07 +01:00
Andrew Wood b3c854b27a Add typedefs for the pointers to the sub-structures within struct pvstate_s, so they can be used as types in function declarations (#165). 2025-07-26 18:33:24 +01:00
Andrew Wood a923bdaca4 Give struct names to each of the sub-structures within struct pvstate_s, so they can be used as types in function declarations (#165). 2025-07-26 18:24:47 +01:00
Andrew Wood 0070a74390 Correct a minor typo in a comment. 2025-07-26 17:57:46 +01:00
Andrew Wood 283bafa228 Word wrap update from auto generation. 2025-07-26 14:58:02 +01:00
Andrew Wood 03bd428345 Timestamp updates. 2025-07-26 14:50:58 +01:00
Andrew Wood f77b853f3f Commit to a release date. 2025-07-26 14:50:39 +01:00
Andrew Wood 43a89a5c61 Line number updates. 2025-07-25 23:58:17 +01:00
Andrew Wood 44d7f94c31 Version bump. 2025-07-25 23:57:51 +01:00
Andrew Wood 7c84dc9890 Note the fix for #163. 2025-07-25 23:57:23 +01:00
Andrew Wood 025577a13f Free default_bar_style on exit. 2025-07-25 23:46:24 +01:00
Andrew Wood c180cc85cf Allocate the state copy's default_bar_style using the setter function rather than pv_strdup directly (#163). 2025-07-25 23:44:12 +01:00
Andrew Wood 092a30dd7d When watching file descriptors, duplicate the default_bar_style string rather than copying its pointer, to avoid double-free() (#163). 2025-07-25 23:40:41 +01:00
Andrew Wood cd7c8f7849 Version bump. 2025-07-25 22:32:05 +01:00
Andrew Wood 89ee1332fe Timestamp and line number update. 2025-07-25 22:31:52 +01:00
Andrew Wood b926fffe80 Note issue #164. 2025-07-25 22:08:44 +01:00
Andrew Wood 7924a796ea Add debugging message when SIGPIPE is received. 2025-07-25 20:49:50 +01:00
Andrew Wood 8d45738126 Line number updates. 2025-07-25 20:14:37 +01:00
Andrew Wood e687c9b4d9 When EOF on input and output is reached but the output pipe buffer is not empty, sleep for a short time before looping while waiting for the buffer to empty, to avoid a busy-wait (#164). 2025-07-25 20:13:49 +01:00
Andrew Wood d2e9028726 Add debugging output to pv_transfer wherever it returns zero (#164) 2025-07-25 19:49:02 +01:00
Andrew Wood e6638faffc New shorter home page URL. 2025-05-31 15:21:56 +01:00
Andrew Wood f000530746 Correct which language Maxi_Mega is acknowledged for providing translations to. 2025-05-31 15:15:56 +01:00
Andrew Wood 5bf04f841b Acknowledge translations from user milimarg. 2025-05-31 15:12:55 +01:00
Andrew Wood 5d95797aff Merge pull request 'Translations update from Codeberg Translate' (#162) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/ivarch/pv/pulls/162
2025-05-31 16:07:58 +02:00
milimargandCodeberg Translate 9db2907a48 Translated using Weblate (French)
Currently translated at 100.0% (132 of 132 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/fr/
2025-05-31 08:58:24 +00:00
Andrew Wood 5423ae40d6 Removed www. prefix from ivarch.com URL. 2025-02-19 23:18:56 +00:00
Andrew Wood 2de68acfea Remove the bug reporting email address. 2025-02-19 21:55:28 +00:00
Andrew Wood 71e29b7388 Adjust project URL. 2025-02-19 20:42:22 +00:00
Andrew Wood 6d6619cbb4 Merge pull request 'Translations update from Codeberg Translate' (#129) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/129
2025-02-09 17:18:14 +00:00
a-j-woodandCodeberg Translate 651053491e Translated using Weblate (French)
Currently translated at 90.1% (119 of 132 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/fr/
2025-02-09 17:17:10 +00:00
Andrew Wood 81f9919992 Acknowledge new French translations. 2025-02-09 17:16:44 +00:00
Andrew Wood b57170d596 Merge pull request 'Translations update from Codeberg Translate' (#128) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/128
2025-02-09 17:11:41 +00:00
Maxi_MegaandCodeberg Translate 60462c033b Translated using Weblate (French)
Currently translated at 90.1% (119 of 132 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/fr/
2025-02-09 16:43:58 +00:00
Andrew Wood 3f597e59e0 Adjust the installer test to retry with both "gmake" and "make", to work around strange behaviour on NetBSD. 2025-01-28 22:10:49 +00:00
Andrew Wood a62051e5ff Adjust the sensitivity of the test. 2025-01-28 21:35:42 +00:00
Andrew Wood 5483ddf024 Version bump. 2025-01-28 21:22:12 +00:00
Andrew Wood 62ef4b91fc Timestamp update. 2025-01-28 21:21:56 +00:00
Andrew Wood 8664521f08 Reformat with indent; update translation string line numbers. 2025-01-26 20:08:17 +00:00
Andrew Wood 6ef23916f0 Adjust formatting of indented paragraphs. 2025-01-25 21:38:26 +00:00
Andrew Wood 73f8a2fb02 Acknowledge #127. 2025-01-25 21:34:21 +00:00
Andrew Wood a552fc5329 Document the use of "--numeric" with "--format". 2025-01-25 21:28:33 +00:00
Andrew Wood 505a91a6ed In --numeric mode, still call the same formatting functions, only with a different default string, and end with a newline rather than a carriage return (#127). 2025-01-25 21:15:05 +00:00
Andrew Wood 0d3b678800 Format the average rate, byte/line count, percentage completion, transfer rate, and elapsed time as just a number on its own in numeric mode. 2025-01-24 23:10:59 +00:00
Andrew Wood efb115c2aa Remove the TODO since buffer utilisation may not be useful with --numeric, as it is not always a number. 2025-01-24 23:07:05 +00:00
Andrew Wood 8721d285ce Add TODO markers at possible touch points for "--numeric --format" implementation (#127). 2025-01-23 21:56:57 +00:00
Andrew Wood f421f9979d Acknowledge updated Polish and Russian translations. 2025-01-15 21:20:37 +00:00
Andrew Wood d5ad641102 Merge pull request 'Translations update from Codeberg Translate' (#126) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/126
2025-01-15 21:17:23 +00:00
0koandCodeberg Translate ec6199c973 Translated using Weblate (Russian)
Currently translated at 90.1% (119 of 132 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/ru/
2025-01-15 19:08:24 +00:00
coralpinkandCodeberg Translate 0eb09d097e Translated using Weblate (Polish)
Currently translated at 100.0% (132 of 132 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/pl/
2025-01-15 19:08:24 +00:00
Andrew Wood 13265b3d6b Note the translation update. 2025-01-14 21:19:53 +00:00
Andrew Wood dbc7cd7bac Update the translation acknowledgements. 2025-01-14 20:54:46 +00:00
Andrew Wood 4c1f36cda4 Merge pull request 'Translations update from Codeberg Translate' (#125) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/125
2025-01-14 20:42:58 +00:00
BennyandCodeberg Translate 987af6ba16 Translated using Weblate (German)
Currently translated at 100.0% (132 of 132 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2025-01-14 20:39:46 +00:00
m0yellowandCodeberg Translate 58451ae18b Translated using Weblate (German)
Currently translated at 100.0% (132 of 132 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2025-01-14 17:19:02 +00:00
Andrew Wood cd2f5cbbfa Date adjustment. 2025-01-12 13:41:35 +00:00
Andrew Wood 896ff890d8 Adjustments to reduce false positives on slow systems. 2025-01-12 13:14:38 +00:00
Andrew Wood 8ba24e39e0 Version bump. 2025-01-11 21:40:02 +00:00
Andrew Wood 0cf4e50e96 Timestamp update. 2025-01-11 21:22:02 +00:00
Andrew Wood c8ad7eb0e2 Bypass valgrind checks on ARM by default due to false positives. 2025-01-11 20:57:26 +00:00
Andrew Wood 42e47e8291 Turn off IPC support when sys/shm.h is missing, to fix compilation on Termux. 2025-01-10 23:23:07 +00:00
Andrew Wood 7d6c7d0735 Copyright note update for 2025. 2025-01-03 16:11:08 +00:00
Andrew Wood 16177a3b9d Record the issue associated with the fault. 2024-12-22 12:19:25 +00:00
Andrew Wood 16a16460fc Version and date update. 2024-12-22 12:18:42 +00:00
Andrew Wood 24d3351d5d Position updates. 2024-12-22 12:10:08 +00:00
Andrew Wood daa06e5415 Note the macOS --watchfd fix. 2024-12-22 11:30:57 +00:00
Andrew Wood dc6cd1819d Initialise the newly allocated memory, not the pointer to it. 2024-12-22 11:29:21 +00:00
Andrew Wood 1ef1d858f8 Initialise the newly allocated memory. 2024-12-22 11:24:52 +00:00
Andrew Wood 74c75d36cc Move the array bounds check outside the conditional section, so that it is also performed on macOS. 2024-12-22 11:15:29 +00:00
Andrew Wood 7a4264fe1e Do not show negative timer values. 2024-12-22 00:42:01 +00:00
Andrew Wood 5decddeb42 Ensure the dynamic segment width never tries to go negative. 2024-12-22 00:21:34 +00:00
Andrew Wood 0f08153214 Skip the valgrind tests when building an RPM, as it appears that the optimisation flags do not work well with valgrind and lead to false results. 2024-12-19 22:01:56 +00:00
Andrew Wood 5c3743e1f8 Skip the valgrind tests when building an RPM, as it appears that the optimisation flags do not work well with valgrind and lead to false results. 2024-12-19 21:40:11 +00:00
Andrew Wood 4a287f96fd Timestamp update. 2024-12-19 21:11:17 +00:00
Andrew Wood 0c35ae8d9e Add missing formatter source to POTFILES.in. 2024-12-19 21:10:44 +00:00
Andrew Wood ddb2ff9b06 Follow similar formatting conventions to the manual. 2024-12-19 21:03:48 +00:00
Andrew Wood 32398dd5fb Follow similar formatting conventions to the manual. 2024-12-19 21:01:15 +00:00
Andrew Wood cec252f98f Version adjustment and news reformatting for release. 2024-12-19 20:50:06 +00:00
Andrew Wood c186198a7e Line number updates. 2024-12-18 22:41:38 +00:00
Andrew Wood ec46261757 Type boundary checks. 2024-12-18 22:23:19 +00:00
Andrew Wood ff0355ca9c Make the moving indicator more granular on wide displays by calculating its position with floating point rather than integer values. 2024-12-18 21:59:17 +00:00
Andrew Wood 2bd364fee8 Add TODO note. 2024-12-18 00:01:10 +00:00
Andrew Wood 823350a186 Preliminary version update. 2024-12-17 23:57:26 +00:00
Andrew Wood c58ddb4d66 Line number updates. 2024-12-17 23:57:07 +00:00
Andrew Wood 447ec06234 Note the memory footprint reduction. 2024-12-17 23:56:00 +00:00
Andrew Wood 21ca350946 Use specific types for display widths, byte counts, and type of format string component, mainly to have the option of packing more into less space. 2024-12-17 23:55:15 +00:00
Andrew Wood 46902e1c0c Line number updates. 2024-12-17 23:02:44 +00:00
Andrew Wood 02bf302f96 If ncurses is not supported, provide code to call "tputs" via popen(), but do not enable it because it is not very safe, and instead just assume colour is always available. 2024-12-17 22:48:43 +00:00
Andrew Wood 76327fdf01 Only set format_uses_colour if colour is permitted for this display (i.e. the display is for a terminal and not a process or window title). 2024-12-17 22:47:41 +00:00
Andrew Wood 0044ed18ae Use AS_HELP_STRING() consistently. 2024-12-17 21:42:56 +00:00
Andrew Wood a9bbb55220 Preliminary version update. 2024-12-17 21:37:11 +00:00
Andrew Wood 69a2358d47 Add a version and date. 2024-12-16 21:25:39 +00:00
Andrew Wood 8664395e5b Adjust the script so it does not specifically apply to this package and can be re-used in others. 2024-12-16 21:25:25 +00:00
Andrew Wood 3c09b31f92 Add colour code support with a %{sgr:...} format sequence. 2024-12-15 23:25:20 +00:00
Andrew Wood 43e2eaa4db Removed misplaced splint annotation. 2024-12-15 22:54:15 +00:00
Andrew Wood f3e98da13b Prevent the background test components from waiting forever for the following PV process to start. 2024-12-15 15:00:51 +00:00
Andrew Wood 25eaa2661a Note the test race condition cleanup. 2024-12-15 14:42:52 +00:00
Andrew Wood 4f58a3d751 Make background test processes wait for their subsequent foreground PV to start, to make a race condition less likely to trigger test failures on slower systems. 2024-12-15 13:36:14 +00:00
Andrew Wood 7d18083dda Handle the fact that the GNU Hurd sets the signal sender PID to -1, not either 0 or the signal sender, in the siginfo structure. 2024-12-14 23:41:24 +00:00
Andrew Wood f0aca0a2ce Store the calculated percentage as a double rather than an int, so the granular progress bar is still granular on wide displays. 2024-12-14 17:06:37 +00:00
Andrew Wood 18c76175b2 Read the PID from the correct work file when testing remote control of the extra display. 2024-12-14 16:28:51 +00:00
Andrew Wood 6dbde0c559 Acknowledge issue #15. 2024-12-14 00:08:57 +00:00
Andrew Wood 8fa9df6e7a New --bar-style option; replace "default" with "plain" or with a lookup against the selected default, as appropriate. 2024-12-14 00:06:30 +00:00
Andrew Wood e3382b1a62 Document the %{bar-*} format sequences. 2024-12-13 23:15:08 +00:00
Andrew Wood 29c7a21725 Increase the size of the progress bar buffer. 2024-12-13 20:55:39 +00:00
Andrew Wood 7a0ee9c7fa Correct the width calculations. 2024-12-13 20:54:11 +00:00
Andrew Wood cb71277df4 Allocate more space for the display buffer, as wide characters take up more room. 2024-12-13 20:38:45 +00:00
Andrew Wood 9f5923864b Inhibit UTF-8 based bar formats when UTF-8 output support is not detected, falling back to the default format instead. 2024-12-13 20:17:01 +00:00
Andrew Wood 60563f3e3c New bar formats - default, block, granular, shaded - with the granular format providing a smoother bar using Unicode block characters (#15) 2024-12-13 20:02:36 +00:00
Andrew Wood c49abf1608 Indentation updates. 2024-12-13 19:57:18 +00:00
Andrew Wood 250a794873 Add globs to the indent, indentclean, and clean-local targets. 2024-12-13 19:46:31 +00:00
Andrew Wood 78f4a60bf7 Change the formatter functions to take their 6 arguments as one struct pointer, making it less messy. 2024-12-12 22:36:07 +00:00
Andrew Wood 2a93e33d38 Add a rate-limiting example. 2024-12-11 21:40:08 +00:00
Andrew Wood 5efd4d045f Adjust the way the leading space is formatted, to better translate to Markdown. 2024-12-10 23:10:57 +00:00
Andrew Wood 0516ba53bd Remove the example with "dialog" and add a more usual use case with tar. 2024-12-10 23:08:00 +00:00
Andrew Wood 1d76c0bc64 Permit decimals with suffix for --size, --rate-limit, --buffer-size, and --error-skip-block (#35); and document the types of numbers allowed in the manual. 2024-12-10 22:09:32 +00:00
Andrew Wood 73bc1ab139 Classify --watchfd and --remote as "alternative operating modes" rather than "data transfer modifiers" since they change the way PV runs entirely. 2024-12-10 21:05:59 +00:00
Andrew Wood 35fdb331e4 Add a leading space to the exit status codes, for readability. 2024-12-10 21:01:38 +00:00
Andrew Wood 9ceda2059d Set the indent so that the exit status items do not waste a line each. 2024-12-10 20:59:04 +00:00
Andrew Wood 0e24c9f453 Use long options in examples where it makes sense to do so, for readability. 2024-12-10 20:56:25 +00:00
Andrew Wood ad54067b48 Note that --watchfd works on macOS as well as Linux, and correct the capitalisation of macOS elsewhere. 2024-12-10 20:50:53 +00:00
Andrew Wood e99a58b430 Remove the SY macros from the manual since they are not universally supported, and replace the technically correct and complete, but user-hostile, synopsis with a simplified version that lists the main modes of operation. 2024-12-10 20:44:43 +00:00
Andrew Wood 51a5de71c1 Add a "can_display_utf8" flag based on the current locale, for future use. 2024-12-09 23:23:07 +00:00
Andrew Wood 06eca8cefa Renamed for consistency - pv__ for static functions, and name the array an array. 2024-12-09 21:52:25 +00:00
Andrew Wood a4494159ea Positions update after moving the formatter functions. 2024-12-09 21:46:00 +00:00
Andrew Wood c95e25776e Move the formatter functions into separate files so that display.c is less of a monolith; and replace the ctype.h macros with internal versions. 2024-12-09 21:42:16 +00:00
Andrew Wood c2a5be6aa9 Allow SKIP_VALGRIND_TESTS to be passed through to package building. 2024-12-08 23:15:31 +00:00
Andrew Wood 135eb71a75 Make the issues into links. 2024-12-08 23:13:29 +00:00
Andrew Wood af99120067 Timestamp update. 2024-12-08 22:22:22 +00:00
Andrew Wood 2d28520ae4 Version bump. 2024-12-08 22:21:45 +00:00
Andrew Wood 35d5b9efab Handle wide characters and ECMA-48 CSI sequences in the format string when calculating string widths. 2024-12-08 21:38:38 +00:00
Andrew Wood f495303177 List all supported format sequences in the output of "--help". 2024-12-08 20:40:05 +00:00
Andrew Wood fb2e6b4074 New "--format" sequences "{progress-bar-only}" and "{progress-amount-only}". 2024-12-08 20:13:33 +00:00
Andrew Wood 4ffdee0002 Introduce the pv_strwidth() function so that in future we can add support for escape sequences and UTF-8 in format strings. 2024-12-08 17:40:12 +00:00
Andrew Wood 5c5d53e1d1 Address two splint-related TODOs. 2024-12-08 17:31:59 +00:00
Andrew Wood 269d2f5729 Correction to "make indentclean". 2024-12-08 17:27:06 +00:00
Andrew Wood 57149c2d03 Add long names to format sequences, such as "%{rate}". 2024-12-08 17:16:02 +00:00
Andrew Wood 838ebcb78f Improve the handling of dangling or invalid "%" sequences. 2024-12-08 16:18:58 +00:00
Andrew Wood 6298a7be9d Refactor the display formatters into their own functions, remove the static arrays for component contents, and start tracking the displayed width of each segment separately from the length in bytes. 2024-12-08 16:04:00 +00:00
Andrew Wood cfea00b200 Use standalone flags to indicate whether we are tracking the last bytes output or the previous line written, so that the component array is not needed outside of display.c. 2024-12-08 10:23:24 +00:00
Andrew Wood 3d52919411 Remove the caveat about only specifying "%p" once, as it can now be used more than once. 2024-12-07 23:26:12 +00:00
Andrew Wood 52ea1b5ba2 Acknowledge %nL (#121). 2024-12-07 23:24:51 +00:00
Andrew Wood 619a84949f New format sequence "%nL" to display the most recently written line (#121). 2024-12-07 23:12:41 +00:00
Andrew Wood c3648af57f Handle the progress bar appearing more than once in the format string. 2024-12-07 20:23:20 +00:00
Andrew Wood 53b5ea54c6 Track the chosen size of format segments so that "%nA" can appear more than once, with different "n" values (#122). 2024-12-07 19:39:44 +00:00
Andrew Wood c4c7b9ec00 Refer to "bytes" rather than "length", so that in future we can differentiate between the number of bytes in a string and how many display columns it occupies. 2024-12-07 17:17:59 +00:00
Andrew Wood b428e7613d Revert back to one test at a time, make it tunable. 2024-12-07 16:39:12 +00:00
Andrew Wood 0e9534c10e Correct how the permissions are set, now that subdirectories are present. 2024-12-07 16:20:48 +00:00
Andrew Wood 7f8aa3f985 Timestamp update. 2024-12-07 14:31:54 +00:00
Andrew Wood 238e07e7d7 Add a section to generate OS packages containing the compiled program. 2024-12-07 14:30:27 +00:00
Andrew Wood b6462ad865 Correction for compatibility with Debian 11. 2024-12-07 14:27:38 +00:00
Andrew Wood 2d7d854a97 Allow all tests to be skipped if SKIP_ALL_TESTS is 1. 2024-12-07 14:23:03 +00:00
Andrew Wood 0626737a15 Pass "-j4" to "make" during the checks. 2024-12-07 13:34:36 +00:00
Andrew Wood 17a1c9d639 Keep the exit trap. 2024-12-07 02:29:48 +00:00
Andrew Wood 31ea20dbd3 New script to help with the release process. 2024-12-07 02:20:30 +00:00
Andrew Wood 97c48c8901 Allow valgrind tests to be skipped with an environment variable. 2024-12-07 02:20:04 +00:00
Andrew Wood bb339ba519 New script to build a package from the source (.rpm, .deb). 2024-12-07 01:26:44 +00:00
Andrew Wood 499f8418bf Move dev/test scripts from dist_doc_DATA to EXTRA_DIST so they do not get installed in /usr/share/doc/ but are just included in the sources. 2024-12-07 01:23:20 +00:00
Andrew Wood b84432ec7f Change buffer pointer type to "char *" to avoid doing pointer arithmetic on "void *". 2024-12-06 22:46:28 +00:00
Andrew Wood 111b514a05 Replace non-standard \e with \033. 2024-12-06 19:39:57 +00:00
Andrew Wood 90829dad51 Minor formatting tweaks. 2024-12-05 23:32:34 +00:00
Andrew Wood 943e433f7e Implement test of cross-compilation with the check being run on a host of the target type. 2024-12-05 21:54:16 +00:00
Andrew Wood 02e6d0e04c Skip this test if environment file XCFILE is set to 1. 2024-12-05 21:52:57 +00:00
Andrew Wood 1e7c92a107 Reworked to allow cross-compilation, but not yet finished. 2024-12-04 23:53:31 +00:00
Andrew Wood 2a97d699a8 Minor updates. 2024-12-04 22:05:17 +00:00
Andrew Wood 2d0321e544 Draft test script to run "make check" on multiple VMs at once. 2024-12-04 22:02:59 +00:00
Andrew Wood ebb209a371 Add support for --extra-display to --remote (#123). 2024-12-03 23:48:44 +00:00
Andrew Wood ddd9430bc9 Line positions update. 2024-12-03 23:48:15 +00:00
Andrew Wood cc37877607 Acknowledge the assistance with issue #120. 2024-12-03 22:00:37 +00:00
Andrew Wood b35591ff8d Note the cross-compilation fix. 2024-12-03 22:00:14 +00:00
Andrew Wood 29423f1f9a Add a cross-compilation check before release. 2024-12-03 21:59:53 +00:00
Andrew Wood d51c57379a When cross-compiling, we cannot run a test program to check whether a siginfo_t provides the signal sender PID, so we fall back to assuming that it does, and also check that SA_SIGINFO is declared so compilation will not fail on systems without it (#120). 2024-12-03 21:04:58 +00:00
Andrew Wood 5f86aed17d Adjust the "configure" instructions. 2024-12-02 18:03:10 +00:00
Andrew Wood 99bd1fc8d5 Version bump and associated updates. 2024-12-02 17:57:34 +00:00
Andrew Wood 70f2f9f1b7 Minor wording update. 2024-12-02 17:46:26 +00:00
Andrew Wood cf9e33a4e4 Rename the installation section to reflect what it is for. 2024-12-02 17:40:14 +00:00
Andrew Wood c07d6f9c49 Reword the compilation instructions. 2024-12-02 17:39:32 +00:00
Andrew Wood 503a559b2a Move "--extra-display" and "--stats" to the "Output modifiers" section, since they are not really display switches that directly affect the terminal progress display. 2024-12-02 17:36:16 +00:00
Andrew Wood 2dac3d1128 Acknowledge the reporting of issue #118. 2024-12-02 17:31:46 +00:00
Andrew Wood d7d87fed76 Restructure and reformat the manual to be more in line with man-pages(7), with some small wording changes; move -8 and -k to the modifiers section rather than display switches; adjust "--help" output to report the options in the same order the manual lists them. 2024-12-02 00:02:18 +00:00
Andrew Wood c08349517b Acknowledge the submitters of issues #3 and #4. 2024-12-01 19:44:57 +00:00
Andrew Wood f3774b5987 Indentation update. 2024-12-01 19:40:33 +00:00
Andrew Wood dccc7345ab New option "--extra-display" (#3, #4). 2024-12-01 19:39:59 +00:00
Andrew Wood 7e51fb8371 Update line numbers. 2024-12-01 16:09:29 +00:00
Andrew Wood 0d7c9ac091 Address splint warnings. 2024-12-01 16:05:17 +00:00
Andrew Wood aee34fce32 Address splint warnings when debugging is turned off. 2024-12-01 15:55:48 +00:00
Andrew Wood c29d306d10 Additional configure.ac cleanups. 2024-12-01 15:42:59 +00:00
Andrew Wood a5edc8071c Note that we now test at compile time whether siginfo_t is usable for --remote (#119). 2024-12-01 15:28:18 +00:00
Andrew Wood 106a673ba8 Test at compile time whether siginfo_t is usable for --remote (#119). 2024-12-01 15:26:59 +00:00
Andrew Wood 99fe01a0d6 Note the test script shellcheck warnings cleanup. 2024-12-01 15:18:28 +00:00
Andrew Wood 94e496c77e Raise an error if variables are not defined. 2024-12-01 14:01:10 +00:00
Andrew Wood 5a9a694050 Acknowledge issue #97 2024-12-01 09:46:54 +00:00
Andrew Wood 68c8046a55 Record the sending PID before setting the flag saying we received a signal. 2024-12-01 01:27:48 +00:00
Andrew Wood c3fae61dda Include the control filename in the error message when a SIGUSR2 is received and the control file cannot be opened. 2024-12-01 01:10:47 +00:00
Andrew Wood b783e5fa63 Memory safety check for --watchfd. 2024-11-30 23:40:09 +00:00
Andrew Wood 869a4e68a4 Memory safety check for --watchfd. 2024-11-30 23:39:32 +00:00
Andrew Wood 2ad827dfb9 Note the watchfd tests. 2024-11-30 23:39:18 +00:00
Andrew Wood fa745f2cfe Test "--watchfd PID". 2024-11-30 22:55:00 +00:00
Andrew Wood e8cc443681 Note the fd leak false positive workaround. 2024-11-30 22:30:35 +00:00
Andrew Wood 97fc6a10a4 Work around issues with valgrind 3.23.0 treating inherited open file descriptors as an error with --track-fds=yes (#97). 2024-11-30 22:26:20 +00:00
Andrew Wood d0218bfe54 Skip this test where "-d" is not available. 2024-11-30 22:25:20 +00:00
Andrew Wood b8b7ff882d Position updates. 2024-11-30 17:46:17 +00:00
Andrew Wood c17b6a8821 Add the new test. 2024-11-30 17:46:01 +00:00
Andrew Wood 2b489bae26 Correction to the file and descriptor handling. 2024-11-30 17:32:42 +00:00
Andrew Wood a9d4bf4a25 Fix bug with "--watchfd" not reporting file positions (#118). 2024-11-30 17:25:12 +00:00
Andrew Wood 0d618efd0d Remove pointless EOF lines from all sources. 2024-11-30 16:40:50 +00:00
Andrew Wood 5b0697b68c Add a test for --watchfd with a single file descriptor. 2024-11-30 16:35:30 +00:00
Andrew Wood 725b5f7932 Line numbers update. 2024-11-03 01:40:34 +00:00
Andrew Wood 2945d4ce08 Update POTFILES.in. 2024-11-03 01:40:14 +00:00
Andrew Wood 14ff1451ce Translation acknowledgements update. 2024-10-22 22:18:36 +01:00
Andrew Wood 27716597d5 Merge pull request 'Translations update from Codeberg Translate' (#117) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/117
2024-10-22 21:17:04 +00:00
0koandCodeberg Translate fd86520e91 Translated using Weblate (Russian)
Currently translated at 91.2% (115 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/ru/
2024-10-22 18:07:48 +00:00
Andrew Wood 815ed8e768 Insights update from Weblate. 2024-10-20 16:38:17 +01:00
Andrew Wood 08f61b33f0 Merge pull request 'Translations update from Codeberg Translate' (#116) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/116
2024-10-20 15:37:09 +00:00
0koandCodeberg Translate cb8f37bd2a Translated using Weblate (Russian)
Currently translated at 88.8% (112 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/ru/
2024-10-20 14:07:50 +00:00
coralpinkandCodeberg Translate b13277c156 Translated using Weblate (Polish)
Currently translated at 100.0% (126 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/pl/
2024-10-20 14:07:50 +00:00
Andrew Wood b4438bbdfb Explain exactly what pv__write_pidfile is intended to do, in its header comment. As per reviewer suggestions, replace the unexplained constant buffer size padding with a static template string and an extra strlen(), and explain why the flawfinder check is being bypassed. 2024-10-20 13:40:37 +01:00
Andrew Wood 5af711465d Formatting typo fix. 2024-10-17 20:43:16 +01:00
Andrew Wood 32cbad389a Acknowledge Russian translations. 2024-10-17 20:42:51 +01:00
Andrew Wood 6022578901 Merge pull request 'Translations update from Codeberg Translate' (#115) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/115
2024-10-17 19:30:39 +00:00
0koandCodeberg Translate 740acf3664 Translated using Weblate (Russian)
Currently translated at 67.4% (85 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/ru/
2024-10-17 19:19:35 +00:00
Andrew Wood 46e07b2ec3 Added empty translation file for Russian. 2024-10-17 05:34:26 +01:00
Andrew Wood 0318db838e Version bump. 2024-10-15 22:11:38 +01:00
Andrew Wood 04400b0d18 Indent home link. 2024-10-15 21:57:37 +01:00
Andrew Wood 69c5572161 Mention contributors first. 2024-10-15 21:56:01 +01:00
Andrew Wood 0d63932eab Consistently quote the "-" characters where used for options. 2024-10-15 21:10:27 +01:00
Andrew Wood bb6c120691 Replace "zero byte" with "null byte" as per man-pages style guide. 2024-10-15 21:07:04 +01:00
Andrew Wood e657f745f4 Add back the simplest synopsis line. 2024-10-15 21:04:01 +01:00
Andrew Wood 9a1c9173a3 More specific option groups in the synopsis. 2024-10-14 23:37:18 +01:00
Andrew Wood dc648a5368 Work around a pandoc formatting bug with .OP when it wraps to have a square bracket at the start of the line. 2024-10-14 23:36:48 +01:00
Andrew Wood 84651210e6 Manual formatting fix. 2024-10-14 22:46:38 +01:00
Andrew Wood 054183b73a Provide a complete synopsis. 2024-10-14 22:28:05 +01:00
Andrew Wood d0612752f0 Use the right macros for examples and URLs. 2024-10-14 22:02:22 +01:00
Andrew Wood c3a1810890 Remove accidental commit. 2024-10-14 21:49:03 +01:00
Andrew Wood 51de6abbed Formatting correction. 2024-10-14 21:48:44 +01:00
Andrew Wood 94f4a239cc Document the zsh 5.8 issue from #105 in the manual. 2024-10-14 21:46:01 +01:00
Andrew Wood 14a23268ad Mention the new Czech translations. 2024-10-14 21:25:16 +01:00
Andrew Wood 35a9bfe025 Translation acknowledgements update. 2024-10-13 21:53:58 +01:00
Andrew Wood 212bf3e96e Merge pull request 'Translations update from Codeberg Translate' (#114) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/114
2024-10-13 20:45:08 +00:00
mmatousandCodeberg Translate 9021a7ceec Translated using Weblate (Czech)
Currently translated at 100.0% (126 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/cs/
2024-10-13 20:43:00 +00:00
fnetXandCodeberg Translate b56cf08319 Translated using Weblate (German)
Currently translated at 99.2% (125 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-10-13 20:43:00 +00:00
Andrew Wood a09ef9576d Acknowledgements update for Czech translations. 2024-10-13 18:02:51 +01:00
Andrew Wood ea70bbc1b6 Merge pull request 'Translations update from Codeberg Translate' (#113) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/113
2024-10-13 16:57:22 +00:00
mmatousandCodeberg Translate 6fce88d93a Translated using Weblate (Czech)
Currently translated at 41.2% (52 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/cs/
2024-10-13 16:30:07 +00:00
Andrew Wood 82edb8cdf1 Escape the @ in @FILE. 2024-10-13 17:18:47 +01:00
Andrew Wood 5ba70e05fc Escape the @ in @FILE. 2024-10-13 17:18:05 +01:00
Andrew Wood 5c036059f8 Escape the @ in @FILE. 2024-10-13 17:16:14 +01:00
Andrew Wood a3c52ca679 Added empty translation file for Spanish. 2024-10-13 15:46:29 +01:00
Andrew Wood f8138974c1 Remove default comments. 2024-10-13 15:46:12 +01:00
Andrew Wood 08908a5511 Added empty translation file for Czech. 2024-10-13 14:49:22 +01:00
Andrew Wood 50df3e415d Make it clearer that new languages can be added by raising an issue. 2024-10-13 13:16:53 +01:00
Andrew Wood b3b385dd06 Formatting correction. 2024-10-13 01:04:20 +01:00
Andrew Wood 1047e9096a Update to translation acknowledgements. 2024-10-13 01:03:15 +01:00
Andrew Wood 772afe4b5b Merge pull request 'Translations update from Codeberg Translate' (#111) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/111
2024-10-12 23:52:45 +00:00
a-j-woodandCodeberg Translate 6a791267a0 Translated using Weblate (Turkish)
Currently translated at 100.0% (126 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/tr/
2024-10-12 23:51:11 +00:00
Andrew Wood e9b7e13be1 Merge pull request 'Translations update from Codeberg Translate' (#110) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/110
2024-10-12 22:38:38 +00:00
omerdduranandCodeberg Translate 516d64a1ff Translated using Weblate (Turkish)
Currently translated at 100.0% (126 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/tr/
2024-10-12 22:28:46 +00:00
Andrew Wood af7079f708 Merge pull request 'Translations update from Codeberg Translate' (#109) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/109
2024-10-12 21:40:46 +00:00
omerdduranandCodeberg Translate 93502bb64b Translated using Weblate (Turkish)
Currently translated at 49.2% (62 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/tr/
2024-10-12 21:40:23 +00:00
omerdduranandCodeberg Translate 0b74716668 Translated using Weblate (Turkish)
Currently translated at 46.8% (59 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/tr/
2024-10-12 21:38:49 +00:00
omerdduranandCodeberg Translate 61a8f2adea Translated using Weblate (Turkish)
Currently translated at 46.0% (58 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/tr/
2024-10-12 21:38:31 +00:00
omerdduranandCodeberg Translate 4d9701613f Translated using Weblate (Turkish)
Currently translated at 19.0% (24 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/tr/
2024-10-12 21:20:04 +00:00
Andrew Wood 90ab359ed3 Add a comment to say what this does. 2024-10-12 16:11:57 +01:00
Andrew Wood 8ef234dacf Merge pull request 'Translations update from Codeberg Translate' (#108) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/108
2024-10-12 11:14:18 +00:00
a-j-woodandCodeberg Translate ea82ae5090 Translated using Weblate (French)
Currently translated at 86.5% (109 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/fr/
2024-10-12 11:13:41 +00:00
Andrew Wood 65aa347a9f Merge pull request 'Translations update from Codeberg Translate' (#107) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/107
2024-10-11 22:37:53 +00:00
BennyandCodeberg Translate 3ba6d78241 Translated using Weblate (German)
Currently translated at 99.2% (125 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-10-11 22:36:22 +00:00
kreandCodeberg Translate 0e2bb55483 Translated using Weblate (German)
Currently translated at 99.2% (125 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-10-11 22:36:22 +00:00
Andrew Wood c0b64f4bae Line number updates. 2024-10-11 19:51:40 +01:00
Andrew Wood 6d70c0889d Merge pull request 'Translations update from Codeberg Translate' (#106) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/106
2024-10-11 18:50:45 +00:00
BennyandCodeberg Translate 22a614bbf4 Translated using Weblate (German)
Currently translated at 96.0% (121 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-10-11 18:49:50 +00:00
Andrew Wood 1fec5622b6 Line number updates. 2024-10-11 19:49:29 +01:00
Andrew Wood a1e2651b4c Remove the tcsetpgrp() code, as it did not work, since it turns out that zsh 5.8 was setting the terminal process group ID to that of itself when the last command in the pipeline was not a subshell - not to an invalid pgid or anything like that - so we cannot safely detect this or work around it. 2024-10-11 19:48:56 +01:00
Andrew Wood ec498ec476 Added a possible workaround, and extra debugging, for the missing display output issue in #100, but turned off at the moment. 2024-10-09 22:07:56 +01:00
Andrew Wood e433ad319e Merge pull request 'Translations update from Codeberg Translate' (#104) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/104
2024-10-09 17:59:37 +00:00
BennyandCodeberg Translate 30f9d01df9 Translated using Weblate (German)
Currently translated at 96.0% (121 of 126 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-10-09 17:57:53 +00:00
Andrew Wood 579b592c12 Correct the wording of the line buffer allocation failure error message. 2024-10-09 18:55:33 +01:00
Andrew Wood dfbab9a7c0 Add PO file stub for Turkish as requested. 2024-10-09 18:43:19 +01:00
Andrew Wood d1730258bf Sync with code. 2024-10-09 18:42:53 +01:00
Andrew Wood 1afd3e821a Acknowledgement of --store-and-forward suggestion. 2024-10-06 16:27:51 +01:00
Andrew Wood 9e36b0fdc7 Standardise formatting of options. 2024-10-06 16:24:48 +01:00
Andrew Wood 857637c1fb Acknowledge translations. 2024-10-06 16:16:09 +01:00
Andrew Wood 40854f6edb Merge pull request 'Translations update from Codeberg Translate' (#103) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/103
2024-10-06 15:11:22 +00:00
BennyandCodeberg Translate 7f403b8050 Translated using Weblate (German)
Currently translated at 96.0% (120 of 125 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-10-06 15:06:20 +00:00
Andrew Wood 2a59199870 Merge pull request 'Translations update from Codeberg Translate' (#102) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/102

All strings cross-checked with machine translation to check they look plausible (albeit to a non-Polish speaker).
2024-10-06 14:58:11 +00:00
coralpinkandCodeberg Translate 6712d8c844 Translated using Weblate (Polish)
Currently translated at 100.0% (125 of 125 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/pl/
2024-10-06 02:45:41 +00:00
Andrew Wood 856da09741 Add a circular buffer of line positions so that in line mode we can work out how many lines are in the unconsumed portion of the output pipe buffer. 2024-10-05 23:04:18 +01:00
Andrew Wood c4cf410a59 Adjusted Markdown formatting. 2024-10-05 20:52:15 +01:00
Andrew Wood 0994dd4070 Note the new MANIFEST file in releases. 2024-10-05 20:32:15 +01:00
Andrew Wood 6cddce9f15 Adjust dist-hook rule so that a failure to sign, when MAINTAINER is set, will be detected - and to add a note to the top of the manifest. 2024-10-05 20:31:25 +01:00
Andrew Wood ac44fd59e3 Added a hook to write a signed MANIFEST file listing the SHA-512 hashes of all included files. 2024-10-05 17:41:40 +01:00
Andrew Wood 5c25f9270c Line number updates. 2024-10-05 17:41:08 +01:00
Andrew Wood bfe301ae1c Preserve errno after the output write, and if the output pipe is closed, propagate this to the main loop so it does not wait forever for the pipe buffer to empty. 2024-10-05 17:05:14 +01:00
Andrew Wood 29aa64092a Timestamp update 2024-10-05 17:03:58 +01:00
Andrew Wood d9a0041870 New --store-and-forward option (#100), including refactoring several areas to allow PV to run in two passes, and the ability to look at the output pipe buffer utilisation to more accurately reflect the total data transferred to the receiving end, rather than just the total amount written to the output buffer. 2024-10-05 16:21:59 +01:00
Andrew Wood ea3787e393 Call posix_fadvise() each time we open a new file, not just on the first one. 2024-10-05 15:00:08 +01:00
Andrew Wood de2fe7f6be Correct the O_DIRECT flag setting to use the output file descriptor rather than assuming stdout. 2024-10-05 14:17:15 +01:00
Andrew Wood c548d1f2d8 Add a "--gauge" option which alters the progress bar to show the current rate as a percentage of the max rate seen, if the size is unknown (#46). 2024-10-04 22:15:14 +01:00
Andrew Wood fbe726e4c4 Add missing three dots to [OPTION] since there can be more than one. 2024-10-04 21:05:06 +01:00
Andrew Wood 208ac286f8 Calculate rate_min, rate_max, etc, regardless of whether show_stats is true, since the overhead is minimal and it will allow us to use that information for other options later. 2024-10-04 20:15:15 +01:00
Andrew Wood 9aef419c4c Surround the "--average-rate" average rate with brackets rather than square brackets, to differentiate it from the "--rate" current rate. 2024-10-04 19:59:21 +01:00
Andrew Wood a2c6490d31 Prefix the estimated completion time of "--fineta" with "FIN" rather than "ETA" to differentiate it from the "ETA" provided by "--eta" (#43). 2024-10-04 19:45:08 +01:00
Andrew Wood 4b399995f5 Allow --rate to be used with --numeric (#17). 2024-10-04 19:08:02 +01:00
Andrew Wood 877bb1f91f Move calculation code into its own file, to make display.c smaller and keep it focused purely on display. 2024-10-04 17:22:43 +01:00
Andrew Wood cd696e60ab Make pv__calc_percentage() into pv_percentage() in number.c instead of a static function in display.c, so it can be used in multiple places in future. 2024-10-04 17:15:18 +01:00
Andrew Wood 9bd5a518ea New option "--stats", to show a line of statistics about the transfer once it has ended (issue #49). 2024-10-04 15:12:22 +01:00
Andrew Wood fe4cc4b01d Source line number updates. 2024-10-04 13:27:54 +01:00
Andrew Wood 65d568c283 Refactor display and calculation functions to separate them out more cleanly, move more information into the state structure instead of repeating it as function parameters, and fix a memory leak in the whole-PID mode of --watchfd. 2024-10-04 13:27:17 +01:00
Andrew Wood a118f110fa Use verbose variable names for readability. 2024-10-04 11:58:57 +01:00
Andrew Wood f803f29158 Move transfer rate calculations into their own function, and make pv__format stand alone, to maintain separation of concerns. 2024-10-04 11:54:47 +01:00
Andrew Wood 954c2d32c1 Move calculated values out of state.display into a new structure, state.calc, to separate out the display portion from the calculation portion; and move history_interval into state.control, as it is a control parameter set at the start. 2024-10-04 11:08:01 +01:00
Andrew Wood 5112251894 Source line number updates. 2024-10-04 10:24:28 +01:00
Andrew Wood 545769885d Raise a SIGCONT to the whole process group after receiving a SIGTTOU, so that pipelines can be resumed in the background (for example "pv /dev/zero | cat > /dev/null" can now be suspended and put into the background - if we do not send that signal then "cat" remains stopped, as mentioned in issue #56). 2024-10-04 10:24:08 +01:00
Andrew Wood 94ea82c10a Indentation correction. 2024-10-04 10:21:23 +01:00
Andrew Wood a6c978573f Move pv_write_retry() and pv_tty_write() from cursor.c to display.c so they sit with all the other display functions. 2024-10-04 09:06:24 +01:00
Andrew Wood 31d70dae49 Use i18n tag rather than fix. 2024-10-04 08:53:44 +01:00
Andrew Wood 9a639b40b7 Use gmtime() instead of localtime() in debugging output to avoid lockups in signal handlers due to time zone lookups. 2024-10-04 08:53:14 +01:00
Andrew Wood e84f47abc8 Refactor handling of TTOU so that instead of shuffling stderr to another file descriptor and using /dev/null when backgrounded, we set a flag to suspend terminal output, and perform all terminal writes through a new pv_tty_write function which checks that flag. 2024-10-03 23:03:31 +01:00
Andrew Wood 741e4b0b30 Source line number updates. 2024-10-03 23:00:03 +01:00
Andrew Wood 52a720ec33 Improve the readability of the code that handles SIGTTOU. 2024-10-03 22:08:11 +01:00
Andrew Wood 416c61a663 Re-order structure members to minimise padding / holes, after analysis with "pahole" on a 64-bit system. 2024-10-03 22:07:03 +01:00
Andrew Wood 23bd296aeb Re-order structure members to minimise padding / holes, after analysis with "pahole" on a 64-bit system. 2024-10-03 21:25:41 +01:00
Andrew Wood 2c8843fc86 Expand the list of places to check for patches and bug reports. 2024-10-03 12:09:09 +01:00
Andrew Wood aa07373c4e Removed TODO.md, since it is just an outdated copy of the issue tracker. 2024-10-03 11:52:30 +01:00
Andrew Wood a3b5a44f79 Add a translation status widget. 2024-09-29 16:04:41 +01:00
Andrew Wood d5fad8db39 New German translations. 2024-09-29 12:18:11 +01:00
Andrew Wood ef5d703682 Merge pull request 'Translations update from Codeberg Translate' (#99) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/99
2024-09-29 11:09:37 +00:00
a-j-woodandCodeberg Translate 40efaf848e Translated using Weblate (German)
Currently translated at 100.0% (118 of 118 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-09-29 11:07:52 +00:00
Andrew Wood 575854c8b9 Merge pull request 'Translations update from Codeberg Translate' (#98) from translate/pv:weblate-pv-pv into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/98
2024-09-29 10:56:36 +00:00
a-j-woodandCodeberg Translate 3299947cc1 Translated using Weblate (German)
Currently translated at 99.1% (117 of 118 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-09-29 10:47:39 +00:00
Hartmut GoebelandCodeberg Translate 9daeea7400 Translated using Weblate (German)
Currently translated at 99.1% (117 of 118 strings)

Translation: pv/pv
Translate-URL: https://translate.codeberg.org/projects/pv/pv/de/
2024-09-29 10:47:39 +00:00
Andrew Wood 4e51afc36c Added a link to the Weblate instance for translations. 2024-09-28 22:09:07 +01:00
Andrew Wood f1f333dc7a Update version to 1.8.14. 2024-09-07 21:33:24 +01:00
Andrew Wood 69a56ced7a Correct double-free on exit when using --watchfd - issue #96. 2024-09-07 21:04:09 +01:00
Andrew Wood 2c468b0bb2 Version bump for new release. 2024-08-18 21:59:32 +01:00
Andrew Wood c67248ffc7 Update to add the new strings in the options parser. 2024-08-06 23:35:55 +01:00
Andrew Wood 60936080da Move the "--size @FILE" file size reading into its own function for clarity; standardise its error message format to "program: file: message: detail"; uniquely name variables; refuse to accept a directory as a file; and with this option, try reading the size of a block device from sysfs if we can, to avoid requiring read permissions on the device. 2024-08-06 23:17:15 +01:00
Andrew Wood 4db04564a9 Merge pull request 'Support block devices in @-syntax' (#94) from alexanderperlis/pv:support-block-device-size into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/94
2024-08-06 20:26:43 +00:00
Alexander Perlis f6b0ddc0b3 Support block devices in @-syntax 2024-08-01 00:36:02 +00:00
Andrew Wood b42399e9a9 Timestamp update. 2024-07-18 22:23:48 +01:00
Andrew Wood ba72056bf2 Version bump. 2024-07-18 22:10:57 +01:00
Andrew Wood b8e4a51228 Update line numbers. 2024-07-18 22:08:34 +01:00
Andrew Wood 0b12f7db42 Update TODO to reflect issue tracker. 2024-07-18 22:01:36 +01:00
Andrew Wood 5053cffdad Further clarification of #92, #93. 2024-07-17 07:45:13 +01:00
Andrew Wood 02f852604f Add #93. 2024-07-17 07:42:18 +01:00
Andrew Wood e4ab8c56a0 Minor adjustment to comments. 2024-07-17 07:41:48 +01:00
Andrew Wood 86016d41d7 Merge pull request 'Improve description and comments for blocking-write() after select()' (#93) from eborisch/pv:update-block-after-select into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/93
2024-07-17 06:36:50 +00:00
Eric A. Borisch 3fdfd07443 Improve description and comments for blocking-write() after select() 2024-07-16 23:39:15 -05:00
Andrew Wood d801cdd722 Remove spurious strerror() call from debug report. 2024-07-16 22:44:10 +01:00
Andrew Wood 72e5078ce9 Move the MAKE_OUTPUT_NONBLOCKING code to state.c, as it can no longer work in main.c due to accessing internal structures; but still leave it switched off by default for now. 2024-07-16 22:41:31 +01:00
Andrew Wood a7c3f3dd35 Write the error from write() to the debugging output if nwritten is <0. 2024-07-16 22:23:51 +01:00
Andrew Wood 729fc10674 News item and acknowledgement for zero write bug fix (#92). 2024-07-16 22:03:56 +01:00
Andrew Wood 12f0312b00 Move the "stop at size" option setting to before the size calculation, otherwise if the size calculation tries to override that setting, it cannot do so (#91). 2024-07-16 21:58:47 +01:00
Andrew Wood 8c0e3e9dad When checking how many bytes were written, place the constant to the left of the equality check to match the rest of the code (this avoids accidental assignment if one equals sign is accidentally written instead of two), and write the appropriate debug message depending on whether the write was interrupted or it was empty. 2024-07-16 21:54:13 +01:00
Andrew Wood c7104f0c0d Merge pull request 'src/pv/transfer.c: timer going off returns with total_written==0; which is not an error.' (#92) from eborisch/pv:write-can-return-0 into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/92
2024-07-16 20:47:32 +00:00
Andrew Wood 679638beb2 More details. 2024-07-16 21:42:23 +01:00
Andrew Wood f8fc5844b1 Re-order the output file descriptor setting and the size detection to correct the problem with output block device size detection that was broken in 1.8.10 (#91). 2024-07-16 21:39:29 +01:00
eborisch d86d8cf65a Clarify state. 2024-07-16 03:57:11 +00:00
eborisch 11e5b5fe95 src/pv/transfer.c: write(2) returning 0 is not an error
This is being hit easily on FreeBSD with pv sitting in a zfs send/recv pipeline. As write(2) returning 0 is not an error, handle it similar to returning -1 with EINTR or EAGAIN: wait a bit and try again.
2024-07-15 21:36:57 +00:00
Andrew Wood 42b623e9b0 Pre-release version and datestamp updates. 2024-06-15 23:40:07 +01:00
Andrew Wood 21e65b8742 Relax the strictness of this check a little, to avoid false failures on heavily loaded systems. 2024-06-15 23:11:53 +01:00
Andrew Wood c6ac4d11be Added an example of how to list untranslated strings. 2024-06-15 23:00:12 +01:00
Andrew Wood 2d48e07139 Updated the instructions for testing translations, now that a method has been found that actually works. 2024-06-15 22:47:53 +01:00
Andrew Wood 3fee341ac2 Update the line numbers etc in the language files (from "make -C po update-po") - no actual translation changes included. 2024-06-08 22:06:08 +01:00
Andrew Wood 2bed6776e4 Truncate files written with "-o". 2024-06-08 22:02:11 +01:00
Andrew Wood 01e0290d6e More replacement of hard-coded exit status bitmask values with named constants. 2024-06-08 21:57:36 +01:00
Andrew Wood 1c61154206 Replace hard-coded exit status bitmask values with named constants. 2024-06-08 21:49:46 +01:00
Andrew Wood addf25ff16 Minor cleanups after merge. 2024-06-08 21:21:11 +01:00
Andrew Wood 578c1613d1 Merge pull request 'Add '-o' option to write to a file other than stdout' (#90) from xmort/pv:add-output-file-option into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/90
2024-06-08 19:22:14 +00:00
Martin Dørum 6073445551 document the --output in the man page and help text 2024-06-08 14:31:21 +02:00
Martin Dørum 30763684b7 add -o/--output option 2024-06-08 14:31:19 +02:00
Andrew Wood ace8f44f59 Added more debugging to stdout writes. 2024-05-11 21:13:12 +01:00
Andrew Wood 98994bbeaa Correct the copyright year in the "--version" output. 2024-04-22 22:25:22 +01:00
Andrew Wood b089303505 Version update. 2024-04-21 14:20:26 +01:00
Andrew Wood 8992e98c8d Line number adjustments from "make update-po". 2024-04-21 14:18:48 +01:00
Andrew Wood 205245f269 Issue #6 had only one outstanding action which was a duplicate of #34, so it is now removed. 2024-04-21 14:00:31 +01:00
Andrew Wood b375041790 Correct issues #34, #86, #87 - progress output stopping when writing output data blocks - by adding a SIGALRM handler, since ignoring the signal prevents it from interrupting writes; and use setitimer() where available, instead of alarm(), to provide sufficient granularity to handle the case where the --interval is not a whole number of seconds. 2024-04-21 13:54:01 +01:00
Andrew Wood 3a41665302 Fix incorrect "%lf" string format. 2024-04-21 12:02:35 +01:00
Andrew Wood f6686b8188 Minor formatting changes by "indent". 2024-04-21 12:01:52 +01:00
Andrew Wood 31b43cf3c7 Formatting correction. 2024-04-21 11:32:26 +01:00
Andrew Wood e483b19c14 Formatting correction. 2024-04-21 11:31:54 +01:00
Andrew Wood 50b400a1f8 Formatting correction. 2024-04-21 11:31:26 +01:00
Andrew Wood d90dc35dd3 Formatting correction. 2024-04-21 11:30:46 +01:00
Andrew Wood b45970b3b6 Added the ENVIRONMENT section. 2024-04-21 11:27:51 +01:00
Andrew Wood a5700cc914 Reinstate the use of $TMPDIR and $TMP in cursor positioning rather than hard-coding "/tmp" (#88). 2024-04-20 21:46:23 +01:00
Andrew Wood d3c59cbff3 Minor comment formatting correction. 2024-04-20 21:31:17 +01:00
Andrew Wood 8bc1cc28d0 Check for zero-length $HOME and document the reason flawfinder's warning is being ignored. 2024-04-20 21:01:04 +01:00
Andrew Wood 1ad9c321bc Adjust copyright years. 2024-03-19 22:19:42 +00:00
Andrew Wood c9dede08d4 Adjust the decimal units flag variable name from "si" to "decimal_units" so it does not overlap with other words like "size" and "signal"; add man page entry and adjust the "-L" man page entry; and allow this flag to also change how input prefixes are processed. 2024-03-19 22:17:43 +00:00
Andrew Wood 3b721112e6 Acknowledge pull request #85. 2024-03-19 21:42:08 +00:00
Andrew Wood 0093fb8276 Merge pull request 'Support for decimal SI units' (#85) from kevinruddy/pv:si-patch into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/85
2024-03-19 21:30:01 +00:00
kevinruddy fe8137521a Support for decimal SI units 2024-03-19 16:57:57 -04:00
Andrew Wood 2bc7a1bb10 Added #83. 2024-03-13 21:56:34 +00:00
Andrew Wood 120ba0ba9a Minor typo correction. 2024-03-13 21:48:57 +00:00
Andrew Wood 88d93737aa Merge pull request 'Update to po/fr.po' (#83) from tbertels/pv:tbertels-patch-1 into main
Reviewed-on: https://codeberg.org/a-j-wood/pv/pulls/83
2024-03-13 21:44:46 +00:00
tbertels 317d5a3aba Update to po/fr.po
Missing strings and corrections
2024-03-12 07:31:42 +00:00
Andrew Wood ddc5cb0224 Added TODO #81. 2024-01-08 23:42:31 +00:00
Andrew Wood 4b4ec17ff9 Timestamp updates. 2023-11-19 16:39:51 +00:00
Andrew Wood cc9534fc7b Cast of values for pv_snprintf() is required on Cygwin. 2023-11-19 16:39:32 +00:00
Andrew Wood c8762821fb Version update. 2023-11-19 14:16:56 +00:00
Andrew Wood 272dacdd3a Update to reflect closure of #77. 2023-10-22 17:48:45 +01:00
Andrew Wood 78548460b7 Stamp and string position updates. 2023-10-22 17:44:45 +01:00
Andrew Wood 3eee7a1409 Addressed more issues raised by flawfinder. 2023-10-22 17:43:40 +01:00
Andrew Wood e446782c1f Addressed more issues raised by splint, and refactored out state_array so that state is part of info_array and each state is allocated and deallocated properly instead of referencing pointers multiple times. 2023-10-22 16:23:53 +01:00
Andrew Wood d8664ca4c1 Stamp and string position updates. 2023-10-22 00:09:06 +01:00
Andrew Wood d06374a0f1 Addressed more issues raised by splint and flawfinder. 2023-10-22 00:08:35 +01:00
Andrew Wood 9a9c117411 Addressed more issues raised by flawfinder. 2023-10-18 23:10:29 +01:00
Andrew Wood 2255dcc2bf Stamp and string position updates. 2023-10-18 23:10:14 +01:00
Andrew Wood be4402c1ff Addressed more issues raised by flawfinder. 2023-10-17 22:09:04 +01:00
Andrew Wood 4d46dbe545 Comment wording correction. 2023-10-17 21:02:21 +01:00
Andrew Wood 3fdf8d5a69 Improved comments. 2023-10-16 22:47:02 +01:00
Andrew Wood 7c0aea0b1e Stamp and string position updates. 2023-10-15 23:53:24 +01:00
Andrew Wood b4d6c5ed2a Addressed more issues raised by splint, and improved variable names and comments. 2023-10-15 23:42:04 +01:00
Andrew Wood d8e0674da0 Move locally scoped variables from "switch" statement into outer "for" loop, to avoid triggering a crash in the "splint" code analyser. 2023-10-15 22:29:37 +01:00
Andrew Wood b0df2e53a8 Replace str_* in state structure with an array of components of enumerated types, to avoid pointers everywhere in the format array and to allow for later expansion which will separate "string length" from "displayed width" to allow for wide character support. 2023-10-14 17:18:20 +01:00
Andrew Wood 94ffdaf60d Group state structure into sub-structures to allow future changes to watchpid code that will do a better job of duplicating the relevant parts of the internal state for each fd. 2023-10-14 01:23:54 +01:00
Andrew Wood 376aa5a8fa Stamp and string position updates. 2023-10-14 00:08:37 +01:00
Andrew Wood 7fcc7af07d Addressed more issues raised by flawfinder. 2023-10-14 00:04:56 +01:00
Andrew Wood 03d42555e7 Addressed more issues raised by splint. 2023-10-14 00:04:24 +01:00
Andrew Wood b8624035e0 Addressed more issues raised by splint. 2023-10-13 23:36:15 +01:00
Andrew Wood 41b223a757 Addressed more issues raised by splint. 2023-10-13 23:31:28 +01:00
Andrew Wood 03fb1dc673 Correct percentage formatting so it is always 3 characters wide. 2023-10-11 22:22:53 +01:00
Andrew Wood e864eca78d Only check for the IPC functions we are still using. 2023-10-01 15:16:31 +01:00
Andrew Wood ddafc2e897 Only check for the IPC functions we are still using. 2023-10-01 15:15:07 +01:00
Andrew Wood bf3f76e02e Position and string updates. 2023-10-01 15:10:48 +01:00
Andrew Wood 4398cd8677 It is now October. 2023-10-01 12:52:24 +01:00
Andrew Wood dbf55eff3c For message passing for "--remote", fall back to $HOME/.pv instead of /tmp if /run/user/<uid> is unavailable. 2023-10-01 12:41:27 +01:00
Andrew Wood 07f894f66c Minor formatting change from "indent". 2023-10-01 12:40:22 +01:00
Andrew Wood a9737ca05e Correct the test skip reason message, if "--remote" is not supported. 2023-10-01 01:50:52 +01:00
Andrew Wood 0e1750835e Rewrite of "--remote", to use a temporary file for information exchange instead of a SysV IPC message queue, to correct the fault where "make check -j32" would fail due to every PV exit removing the message queue. 2023-10-01 01:20:16 +01:00
Andrew Wood 965cc52815 Stamp and string position updates. 2023-09-25 22:24:21 +01:00
Andrew Wood 08ee154c09 Add more debugging to message receipt check, in sender. 2023-09-25 21:51:45 +01:00
Andrew Wood 37cacf3da4 Added another contributor. 2023-09-25 21:44:20 +01:00
Andrew Wood 55f7f94a6f Additional fix for compilation with "--disable-ipc". 2023-09-25 21:36:02 +01:00
Andrew Wood 1e91713bb6 Add debugging to message receipt check, in sender. 2023-09-25 21:32:14 +01:00
Andrew Wood 27f52cac6b Version update. 2023-09-25 21:20:24 +01:00
Andrew Wood b0a144fd54 Move variable declarations into the blocks in which they are used, to avoid compilation warnings on MacOS, as per patch from Benoit Pierre. 2023-09-25 21:14:30 +01:00
Andrew Wood bfa4a23751 Move struct stat in pv_main_loop inside the #if HAVE_STRUCT_STAT_ST_BLKSIZE block to avoid compilation warnings, as per patch from Benoit Pierre. 2023-09-25 21:07:24 +01:00
Andrew Wood 7c6568865c Move smb_bug in pv_crs_fini inside the #if HAVE_IPC block so the code can compile on non IPC systems, as per patch from Benoit Pierre. 2023-09-25 21:03:19 +01:00
Andrew Wood 30c4a059af Creation stamp update. 2023-09-24 21:58:31 +01:00
Andrew Wood 404cc417d6 Version update. 2023-09-24 21:26:25 +01:00
Andrew Wood ded6b69c3f Minor splint workarounds. 2023-09-24 21:24:50 +01:00
Andrew Wood e5cc71b4d2 Switched licensing to GPLv3+. 2023-09-24 21:09:52 +01:00
Andrew Wood 7bc91e10de Version and string position updates. 2023-09-23 21:56:59 +01:00
Andrew Wood 2033c6085f Addressed more issues raised by splint. 2023-09-23 21:53:31 +01:00
Andrew Wood 780b65a648 More type corrections. 2023-09-16 23:14:16 +01:00
Andrew Wood 20b8c9700a Rename the functions to better describe what they do, remove single-letter variable names, add more explanatory comments, remove "_t" suffix from typedef as per FreeBSD style guide. 2023-09-16 00:55:40 +01:00
Andrew Wood b1b5e9197a Version and string position updates. 2023-09-14 22:40:52 +01:00
Andrew Wood 252213fbc2 Addressed more issues raised by splint, and corrected some type confusion between off_t and size_t / ssize_t. 2023-09-14 22:19:49 +01:00
Andrew Wood e696b737e3 Addressed more issues raised by splint. 2023-09-13 23:50:20 +01:00
Andrew Wood 153285bec0 Use off_t for file sizes, size_t for buffer sizes. 2023-09-13 23:17:53 +01:00
Andrew Wood 304b87503e Added size argument handling test. 2023-09-13 23:04:47 +01:00
Andrew Wood 455f819ec0 Corrected error report messages. 2023-09-13 23:04:31 +01:00
Andrew Wood 2942c312a7 Removed "-" argument to "cksum" for FreeBSD compatibility. 2023-09-13 23:04:00 +01:00
Andrew Wood c6315365e2 Comment correction. 2023-09-13 22:47:29 +01:00
Andrew Wood 7b6a91422d Added size parsing test. 2023-09-13 22:46:53 +01:00
Andrew Wood cb3daa3b63 Position updates. 2023-09-12 23:46:18 +01:00
Andrew Wood 2e6a3937d4 Check for extra libraries before checking for vital functions. 2023-09-12 23:43:43 +01:00
Andrew Wood 8a2ddac50e Type consistency corrections - use booleans for boolean operations, use size_t for byte counts. 2023-09-12 23:42:23 +01:00
Andrew Wood 052c182278 Adjustments in line with "autoscan" recommendations. 2023-09-12 21:26:24 +01:00
Andrew Wood e11c58cf3b Version and string position updates. 2023-09-12 20:54:54 +01:00
Andrew Wood df67cee38a Addressed more issues raised by splint. 2023-09-11 23:06:57 +01:00
Andrew Wood 7f1cdc8527 Addressed the issues raised by splint and flawfinder. 2023-09-11 21:54:30 +01:00
Andrew Wood 896727b664 Addressed the issues raised by splint and flawfinder. 2023-09-10 23:04:43 +01:00
Andrew Wood b0a67878bb Addressed the issues raised by splint and flawfinder, with a TODO for a better cleanup for one issue. 2023-09-09 21:14:01 +01:00
Andrew Wood e8dab7daf7 Addressed more issues raised by splint. 2023-09-07 22:59:19 +01:00
Andrew Wood e7c332ad0b Addressed more issues raised by splint. 2023-09-06 23:32:34 +01:00
Andrew Wood e21ed5d2c5 Reformatted with indent. 2023-09-05 23:36:22 +01:00
Andrew Wood 2a8e6b36b3 Addressed more issues raised by splint. 2023-09-05 23:36:01 +01:00
Andrew Wood 8bc088d016 Added "make indentclean". 2023-09-05 23:35:22 +01:00
Andrew Wood 175e66cd43 Just present the to-do list as a list of issues in order. 2023-09-04 23:03:31 +01:00
Andrew Wood 849c5e2a90 Added more issues. 2023-09-04 22:54:17 +01:00
Andrew Wood 538546f5fb Increase heading level. 2023-09-04 22:43:12 +01:00
Andrew Wood 25884e823e Restructured to be more Markdown than text. 2023-09-04 22:40:52 +01:00
Andrew Wood 3cb239c202 Added spacing to the long list. 2023-09-04 22:33:40 +01:00
Andrew Wood c6a001bbc6 Added spacing to the long list. 2023-09-04 22:32:38 +01:00
Andrew Wood 89f81bb7d6 Reverted bug report address to the email address, keeping it independent of the development repository in case we have to move again; made some minor man page corrections; updated po files to match changes in source. 2023-09-04 20:39:04 +01:00
Andrew Wood 52399ee812 Address some of the warnings raised by splint. 2023-09-03 22:12:18 +01:00
Andrew Wood 7f735b7282 Added TODO to re-check timespec casting. 2023-09-03 21:42:46 +01:00
Andrew Wood 8e781e0b51 Enforce zero-termination of dst even if system strlcat() is available. 2023-09-03 21:42:09 +01:00
Andrew Wood 1ad63a7a37 Address warnings raised by splint. 2023-09-03 18:18:17 +01:00
Andrew Wood 7fcf65e9c3 Address warnings raised by flawfinder. 2023-09-03 18:00:01 +01:00
Andrew Wood 63251ef650 Expand on the "make analyse" documentation. 2023-09-03 16:08:57 +01:00
Andrew Wood befcddc994 Address warnings raised by splint. 2023-09-03 16:02:00 +01:00
Andrew Wood 7d7d5ddf2e Added flawfinder notes. 2023-09-03 01:14:55 +01:00
Andrew Wood 760cb41a61 Minor shuffle. 2023-09-03 01:06:02 +01:00
Andrew Wood 926e74fd02 List indentation update. 2023-09-03 00:56:47 +01:00
Andrew Wood 86feafb721 Rename "doc" directory to "docs" to match Debian standards. 2023-09-03 00:40:26 +01:00
Andrew Wood 57f66c0b99 Move release checklist into the developer notes file, and expand on several points; add TODO for translation tests. 2023-09-03 00:31:16 +01:00
Andrew Wood 05f964ee25 Added new "make release" target. 2023-09-02 23:40:03 +01:00
Andrew Wood ff571539cb Add i18n libs to the correct variable. 2023-09-02 23:27:19 +01:00
Andrew Wood 307db0d802 Automatic updates to translation files. 2023-09-02 22:08:41 +01:00
Andrew Wood 78bb93b288 Move terminal TOSTOP attribute changes into signal handling functions and only set/unset that attribute rather than saving and restoring the whole terminal state; keep track of whether we have changed it and change cursor positioning IPC data to a structure so the state change can be shared with all "pv -c" instances. 2023-09-02 22:06:31 +01:00
Andrew Wood 756b48e7b6 Minor formatting fix, and work around a pandoc bug. 2023-09-02 01:40:46 +01:00
Andrew Wood 2f975cd3d2 Version bump. 2023-09-02 01:34:16 +01:00
Andrew Wood 2b341c1a7f Minor consistency fixes. 2023-09-02 01:33:11 +01:00
Andrew Wood 14ce832249 New "--error-skip-block" option. 2023-09-02 01:21:18 +01:00
Andrew Wood f7ccb79147 Corrected manual formatting of arguments - all replaceable items such as arguments should be in italic, as per the conventions described in man(1). 2023-09-02 00:38:33 +01:00
Andrew Wood decae290d4 Improve the comments, and add support in the SI prefix code for negative numbers. 2023-08-31 22:51:23 +01:00
Andrew Wood d51a1b10f0 Corrections to file header comments. 2023-08-31 21:49:27 +01:00
Andrew Wood a8867b1882 Translations file update, no new translations. 2023-08-30 23:34:53 +01:00
Andrew Wood 749d23705e Check whether librt is required for clock_gettime(). 2023-08-30 23:34:12 +01:00
Andrew Wood a6849012a6 Minor automated indentation fixes. 2023-08-30 22:25:51 +01:00
Andrew Wood 1f320dd7a2 Replace all gettimeofday() calls, and elapsed time arithmetic, with a new set of elapsed time functions based on clock_gettime(), to avoid faults due to time zone / DST changes and machine suspend/resume. 2023-08-30 22:23:43 +01:00
Andrew Wood 46e5948425 Add Debian bug IDs to the appropriate outstanding items. 2023-08-28 22:51:32 +01:00
Andrew Wood b7eb3c9e90 Record whether the width or height were set manually, and refrain from changing a manually set value when the terminal size changes. 2023-08-28 22:03:14 +01:00
Andrew Wood 9e5bdeb3a4 Added "--discard" option. 2023-08-28 21:05:45 +01:00
Andrew Wood 2cd74c7ff7 Move gettext macros earlier, so the right include directory is used when checking for libintl.h, and add the relevant options to LDFLAGS. 2023-08-28 20:28:41 +01:00
Andrew Wood 4c71e96cba Skip valgrind tests if the tool is present but does not support the options we use. 2023-08-28 19:37:49 +01:00
Andrew Wood f67d173aef Autogenerated files updated. 2023-08-28 18:17:26 +01:00
Andrew Wood a59465ff6e Support "make test" as an alias for "make check". 2023-08-28 17:46:56 +01:00
Andrew Wood 0bd1b82d3a Move libgen.h out of IPC conditional code since it is not related directly to IPC; adjust IPC configuration so that IPC support is auto-disabled if the relevant header files or library functions are missing. 2023-08-28 17:44:53 +01:00
Andrew Wood 65eac50c21 Alter file processing to silently skip unreadable input files at the size calculation stage, and report - and skip rather than exiting - unreadable files at the point they are needed during the transfer, more like "cat" does; also, more variable name corrections for bad names (single letters). 2023-08-28 17:15:16 +01:00
Andrew Wood 2a092c9495 Rename "null" state boolean to "null_terminated_lines" so it is more descriptive and less confusing. 2023-08-28 16:18:51 +01:00
Andrew Wood 10296f93e4 Use dormant code to calculate total line count in line mode when all inputs are regular files, and fix unwise variable naming in size calculation functions, no more "i" and "j". 2023-08-28 16:12:31 +01:00
Andrew Wood 66cae656d1 Rename state variable "no_op" to the more descriptive "no_display", as pv is not doing nothing when this is set, it is still transferring data. 2023-08-28 15:20:51 +01:00
Andrew Wood b1ef744058 Use posix_fadvise() on input files, where available. 2023-08-28 13:10:38 +01:00
Andrew Wood 7d07db6526 Extend "make clean" to remove files from "make analyse". 2023-08-28 10:15:52 +01:00
Andrew Wood a8e232e894 Correction to Markdown manual link. 2023-08-28 10:07:09 +01:00
Andrew Wood e99548ea8a Major restructuring to switch build system from old scripts to GNU Automake. 2023-08-28 10:04:39 +01:00
Andrew Wood 5495e0e808 More TODO items. 2023-08-26 22:17:04 +01:00
Andrew Wood 11e654ec90 Added plans to change build system and license. 2023-08-26 22:06:04 +01:00
Andrew Wood 4854fcf3e0 Note the --pidfile change. 2023-08-26 21:47:00 +01:00
Andrew Wood fb8bea390c Use mkstemp() to write the PID file more safely, avoiding potential symlink issues. 2023-08-26 21:45:31 +01:00
Andrew Wood fe22f0e449 Store name and format string in internal state as their own copies rather than pointers to strings outside the state, for memory safety and to avoid a leak on remote control. 2023-08-26 20:49:30 +01:00
Andrew Wood c0abc9ce3c Adjustments for migration to Codeberg. 2023-08-16 17:30:10 +01:00
Andrew Wood c39d81b71a Removed. 2023-08-16 17:18:09 +01:00
Andrew Wood 9ab690b7c0 Added some memory safety tests using valgrind. 2023-08-15 22:50:25 +01:00
Andrew Wood 6cb207667d No longer run tests with "sh -e", but just with "sh", for greater flexibility; all current tests already explicitly exit with the correct status. 2023-08-15 22:33:18 +01:00
Andrew Wood 4c9f304a46 Adjustments and annotations as per splint and flawfinder reports, and a TODO marker for upcoming memory management cleanup work. 2023-08-15 22:32:13 +01:00
Andrew Wood a9c4c6e049 Add TODO markers for memory management cleanup work to come soon. 2023-08-15 22:30:56 +01:00
Andrew Wood 4cd28b23f0 Adjustments and annotations as per splint and flawfinder reports. 2023-08-14 23:07:37 +01:00
Andrew Wood b2989efd5c Added TODO highlighted by flawfinder. 2023-08-14 22:54:02 +01:00
Andrew Wood cc4d1a15e4 Make the filenames in the list constant. 2023-08-14 22:37:23 +01:00
Andrew Wood 7f25aff91d Adjustments and annotations as per splint and flawfinder reports. 2023-08-14 22:33:06 +01:00
Andrew Wood 32f984de56 Date/version bump. 2023-08-14 20:59:55 +01:00
Andrew Wood f01117d84e Adjustments and annotations as per splint and flawfinder reports. 2023-08-14 20:56:11 +01:00
Andrew Wood f3cd9a2664 Spacing changes from "make indent". 2023-08-13 16:19:45 +01:00
Andrew Wood fff425ec61 Added flawfinder notes for getenv(). 2023-08-13 16:18:22 +01:00
Andrew Wood c78e082192 Follow the current month. 2023-08-07 21:41:54 +01:00
Andrew Wood 34ba94ae63 Date/version bump. 2023-08-07 21:41:21 +01:00
Andrew Wood 82e1297d77 Added contributor for GH#73,74. 2023-08-07 21:40:41 +01:00
Andrew Wood 25baeb4375 URL correction. 2023-08-07 21:40:16 +01:00
Andrew Wood 18d17beb93 Merged in GH#75, "configure --enable-static". 2023-08-07 21:35:37 +01:00
Andrew Wood 34c18d47a4 String location auto updates after latest changes. 2023-08-07 21:19:36 +01:00
Andrew Wood 6560137233 Do not fail the test if msgfmt was not available, as that would prevent localisation files being installed. 2023-08-06 20:50:48 +01:00
Andrew Wood ada5748d2f Possible workaround for OS X oddity with fdatasync() - GH#73. 2023-08-06 20:45:46 +01:00
Andrew Wood c2e77cd005 Replaced AC_HEADER_TIOCGWINSZ and always just include sys/ioctl.h if it is available - GH#74. 2023-08-06 20:31:02 +01:00
Andrew Wood 8e3b47bf89 Added test to check that "make install" installs the expected set of files. 2023-08-01 21:42:59 +01:00
Andrew Wood e7e7649d2f Deal with the various tmux versions out there. 2023-08-01 21:18:05 +01:00
Andrew Wood e63b6225f8 Bump for new unreleased version. 2023-07-31 23:23:39 +01:00
Andrew Wood 14fb0e7832 Terminal width detection test. 2023-07-31 23:22:51 +01:00
Andrew Wood 303d3ea359 Corrected Markdown list formatting. 2023-07-30 20:11:30 +01:00
Andrew Wood 318954d21e Add link to issue describing terminal sizing bug. 2023-07-30 20:04:17 +01:00
Andrew Wood 85dd2603bf Added DEVELOPERS.md. 2023-07-30 19:59:19 +01:00
Andrew Wood b6c797af1a Track position movements due to reformatting. 2023-07-30 19:22:00 +01:00
Andrew Wood 40b9ef2a9d Version update for new release. 2023-07-30 18:56:09 +01:00
Andrew Wood 146add0ed3 Check for termios.h so that HAVE_TERMIOS_H is defined, otherwise terminal size detection is broken on Cygwin (issue GH#72). 2023-07-30 16:54:35 +01:00
Andrew Wood 911969c2a8 Cast char to int in isdigit() to satisfy GCC on Cygwin. 2023-07-30 16:52:31 +01:00
Andrew Wood 4b3b49806f Added notes about code reformatting, and "--help" word wrapping. 2023-07-29 22:37:16 +01:00
Andrew Wood 943c05a8a0 Reformatted with "indent" to a line length of 120. 2023-07-29 22:21:32 +01:00
Andrew Wood 630d92fef6 Added splint annotation. 2023-07-29 22:19:43 +01:00
Andrew Wood 34fe796806 Refactored "--help" to support multi-byte character locales when word wrapping, and clear all "splint" and "flawfinder" warnings. 2023-07-29 21:32:34 +01:00
Andrew Wood 907b449c6b Set line length to 120 in "make indent". 2023-07-29 21:29:22 +01:00
Andrew Wood b59b1bad4b Added note about DEBUG. 2023-07-28 23:16:41 +01:00
Andrew Wood 7e374be0d7 Minor spacing changes due to "indent". 2023-07-28 23:15:09 +01:00
Andrew Wood b9f96d9508 Provide new option "--debug" instead of using insecure environment variable DEBUG. 2023-07-28 23:14:14 +01:00
Andrew Wood 08a8c2ea70 Version bump and first changes listed. 2023-07-28 22:36:42 +01:00
Andrew Wood 1f103d6a11 Include POSIX library in splint calls. 2023-07-28 22:35:50 +01:00
Andrew Wood 7f3924db77 Added "make analyse" to run analysis tools on the source. 2023-07-28 22:28:07 +01:00
Andrew Wood cd9f057f15 Removed incorrect undef HAVE_STDBOOL_H which caused standard boolean types to be redefined unnecessarily. 2023-07-28 21:55:57 +01:00
Andrew Wood 7088833627 Closed issue #70 - the problem was successfully reproduced with 1.7.0 and then observed to have been resolved in 1.7.18. 2023-07-28 21:38:42 +01:00
Andrew Wood 57f8daff30 Closed issue #69 - confirmation received that this is fixed in 1.7.18. 2023-07-28 21:33:12 +01:00
Andrew Wood 275cc6c10d Updated "make release" to sign using a specific key, and only do tar.gz files. 2023-07-28 17:57:55 +01:00
Andrew Wood 8491b5cdd5 Updated "make release" for upcoming change. 2023-07-28 17:50:12 +01:00
Andrew Wood 6496c8785b Removed an obsolete step. 2023-07-28 17:40:44 +01:00
Andrew Wood 506ec4a8ec Updating as a result of msgmerge during release. 2023-07-28 17:34:29 +01:00
Andrew Wood 5a140b689f Updated for new release 2023-07-28 11:10:30 +01:00
Andrew Wood 38ddb5e32a Corrected language list in NLS support. 2023-07-28 11:08:49 +01:00
Andrew Wood 173de4fafd Bump version for new release. 2023-07-27 22:19:42 +01:00
Andrew Wood ae81f83e9b New option "--direct-io". 2023-07-27 21:44:30 +01:00
Andrew Wood 9f07a28065 Formatting fix for short multiline test output on wide terminals 2023-07-27 21:11:08 +01:00
Andrew Wood 60913618be Adjust lower threshold in case of heavy load during testing. 2023-07-27 20:49:14 +01:00
Andrew Wood 43dc9d6469 Added test for "--sync" 2023-07-26 22:43:00 +01:00
Andrew Wood 6cff3c1c2a First draft of new "--sync" option. 2023-07-26 22:17:00 +01:00
Andrew Wood caf7d6ff18 Unreleased version bump 2023-07-25 22:41:41 +01:00
Andrew Wood d343669f45 Added note about adding more tests. 2023-07-25 22:39:48 +01:00
Andrew Wood ecaa5ce6cd Added test 2023-07-25 22:19:15 +01:00
Andrew Wood e5b5e67e57 Added test 2023-07-25 22:06:31 +01:00
Andrew Wood 1efe1d60b5 Added test 2023-07-25 21:43:29 +01:00
Andrew Wood f83927e451 Add more tests 2023-07-25 21:21:37 +01:00
Andrew Wood 678f655116 Also test basic integrity with --force 2023-07-25 21:21:02 +01:00
Andrew Wood 7794df7182 Capitalisation fix 2023-07-24 23:16:52 +01:00
Andrew Wood 923ef47056 Progress update 2023-07-24 23:15:09 +01:00
Andrew Wood 0a509fb535 Cleaned up with shellcheck, and corrected the description in the comment block at the top. 2023-07-24 23:08:18 +01:00
Andrew Wood 1927e88350 Minor shellcheck-suggested update. 2023-07-24 22:30:49 +01:00
Andrew Wood 760ee403fe Variable name modernisation, and shellcheck corrections. 2023-07-24 22:29:18 +01:00
Andrew Wood 6ecf31b5ee Cleanups suggested by shellcheck. 2023-07-24 21:50:22 +01:00
Andrew Wood 8051f5808c Cleanups suggested by shellcheck. 2023-07-24 21:48:23 +01:00
Andrew Wood 0518357560 Make the --numeric --bytes --line-mode combination more explicitly defined 2023-07-24 20:57:31 +01:00
Andrew Wood e0856df8ef Fix rate display width when it is exactly 0 in bytes mode. 2023-07-23 22:29:09 +01:00
Andrew Wood d4590e1f3b New tests added 2023-07-23 22:00:19 +01:00
Andrew Wood 99c5e0988c Additional formatting improvements 2023-07-23 21:59:25 +01:00
Andrew Wood 6a24d75022 Add more verbose output and apply fixes suggested by shellcheck. 2023-07-23 18:45:53 +01:00
Andrew Wood 82aa30c306 Add more verbose output and apply fixes suggested by shellcheck. 2023-07-23 18:35:49 +01:00
Andrew Wood 4fa3331f88 Explicitly set locale for tests 2023-07-23 17:59:38 +01:00
Andrew Wood fd0850f1ab Correction to the detection of this bug 2023-07-23 17:16:29 +01:00
Andrew Wood cecc8649c2 Further display improvements and cleanups 2023-07-23 17:16:04 +01:00
Andrew Wood c39e97ec5a Fix byte prefix at low rates so it is two spaces, not one 2023-07-23 17:13:14 +01:00
Andrew Wood 909355619b Restructure tests and adjust display format, to better understand what each test is testing. 2023-07-23 16:25:52 +01:00
Andrew Wood b086ddf599 Rewrote most of run-test, and gave variables clearer names 2023-07-23 14:54:45 +01:00
Andrew Wood a0e5d5e9e7 Rebuild timestamp update 2023-07-23 14:27:19 +01:00
Andrew Wood dbcae4a9ae Updated with latest news 2023-07-23 12:34:39 +01:00
Andrew Wood 4ba1343c20 Added test of large file support 2023-07-23 12:28:11 +01:00
Andrew Wood ee3c02fd7f Renamed tests for consistency 2023-07-23 11:41:56 +01:00
Andrew Wood c7e0bb727e Introduce strlcat() instead of strcat(), and replace all sizeof() of buffers inside structures with constants where possible, to avoid bugs caused by reading the size of a pointer instead of the size of the buffer it points to. 2023-07-23 01:57:00 +01:00
Andrew Wood 80e3f791c4 Rebuilt automatically 2023-07-23 01:50:04 +01:00
Andrew Wood 74325282e7 Corrected quoting issue in sed 2023-07-23 01:49:48 +01:00
Andrew Wood ab20f9406f Corrected path handling which was writing bad dependency files 2023-07-23 00:35:49 +01:00
Andrew Wood e94600d7a4 Put all terminal writes through the same pv_write_retry function for consistency and to clear up compiler warnings. 2023-07-22 23:22:34 +01:00
Andrew Wood 9783f7ebef Cleanups to fscanf() and Apple-specific watchfd code 2023-07-22 22:53:02 +01:00
Andrew Wood b6d1f62979 Centralise all sprintf()/snprintf() calls in a compatibility wrapper pv_snprintf() 2023-07-22 22:40:07 +01:00
Andrew Wood cab177814a Document the cleanups to "make test". 2023-07-22 20:49:25 +01:00
Andrew Wood 2303da77db Skip the pipe test if GNU head is not available. 2023-07-22 20:46:51 +01:00
Andrew Wood 264e3a5879 Format output with printf, allow test scripts to write output to be displayed, and allow test scripts to be skipped. 2023-07-22 20:46:35 +01:00
Andrew Wood 5f6f418cfd Added backticks note 2023-07-22 20:21:42 +01:00
Andrew Wood 3b2e274907 Check for ctags and cproto before starting any work 2023-07-22 20:20:48 +01:00
Andrew Wood a24342a072 Replace backticks in shell scripts with S() 2023-07-22 20:20:15 +01:00
Andrew Wood 101294195b Remove references to 64-bit file functions - stat, lstat, lseek, etc - as part of large file support rewrite. 2023-07-22 19:55:55 +01:00
Andrew Wood 5cf5eda406 Minor correction to cleanup. 2023-07-22 19:55:07 +01:00
Andrew Wood 8c284d863d TODO and version update to show unreleased status 2023-07-22 19:45:57 +01:00
Andrew Wood 7448c7f320 Rewrote configure.in and replaced header.in with one generated by autoheader, added copyright notice to all source files as per GNU standards, and changed "pv --version" output to conform to GNU standards. 2023-07-22 19:35:43 +01:00
Andrew Wood b923afc385 Added the new issues after 1.7.0 2023-07-18 07:29:32 +01:00
177 changed files with 26893 additions and 10073 deletions
-1
View File
@@ -1 +0,0 @@
github: a-j-wood
+16 -1
View File
@@ -1,3 +1,18 @@
*~
build-aux
missing
compile
depcomp
install-sh
config.sub
config.guess
Makefile.in
aclocal.m4
autoscan.log
configure
configure.scan
autom4te.cache
ABOUT-NLS
m4
*~
*.tar.gz
patch-backlog
+156
View File
@@ -0,0 +1,156 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = po
bin_PROGRAMS = pv
dist_doc_DATA = README.md docs/INSTALL docs/COPYING docs/NEWS.md docs/ACKNOWLEDGEMENTS.md docs/DEVELOPERS.md
dist_man1_MANS = docs/pv.1
EXTRA_DIST = docs/pv.1.md docs/benchmark-rw-syscalls-vs-data.sh docs/benchmark-pv-transfers.sh docs/release.cf
pv_SOURCES = \
src/main/debug.c \
src/main/help.c \
src/main/main.c \
src/main/options.c \
src/main/version.c \
src/pv/calc.c \
src/pv/cursor.c \
src/pv/display.c \
src/pv/elapsedtime.c \
src/pv/file.c \
src/pv/format/averagerate.c \
src/pv/format/barstyle.c \
src/pv/format/bufferpercent.c \
src/pv/format/bytes.c \
src/pv/format/eta.c \
src/pv/format/fineta.c \
src/pv/format/lastwritten.c \
src/pv/format/name.c \
src/pv/format/previousline.c \
src/pv/format/progressbar.c \
src/pv/format/rate.c \
src/pv/format/ratio.c \
src/pv/format/sgr.c \
src/pv/format/timer.c \
src/pv/loop.c \
src/pv/number.c \
src/pv/proctitle.c \
src/pv/remote.c \
src/pv/signal.c \
src/pv/state.c \
src/pv/string.c \
src/pv/transfer.c \
src/pv/watchpid.c \
src/include/config-aux.h \
src/include/options.h \
src/include/pv-internal.h \
src/include/pv.h
## Allow tests to write diagnostic info to fd 9 to reach the original
## stderr even when the test driver is sending test output to a file.
AM_TESTS_FD_REDIRECT = 9>&2
AM_TESTS_ENVIRONMENT = \
. $(srcdir)/tests/test-env.sh \
;
TESTS = \
tests/Bug_-_Display_length_at_magnitude_boundary_-_Bytes.test \
tests/Bug_-_Display_length_at_magnitude_boundary_-_Rate.test \
tests/Bug_-_Install_all_files.test \
tests/Display_-_--average-rate.test \
tests/Display_-_--bits.test \
tests/Display_-_--buffer-percent.test \
tests/Display_-_--bytes.test \
tests/Display_-_--eta_-_plausible_values.test \
tests/Display_-_--fineta_-_plausible_values.test \
tests/Display_-_--last-written.test \
tests/Display_-_--numeric_--bytes_--line-mode.test \
tests/Display_-_--numeric_--bytes.test \
tests/Display_-_--numeric.test \
tests/Display_-_--numeric_--timer.test \
tests/Display_-_--progress_-_basic_movement.test \
tests/Display_-_--progress_-_increasing.test \
tests/Display_-_--quiet.test \
tests/Display_-_--rate_-_displayed_value_changes.test \
tests/Display_-_--timer_-_displayed_value_changes.test \
tests/General_-_--pidfile.test \
tests/General_-_--size_argument_handling.test \
tests/Integrity_-_Basic.test \
tests/Integrity_-_Binary_data.test \
tests/Integrity_-_From_bursty_source.test \
tests/Integrity_-_Large_file_support.test \
tests/Integrity_-_On_closed_output_pipe_at_EOF.test \
tests/Integrity_-_On_failed_input_pipe_at_EOF.test \
tests/Integrity_-_On_output_pipe_close.test \
tests/Integrity_-_When_adjusted_remotely.test \
tests/Memory_safety_-_Basic.test \
tests/Memory_safety_-_Process_title.test \
tests/Memory_safety_-_Remote_control_receiver.test \
tests/Memory_safety_-_Remote_control_sender.test \
tests/Memory_safety_-_Watchfd.test \
tests/Modifiers_-_--direct-io.test \
tests/Modifiers_-_--force.test \
tests/Modifiers_-_--interval.test \
tests/Modifiers_-_--line-mode.test \
tests/Modifiers_-_--size_from_file_size.test \
tests/Modifiers_-_--size_from_dir_size.test \
tests/Modifiers_-_--size.test \
tests/Modifiers_-_--sync.test \
tests/Monitor_-_Basic.test \
tests/Sparse_-_Basic.test \
tests/Terminal_-_Detect_width.test \
tests/Transfer_-_--rate-limit.test \
tests/Transfer_-_--remote.test \
tests/Transfer_-_--stop-at-size.test \
tests/Transfer_-_--stop-at-size_reads.test \
tests/Watchfd_-_Multiple_arguments.test \
tests/Watchfd_-_Multiple_descriptors.test \
tests/Watchfd_-_Single_descriptor.test
EXTRA_DIST += $(TESTS) tests/run-valgrind.sh tests/test-env.sh
docs/pv.1.md: $(srcdir)/docs/pv.1
test -d docs || mkdir docs
pandoc --from man --to markdown < $< | sed '/\*\*\*\*/{s/\*//g;s/^/**/;s/$$/**/}' | sed '/^```/,/^```/d' | sed 's/^\\\[/[/' > $@
SUFFIXES = .c .o .e
.c.e:
-splint -badflag +posixlib $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -DSPLINT=1 $< > $@ 2>&1
-flawfinder $< >> $@ 2>&1
indent:
cd $(srcdir) && indent -npro -kr -i8 -cd42 -c45 -l120 src/*/*.c src/*/*/*.c
indentclean:
rm -f $(srcdir)/src/*/*.c~ $(srcdir)/src/*/*/*.c~
analyse: $(pv_SOURCES:.c=.e) FORCE
grep -E -e '^Finished checking --' -e 'Hits = ' $+ 2>/dev/null || true
FORCE:
clean-local:
rm -f src/*/*.e src/*/*/*.e
# Convenience alias for "make check": "make test"
test: check
# Generate a package manifest if MAINTAINER is set.
dist-hook:
if test -n "$(MAINTAINER)"; then \
cd "$(top_distdir)" \
&& { printf "%s\n\n" "Check file integrity with 'sha512sum -c MANIFEST && echo OK'."; \
find -type f -not -name MANIFEST -exec sha512sum '{}' ';' | sort -k 2; } \
| gpg -u "$(MAINTAINER)" --clearsign > MANIFEST; \
else true; fi
# "release" target - requires MAINTAINER variable to select GPG key.
release: distcheck
gpg --list-secret-keys 2>&1 | grep -F 'uid' | grep -Fq "$(MAINTAINER)"
gpg -u "$(MAINTAINER)" -ab $(distdir).tar.gz
cp -f $(distdir).tar.gz.asc $(distdir).tar.gz.txt
chmod 644 $(distdir).tar.gz $(distdir).tar.gz.asc $(distdir).tar.gz.txt
+70 -36
View File
@@ -1,58 +1,92 @@
Introduction
------------
# 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.
**pv** ("Pipe Viewer") is a terminal-based tool for monitoring the progress
of data through a pipeline and modifying its flow.
When used just like "**cat**", **pv** displays how quickly data is being
transferred, how long it has taken, how near to completion it is, and an
estimate of how long it will be until completion. Data flow rate, error
handling strategy, buffer size, and cache interaction can all be adjusted.
With the "**\--cursor**" option, several **pv** instances can work together,
showing transfer progress at different points in the same pipeline.
In "**\--watchfd**" mode, **pv** will inspect another process and show its
progress through the files it has open.
In "**\--monitor**" mode, **pv** will run a command and display the progress
of data through both its standard input and its standard output.
Documentation
-------------
# Documentation
A manual page is included in this distribution. See "`man ./doc/quickref.1`",
or "`man pv`" after installation.
A manual page is included in this distribution ("`man pv`"). Before
installation, it is in "[docs/pv.1](./docs/pv.1.md)".
Changes are listed in "[doc/NEWS.md](./doc/NEWS.md)". The to-do list is "[doc/TODO.md](./doc/TODO.md)".
Changes are listed in "[docs/NEWS.md](./docs/NEWS.md)".
Developers and translators, please see "[docs/DEVELOPERS.md](./docs/DEVELOPERS.md)".
Translators can use the Weblate instance hosted by Codeberg:
[https://translate.codeberg.org/engage/pv/](https://translate.codeberg.org/engage/pv/)
[![Translation status](https://translate.codeberg.org/widget/pv/multi-auto.svg)](https://translate.codeberg.org/engage/pv/)
If you don't see your language listed, raise an issue on the issue tracker
(or just email the maintainer) asking for it to be added.
Compilation
-----------
# Installation
If this is not a packaged release, first run "`./generate.sh`".
See "[docs/INSTALL](./docs/INSTALL)" for more about the _configure_ script.
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.
The typical process for a system-wide install is:
See the file "[doc/INSTALL](./doc/INSTALL)" for more about the _configure_ script.
sh ./configure --prefix=/usr
make
sudo make install
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.
This requires the build toolchain ("`sudo apt install build-essential`" on
Debian or Ubuntu systems).
If this is not a packaged release, the _configure_ script is not included.
It is generated with the GNU build system tools (_autoconf_, _aclocal_,
_autopoint_, _automake_); _gettext_ is also needed. On Debian or Ubuntu,
run "`sudo apt install automake autopoint gettext`". Once those tools are
in place, call "`autoreconf -is`" to generate the _configure_ script, and
run it as described above.
Author and acknowledgements
---------------------------
# Copyright, bug reporting, 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)".
See "[docs/ACKNOWLEDGEMENTS.md](./docs/ACKNOWLEDGEMENTS.md)" for a list of
contributors.
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).
Copyright (C) 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood.
License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl-3.0.html>.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
Software Foundation, either version 3 of the License, or (at your option)
any later version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
You should have received a copy of the GNU General Public License, version
3, in "[docs/COPYING](./docs/COPYING)". If not, see
<https://www.gnu.org/licenses/gpl-3.0.html>.
Please report bugs or request features via the issue tracker linked from the
home page.
The **pv** home page is at:
&nbsp;&nbsp;[http://www.ivarch.com/programs/pv.shtml](http://www.ivarch.com/programs/pv.shtml)
> [https://ivarch.com/p/pv](https://ivarch.com/p/pv)
The latest version can always be found here.
**Please see "[doc/ACKNOWLEDGEMENTS.md](./doc/ACKNOWLEDGEMENTS.md)" for a list of contributors.**
---
-14
View File
@@ -1,14 +0,0 @@
#
# Files from which this is generated (inside directory `autoconf/make'):
#
# package.mk # package name and distribution details
# vars.mk # compilation, shell and linking variables
# filelist.mk~ # lists of files
# unreal.mk # phony targets
# modules.mk~ # module linking rules
# rules.mk # compilation rules
# link.mk # real top-level targets
# depend.mk~ # dependencies
#
#
-204
View File
@@ -1,204 +0,0 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/main/version.c)
dnl We're using C.
dnl
AC_LANG_C
dnl Output a header file.
dnl
AC_CONFIG_HEADER(src/include/config.h:autoconf/header.in)
dnl Set directory to check for Configure scripts in.
dnl
AC_CONFIG_AUX_DIR(autoconf/scripts)
dnl Read in package details.
dnl
PACKAGE=`cat $srcdir/doc/PACKAGE`
VERSION=`cat $srcdir/doc/VERSION`
UCPACKAGE=`tr a-z A-Z < $srcdir/doc/PACKAGE`
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_SUBST(UCPACKAGE)
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(PROGRAM_NAME, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
dnl Check for compile-time options.
dnl
AC_ARG_ENABLE(debugging,
[ --enable-debugging compile with debugging support],
if test "$enable_debugging" = "yes"; then
CFLAGS="-g -Wall"
AC_DEFINE(ENABLE_DEBUGGING)
fi
)
AC_ARG_ENABLE(profiling,
[ --enable-profiling compile with profiling support],
if test "$enable_profiling" = "yes"; then
CFLAGS="-pg $CFLAGS"
fi
)
LFS_SUPPORT="no"
AC_ARG_ENABLE(lfs, [ --disable-lfs disable LFS support],
if test "$enable_lfs" = "yes"; then
LFS_SUPPORT="yes"
fi,
LFS_SUPPORT="yes"
)
STATIC_NLS="no"
AC_ARG_ENABLE(static-nls, [ --enable-static-nls hardcode NLS with no support files],
if test "$enable_static_nls" = "yes"; then
STATIC_NLS="yes"
fi,
STATIC_NLS="no"
)
NLS_SUPPORT="no"
AC_ARG_ENABLE(nls, [ --disable-nls do not use Native Language Support],
if test "$enable_nls" = "yes"; then
NLS_SUPPORT="yes"
fi,
NLS_SUPPORT="yes"
)
SPLICE_SUPPORT="no"
AC_ARG_ENABLE(splice, [ --disable-splice do not use splice system call],
if test "$enable_splice" = "yes"; then
SPLICE_SUPPORT="yes"
fi,
SPLICE_SUPPORT="yes"
)
IPC_SUPPORT="no"
AC_ARG_ENABLE(ipc, [ --disable-ipc turn off IPC messaging],
if test "$enable_ipc" = "yes"; then
IPC_SUPPORT="yes"
fi,
IPC_SUPPORT="yes"
)
dnl Check for various programs.
dnl
CFLAGS=${CFLAGS:-"-O"}
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_MAKE_SET
dnl AIX needs -lc128
dnl
AC_EGREP_CPP([^yes$], [#ifdef _AIX
yes
#endif
], [LIBS="$LIBS -lc128"])
dnl NLS stuff.
dnl
ALL_LINGUAS="de fr pl pt"
if test "$NLS_SUPPORT" = "yes"; then
AC_DEFINE(ENABLE_NLS)
AC_PATH_PROG(MSGFMT, msgfmt, NOMSGFMT)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
AC_PATH_PROG(XGETTEXT, xgettext, xgettext)
if test "x$MSGFMT" = "xNOMSGFMT"; then
MSGFMT=""
STATIC_NLS="yes"
fi
if test "$STATIC_NLS" = "yes"; then
CATALOGS=""
NLSOBJ="src/nls/table.o"
else
AC_CHECK_LIB(intl, main)
AC_CHECK_LIB(i, main)
fi
CATOBJEXT=.mo
INSTOBJEXT=.mo
for lang in $ALL_LINGUAS; do
GMOFILES="$GMOFILES $lang.gmo"
POFILES="$POFILES \$(srcdir)/src/nls/$lang.po"
CATALOGS="$CATALOGS src/nls/$lang$CATOBJEXT";
done
if test "$STATIC_NLS" = "yes"; then
CATALOGS=""
else
AC_CHECK_FUNC(gettext,
[AC_DEFINE(HAVE_GETTEXT)
NLSOBJ=""
], [CATALOGS=""; NLSOBJ="src/nls/table.o"
]
)
fi
fi
AC_CHECK_HEADERS(libintl.h)
AC_CHECK_HEADERS(locale.h)
AC_SUBST(MSGFMT)
AC_SUBST(GMSGFMT)
AC_SUBST(XGETTEXT)
AC_SUBST(CATOBJEXT)
AC_SUBST(INSTOBJEXT)
AC_SUBST(GMOFILES)
AC_SUBST(POFILES)
AC_SUBST(CATALOGS)
AC_SUBST(NLSOBJ)
dnl Getopt checks.
dnl
AC_CHECK_FUNCS(getopt_long getopt)
AC_CHECK_HEADERS(getopt.h)
dnl LFS checks.
dnl
if test "$LFS_SUPPORT" = "yes"; then
AC_CHECK_FUNCS(open64, AC_DEFINE(ENABLE_LARGEFILE))
fi
dnl Check for various header files and set various other macros.
dnl
AC_DEFINE(HAVE_CONFIG_H)
AC_HEADER_STDC
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
AC_CHECK_HEADERS(sys/ipc.h sys/param.h libgen.h)
fi
if test "$SPLICE_SUPPORT" = "yes"; then
AC_CHECK_FUNCS(splice)
fi
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
AC_SUBST(INSTALL_DATA)
dnl Fudging for separate build directories.
dnl
subdirs=""
for i in `find $srcdir/src -type d -print | sed s,$srcdir/,,`; do
subdirs="$subdirs $i"
done
dnl Stitch together the Makefile fragments.
dnl
mk_segments="autoconf/Makefile.in"
for i in vars.mk package.mk filelist.mk~ unreal.mk modules.mk~ \
rules.mk link.mk depend.mk~; do
mk_segments="$mk_segments:autoconf/make/$i"
done
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
src/.dummy:doc/NEWS.md,
rm -f src/.dummy
for i in $subdirs; do
test -d $i || mkdir $i
done
, subdirs="$subdirs")
dnl EOF
-114
View File
@@ -1,114 +0,0 @@
/*!NOINDEX*/
/* Define if you have standard C headers. */
#undef STDC_HEADERS
/* Define if you have "config.h" (yes, you have). */
#undef HAVE_CONFIG_H
/* Various other header files. */
#undef HAVE_GETOPT_H
#undef HAVE_LIMITS_H
#undef HAVE_SYS_IPC_H
#undef HAVE_SYS_PARAM_H
#undef HAVE_LIBGEN_H
/* Functions. */
#undef HAVE_GETOPT
#undef HAVE_GETOPT_LONG
#undef HAVE_MEMCPY
#undef HAVE_BASENAME
#undef HAVE_SNPRINTF
#undef HAVE_STAT64
#undef HAVE_SPLICE
#ifdef HAVE_SPLICE
# define _GNU_SOURCE 1
#endif
/* NB the above must come before NLS, as NLS includes other system headers. */
/* NLS stuff. */
#undef ENABLE_NLS
#undef HAVE_LIBINTL_H
#undef HAVE_LOCALE_H
#undef HAVE_GETTEXT
#ifdef ENABLE_NLS
# include "library/gettext.h"
#else
# define _(String) (String)
# define N_(String) (String)
#endif
/* The name of the program. */
#define PROGRAM_NAME "progname"
/* The name of the package. */
#define PACKAGE ""
/* The current package version. */
#define VERSION "0.0.0"
/* Various identification and legal stuff. */
#define COPYRIGHT_YEAR _("2015")
#define COPYRIGHT_HOLDER _("Andrew Wood <andrew.wood@ivarch.com>")
#define PROJECT_HOMEPAGE "http://www.ivarch.com/programs/" PROGRAM_NAME ".shtml"
#define BUG_REPORTS_TO _("<pv@ivarch.com>")
/* LFS support. */
#undef ENABLE_LARGEFILE
#ifdef ENABLE_LARGEFILE
# define __USE_LARGEFILE64 1
# define _LARGEFILE64_SOURCE 1
#else
/*
* Some Macs have stat64 despite not having open64 while others don't have
* either, so here even if we don't have open64 or LFS is disabled, we have
* to check whether stat64 exists and only redefine it if it doesn't
* otherwise some Macs fail to compile.
*/
# ifdef __APPLE__
# ifndef HAVE_STAT64
# define stat64 stat
# define fstat64 fstat
# define lstat64 lstat
# endif
# else
# define stat64 stat
# define fstat64 fstat
# define lstat64 lstat
# endif
# define open64 open
# define lseek64 lseek
#endif
#undef HAVE_IPC
#ifdef HAVE_SYS_IPC_H
#define HAVE_IPC 1
#endif
#undef CURSOR_ANSWERBACK_BYTE_BY_BYTE
#ifndef _AIX
#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
/* EOF */
-11
View File
@@ -1,11 +0,0 @@
#
# Targets.
#
$(package): src/main.o src/library.o src/pv.o @NLSOBJ@
$(CC) $(LINKFLAGS) $(CFLAGS) -o $@ src/main.o src/library.o src/pv.o @NLSOBJ@ $(LIBS)
$(package)-static: src/main.o src/library.o src/pv.o @NLSOBJ@
$(CC) $(LINKFLAGS) $(CFLAGS) -static -o $@ src/main.o src/library.o src/pv.o @NLSOBJ@ $(LIBS)
# EOF
-17
View File
@@ -1,17 +0,0 @@
#
# Package name, version, and distribution files.
#
package = @PACKAGE@
version = @VERSION@
PACKAGE = @PACKAGE@
distfiles = \
$(srcdir)/README.md \
$(srcdir)/autoconf \
$(srcdir)/configure \
$(srcdir)/doc \
$(srcdir)/src \
$(srcdir)/tests
# EOF
-43
View File
@@ -1,43 +0,0 @@
#
# Compilation rules.
#
.SUFFIXES: .c .d .o
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
.c.d:
sh $(srcdir)/autoconf/scripts/depend.sh \
$(CC) $< $(<:%.c=%) $(srcdir) $(CFLAGS) $(CPPFLAGS) > $@
#
# NLS stuff
#
%.mo: %.po
$(MSGFMT) -o $@ $<
@touch $@
@chmod 644 $@
%.gmo: %.po
rm -f $@
$(GMSGFMT) -o $@ $<
@touch $@
@chmod 644 $@
$(srcdir)/src/nls/$(PACKAGE).pot: $(allsrc)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(srcdir) \
--add-comments --keyword=_ --keyword=N_ \
$(allsrc)
if cmp -s $(PACKAGE).po $@; then \
rm -f $(PACKAGE).po; \
else \
rm -f $@; \
mv $(PACKAGE).po $@; \
chmod 644 $@; \
fi
src/nls/table.c: $(POFILES)
sh $(srcdir)/autoconf/scripts/po2table.sh $(POFILES) > src/nls/table.c
-183
View File
@@ -1,183 +0,0 @@
#
# Rules for all phony targets.
#
.PHONY: all help make dep depend test check \
clean depclean indentclean distclean cvsclean svnclean \
index manhtml indent update-po \
doc dist release \
install uninstall
all: $(alltarg) $(CATALOGS)
help:
@echo 'This Makefile has the following utility targets:'
@echo
@echo ' all build all binary targets'
@echo ' install install compiled package and manual'
@echo ' uninstall uninstall the package'
@echo ' check / test run standardised tests on the compiled binary'
@echo
@echo 'Developer targets:'
@echo
@echo ' make rebuild the Makefile (after adding new files)'
@echo ' dep / depend rebuild .d (dependency) files'
@echo ' clean remove .o (object) and .c~ (backup) files'
@echo ' depclean remove .d (dependency) files'
@echo ' indentclean remove files left over from "make indent"'
@echo ' distclean remove everything not distributed'
@echo ' cvsclean remove everything not in CVS/SVN'
@echo
@echo ' index generate an HTML index of source code'
@echo ' manhtml output HTML man page to stdout'
@echo ' indent reformat all source files with "indent"'
@echo ' update-po update the .po files'
@echo
@echo ' dist create a source tarball for distribution'
@echo ' release create and sign tar.gz and tar.bz2'
@echo
make:
echo > $(srcdir)/autoconf/make/filelist.mk~
echo > $(srcdir)/autoconf/make/modules.mk~
cd $(srcdir); \
bash autoconf/scripts/makemake.sh \
autoconf/make/filelist.mk~ \
autoconf/make/modules.mk~
sh ./config.status
dep depend: $(alldep)
echo '#' > $(srcdir)/autoconf/make/depend.mk~
echo '# Dependencies.' >> $(srcdir)/autoconf/make/depend.mk~
echo '#' >> $(srcdir)/autoconf/make/depend.mk~
echo >> $(srcdir)/autoconf/make/depend.mk~
cat $(alldep) >> $(srcdir)/autoconf/make/depend.mk~
sh ./config.status
clean:
rm -f $(allobj)
depclean:
rm -f $(alldep)
indentclean:
cd $(srcdir) && for FILE in $(allsrc); do rm -f ./$${FILE}~; done
update-po: $(srcdir)/src/nls/$(PACKAGE).pot
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
lang=$(srcdir)/`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
mv $$lang.po $$lang.old.po; \
if $(MSGMERGE) $$lang.old.po $(srcdir)/src/nls/$(PACKAGE).pot > $$lang.po; then \
rm -f $$lang.old.po; \
else \
echo "msgmerge for $$cat failed!"; \
rm -f $$lang.po; \
mv $$lang.old.po $$lang.po; \
chmod 644 $$lang.po; \
fi; \
done
distclean: clean depclean
rm -f $(alltarg) src/include/config.h
rm -rf $(package)-$(version).tar* $(package)-$(version)
rm -f *.html config.*
rm Makefile
cvsclean svnclean: distclean
rm -f doc/lsm
rm -f doc/quickref.1
rm -f configure
rm -f src/nls/*.gmo src/nls/*.mo
echo > $(srcdir)/autoconf/make/depend.mk~
echo > $(srcdir)/autoconf/make/filelist.mk~
echo > $(srcdir)/autoconf/make/modules.mk~
doc:
:
index:
(cd $(srcdir); sh autoconf/scripts/index.sh $(srcdir)) > index.html
manhtml:
@man2html ./doc/quickref.1 \
| sed -e '1,/<BODY/d' -e '/<\/BODY/,$$d' \
-e 's|<A [^>]*>&nbsp;</A>||ig' \
-e 's|<A [^>]*>\([^<]*\)</A>|\1|ig' \
-e '/<H1/d' -e 's|\(</H[0-9]>\)|\1<P>|ig' \
-e 's/<DL COMPACT>/<DL>/ig' \
-e 's/&lt;[0-9A-Za-z_.-]\+@[0-9A-Za-z_.-]\+&gt;//g' \
-e 's|<I>\(http://.*\)</I>|<A HREF="\1">\1</A>|ig' \
| sed -e '1,/<HR/d' -e '/<H2>Index/,/<HR/d' \
indent:
cd $(srcdir) && indent -npro -kr -i8 -cd42 -c45 $(allsrc)
dist: doc update-po
rm -rf $(package)-$(version)
mkdir $(package)-$(version)
cp -dprf Makefile $(distfiles) $(package)-$(version)
cd $(package)-$(version); $(MAKE) distclean
cp -dpf doc/lsm $(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`
chmod 755 $(package)-$(version)/configure
rm -rf DUMMY `find $(package)-$(version) -type d -name CVS`
rm -rf DUMMY `find $(package)-$(version) -type d -name .svn`
tar cf $(package)-$(version).tar $(package)-$(version)
rm -rf $(package)-$(version)
-gzip -f9 $(package)-$(version).tar
check test: $(alltarg)
sh $(srcdir)/autoconf/scripts/run-test.sh ./$(package) $(srcdir)
install: all doc
$(srcdir)/autoconf/scripts/mkinstalldirs \
"$(DESTDIR)$(bindir)"
$(srcdir)/autoconf/scripts/mkinstalldirs \
"$(DESTDIR)$(mandir)/man1"
$(INSTALL) -m 755 $(package) \
"$(DESTDIR)$(bindir)/$(package)"
$(INSTALL) -m 644 doc/quickref.1 \
"$(DESTDIR)$(mandir)/man1/$(package).1"
if test -n "$(CATALOGS)"; then \
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
name=`echo $$cat | sed 's,^.*/,,g'`; \
if test "`echo $$name | sed 's/.*\(\..*\)/\1/'`" = ".gmo"; then \
destdir=$(gnulocaledir); \
else \
destdir=$(localedir); \
fi; \
lang=`echo $$name | sed 's/$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
$(srcdir)/autoconf/scripts/mkinstalldirs $$dir; \
$(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
done; \
fi
uninstall:
-$(UNINSTALL) "$(DESTDIR)$(bindir)/$(package)"
-$(UNINSTALL) "$(DESTDIR)$(mandir)/man1/$(package).1"
-$(UNINSTALL) "$(DESTDIR)$(mandir)/man1/$(package).1.gz"
-if test -n "$(CATALOGS)"; then \
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
name=`echo $$cat | sed 's,^.*/,,g'`; \
if test "`echo $$name | sed 's/.*\(\..*\)/\1/'`" = ".gmo"; then \
destdir=$(gnulocaledir); \
else \
destdir=$(localedir); \
fi; \
lang=`echo $$name | sed 's/$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
$(UNINSTALL) $$dir/$(PACKAGE)$(INSTOBJEXT); \
done; \
fi
release: dist
zcat $(package)-$(version).tar.gz | bzip2 > $(package)-$(version).tar.bz2
-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)*
-46
View File
@@ -1,46 +0,0 @@
#
# Variables for Make.
#
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
infodir = @infodir@
mandir = @mandir@
etcdir = @prefix@/etc
datadir = @datadir@
sbindir = @sbindir@
VPATH = $(srcdir)
localedir = $(datadir)/locale
gnulocaledir = $(prefix)/share/locale
CATALOGS = @CATALOGS@
POFILES = @POFILES@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
@SET_MAKE@
SHELL = /bin/sh
CC = @CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
UNINSTALL = rm -f
LDFLAGS = -r
LINKFLAGS = @LDFLAGS@
DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/src/include -Isrc/include $(DEFS)
LIBS = @LIBS@
alltarg = @PACKAGE@
# EOF
-30
View File
@@ -1,30 +0,0 @@
#!/bin/sh
#
# Generate dependencies for a C source file.
#
CC=$1
shift
file=$1
shift
stem=$1
shift
srcdir=$1
abssrc=`echo $srcdir | sed ':1
s,^\./,,g
t1'`
shift
abssrc=`echo "$abssrc" | sed 's,\\.,\\\\.,g'`
srcdir=`echo "$srcdir" | sed 's,\\.,\\\\.,g'`
$CC -M -MG $* $file \
| sed -e 's, /[^ ]*,,g' -e "s,^.*\.o:,${stem}.d ${stem}.o:," \
-e '/^ \\$/d' -e 's/ \\$//' \
-e 's,'"$srcdir"'/,,g' -e 's,'"$abssrc"'/,,g' \
| tr '\n' ' ' \
| tr -s ' '
echo
# EOF
-171
View File
@@ -1,171 +0,0 @@
#!/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
# file is listed, and each function's prototype and comment are given. A
# list of "TODO:" comments is also generated.
#
# Outputs the HTML on standard output.
#
# If a parameter is given, it is the prefix to put before any "view file"
# links, eg ".." to link to "../dir/file.c" instead of "dir/file.c".
#
# Skips any files containing the string !NOINDEX.
#
# Requires ctags and cproto.
#
OFFS=$1
# Convert the given string to HTML-escaped values (<, >, & escaped) on
# stdout.
#
html_safe () {
echo "$*" \
| sed -e 's|&|\&amp;|g;s|<|\&lt;|g;s|>|\&gt;|g'
}
# Convert the given string to HTML-escaped values (<, >, & escaped) on
# stdout, also adding a <BR> to the end of each line.
#
html_safebr () {
echo "$*" \
| sed -e 's|&|\&amp;|g;s|<|\&lt;|g;s|>|\&gt;|g;s/$/<BR>/'
}
ALLFILES=`find . -name '*~' -prune -o -type f -name '*.c' \
-exec grep -FL '!NOINDEX' /dev/null '{}' ';'`
CTAGDATA=`echo "$ALLFILES" \
| ctags -nRf- -L- --c-types=f \
| sed 's/ .\// /;s/;" .*$//'`
FILELIST=`echo "$CTAGDATA" | cut -d ' ' -f 2 | sort | uniq`
echo '<HTML><HEAD>'
echo '<TITLE>Source Code Index</TITLE>'
echo '</HEAD><BODY>'
echo '<H1><A NAME="top">Source Code Index</A></H1>'
echo '<P><UL>'
echo '<LI><A HREF="#files">File Listing</A></LI>'
echo '<LI><A HREF="#funcs">Function Listing</A></LI>'
echo '<LI><A HREF="#todo">To-Do Listing</A></LI>'
echo '</UL></P>'
echo '<H2><A NAME="files">File Listing</A></H2>'
echo '<P><UL>'
echo "$FILELIST" \
| sed -e \
's|^.*$|<LI><CODE CLASS="filename"><A HREF="#file-\0">\0</A></CODE></LI>|'
echo '</UL></P>'
for FILE in $FILELIST; do
DIR=`dirname $FILE`
FUNCDEFS=`cproto -f1 -I. -Isrc/include -I$DIR $FILE 2>/dev/null \
| sed -n 's/^.*[ *]\([^ *(]*\)(.*$/\1/p'`
FILEHEAD="`sed -n -e \
'1,/\*\//{/\/\*/,/\*\//{s/^[\/ *]//;s/^\*[\/]*//;p;};}' \
< $FILE`"
FILESHORTDESC=`echo "$FILEHEAD" | sed -n '1,/^ *$/{/^ *[^ ]*/p;}'`
FILELONGDESC=`echo "$FILEHEAD" | sed '1,/^ *$/d'`
echo '<P><HR WIDTH="100%"></P>'
echo '<P><TABLE BORDER="0"><TR>'
echo '<TD VALIGN="TOP"><CODE CLASS="filename">'
echo '<A NAME="file-'"$FILE"'">'"$FILE"'</A></CODE></TD>'
echo '<TD VALIGN="TOP"> - </TD>'
echo '<TD VALIGN="TOP">'`html_safe "$FILESHORTDESC"`'</TD>'
echo '</TR></TABLE></P>'
echo '<P><SMALL>[<A HREF="'"$OFFS/$FILE"'">View File</A>]</SMALL></P>'
echo '<P><BLOCKQUOTE>'
echo "`html_safebr "$FILELONGDESC"`"
echo '</BLOCKQUOTE></P>'
if [ -n "$FUNCDEFS" ]; then
echo '<P>Functions defined:</P>'
echo '<P><UL>'
echo "$FUNCDEFS" \
| sed 's|^.*$|<A HREF="#func-\0---'"$FILE"'">\0</A>|' \
| sed 's/^/<LI><CODE CLASS="funcname">/;s|$|</CODE></LI>|'
echo '</UL></P>'
fi
echo '<P ALIGN="RIGHT"><SMALL CLASS="navbar">['
echo '<A HREF="#top">Top</A> |'
echo '<A HREF="#todo">To Do</A> |'
echo '<A HREF="#funcs">Functions</A> ]</SMALL></P>'
done
echo '<H2><A NAME="funcs">Function Listing</A></H2>'
echo '<P><UL>'
echo "$CTAGDATA" | while read FUNC FILE LINENUM REST; do
echo -n '<LI><CODE CLASS="funcname">'
echo -n '<A HREF="#func-'"$FUNC"'---'"$FILE"'">'"$FUNC"'</A></CODE> '
echo '[<CODE CLASS="filename">'"$FILE"'</CODE>]</LI>'
done
echo '</UL></P>'
echo "$CTAGDATA" | while read FUNC FILE LINENUM REST; do
FUNCDEF=`sed -n "$LINENUM,/{/p" < $FILE \
| tr '\n' ' ' \
| tr -d '{'`
LASTCOMLINE=`sed -n '1,'"$LINENUM"'{/\/\*/=;}' < $FILE | sed -n '$p'`
[ -z "$LASTCOMLINE" ] && LASTCOMLINE=1
LASTENDFUNCLINE=`sed -n '1,'"$LINENUM"'{/}/=;}' < $FILE | sed -n '$p'`
[ -z "$LASTENDFUNCLINE" ] && LASTENDFUNCLINE=1
FUNCHEAD="`sed -n -e \
"$LASTCOMLINE,"'/\*\//{h;s/^[\/ *]//;s/^\*[\/]*//;p;x;/\*\//q;}' \
< $FILE`"
[ "$LASTCOMLINE" -le "$LASTENDFUNCLINE" ] && FUNCHEAD=""
echo '<P><HR WIDTH="100%"></P>'
echo '<P ALIGN="LEFT">'
echo -n '<CODE CLASS="funcname"><A NAME="func-'"$FUNC"'---'"$FILE"'">'
echo -n "$FUNC"'</A></CODE> '
echo -n '[<CODE CLASS="filename"><A HREF="#file-'"$FILE"'">'
echo "$FILE"'</A></CODE>]'
echo '</P>'
echo '<P><CODE CLASS="funcdef">'"`html_safe "$FUNCDEF"`"'</CODE></P>'
echo '<P><BLOCKQUOTE>'
echo "`html_safebr "$FUNCHEAD"`"
echo '</BLOCKQUOTE></P>'
echo '<P ALIGN="RIGHT"><SMALL CLASS="navbar">['
echo '<A HREF="#top">Top</A> |'
echo '<A HREF="#todo">To Do</A> |'
echo '<A HREF="#files">Files</A> ]</SMALL></P>'
done
echo '<H2><A NAME="todo">To Do Listing</A></H2>'
echo '<P><UL>'
for FILE in $FILELIST; do
TODOLINES=`sed -n \
-e '/\/\*.*\*\//!{/\/\*/,/\*\//{/TODO:/{=;};};}' \
-e '/\/\*.*\*\//{/TODO:/{=;};}' \
< $FILE`
[ -z "$TODOLINES" ] && continue
echo -n '<LI><CODE CLASS="filename">'
echo '<A HREF="#file-'"$FILE"'">'"$FILE"'</A></CODE>'
echo '<UL>'
for NUM in $TODOLINES; do
TODO=`sed -n "$NUM"'{s/^.*TODO://;s/\*\/.*$//;p;}' < $FILE`
echo "<LI>[<B>$NUM</B>] `html_safe "$TODO"`</LI>"
done
echo '</UL></LI>'
done
echo '</BODY></HTML>'
# EOF
-250
View File
@@ -1,250 +0,0 @@
#! /bin/sh
#
# install - install a program, script, or datafile
# This comes from X11R5 (mit/util/scripts/install.sh).
#
# Copyright 1991 by the Massachusetts Institute of Technology
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
# copyright notice and this permission notice appear in supporting
# documentation, and that the name of M.I.T. not be used in advertising or
# publicity pertaining to distribution of the software without specific,
# written prior permission. M.I.T. makes no representations about the
# suitability of this software for any purpose. It is provided "as is"
# without express or implied warranty.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch. It can only install one file at a time, a restriction
# shared with many OS's install programs.
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
transformbasename=""
transform_arg=""
instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=""
chgrpcmd=""
stripcmd=""
rmcmd="$rmprog -f"
mvcmd="$mvprog"
src=""
dst=""
dir_arg=""
while [ x"$1" != x ]; do
case $1 in
-c) instcmd="$cpprog"
shift
continue;;
-d) dir_arg=true
shift
continue;;
-m) chmodcmd="$chmodprog $2"
shift
shift
continue;;
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
-s) stripcmd="$stripprog"
shift
continue;;
-t=*) transformarg=`echo $1 | sed 's/-t=//'`
shift
continue;;
-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
shift
continue;;
*) if [ x"$src" = x ]
then
src=$1
else
# this colon is to work around a 386BSD /bin/sh bug
:
dst=$1
fi
shift
continue;;
esac
done
if [ x"$src" = x ]
then
echo "install: no input file specified"
exit 1
else
true
fi
if [ x"$dir_arg" != x ]; then
dst=$src
src=""
if [ -d $dst ]; then
instcmd=:
else
instcmd=mkdir
fi
else
# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if [ -f $src -o -d $src ]
then
true
else
echo "install: $src does not exist"
exit 1
fi
if [ x"$dst" = x ]
then
echo "install: no destination specified"
exit 1
else
true
fi
# If destination is a directory, append the input filename; if your system
# does not like double slashes in filenames, you may need to add some logic
if [ -d $dst ]
then
dst="$dst"/`basename $src`
else
true
fi
fi
## this sed command emulates the dirname command
dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
# Make sure that the destination directory exists.
# this part is taken from Noah Friedman's mkinstalldirs script
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
defaultIFS='
'
IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}"
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
IFS="${oIFS}"
pathcomp=''
while [ $# -ne 0 ] ; do
pathcomp="${pathcomp}${1}"
shift
if [ ! -d "${pathcomp}" ] ;
then
$mkdirprog "${pathcomp}"
else
true
fi
pathcomp="${pathcomp}/"
done
fi
if [ x"$dir_arg" != x ]
then
$doit $instcmd $dst &&
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
else
# If we're going to rename the final executable, determine the name now.
if [ x"$transformarg" = x ]
then
dstfile=`basename $dst`
else
dstfile=`basename $dst $transformbasename |
sed $transformarg`$transformbasename
fi
# don't allow the sed command to completely eliminate the filename
if [ x"$dstfile" = x ]
then
dstfile=`basename $dst`
else
true
fi
# Make a temp file name in the proper directory.
dsttmp=$dstdir/#inst.$$#
# Move or copy the file name to the temp name
$doit $instcmd $src $dsttmp &&
trap "rm -f ${dsttmp}" 0 &&
# and set any options; do chmod last to preserve setuid bits
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
# Now rename the file to the real destination.
$doit $rmcmd -f $dstdir/$dstfile &&
$doit $mvcmd $dsttmp $dstdir/$dstfile
fi &&
exit 0
-113
View File
@@ -1,113 +0,0 @@
#!/bin/sh
#
# Generate Makefile dependencies inclusion and module target file "depend.mk~"
# by scanning the directory "src" for files ending in ".c" and ".d", and for
# subdirectories not starting with "_".
#
# Modules live inside subdirectories called [^_]* - i.e. a directory "foo" will
# have a rule created which links all code inside it to "foo.o".
#
# The directory "src/include" is never scanned; neither are CVS or SVN
# directories.
#
outlist=$1
outlink=$2
FIND=find
GREP=grep
which gfind 2>/dev/null | grep /gfind >/dev/null && FIND=gfind
which ggrep 2>/dev/null | grep /ggrep >/dev/null && GREP=ggrep
echo '# Automatically generated file listings' > $outlist
echo '#' >> $outlist
echo "# Creation time: `date`" >> $outlist
echo >> $outlist
echo '# Automatically generated module linking rules' > $outlink
echo '#' >> $outlink
echo "# Creation time: `date`" >> $outlink
echo >> $outlink
echo -n "Scanning for source files: "
allsrc=`$FIND src -type f -name "*.c" -print`
allobj=`echo $allsrc | tr ' ' '\n' | sed 's/\.c$/.o/'`
alldep=`echo $allsrc | tr ' ' '\n' | sed 's/\.c$/.d/'`
echo `echo $allsrc | wc -w | tr -d ' '` found
echo -n "Scanning for modules: "
modules=`$FIND src -type d -print \
| $GREP -v '^src$' \
| $GREP -v '/_' \
| $GREP -v '^src/include' \
| $GREP -v 'CVS' \
| $GREP -v '.svn' \
| while read DIR; do \
CONTENT=\$(/bin/ls -d \$DIR/* \
| $GREP -v '.po$' \
| $GREP -v '.gmo$' \
| $GREP -v '.mo$' \
| $GREP -v '.h$' \
| sed -n '$p'); \
[ -n "\$CONTENT" ] || continue; \
echo \$DIR; \
done
`
echo up to `echo $modules | wc -w | tr -d ' '` found
echo "Writing module linking rules"
echo -n [
for i in $modules; do echo -n ' '; done
echo -n -e ']\r['
for i in $modules; do
echo -n '.'
allobj="$allobj $i.o"
deps=""
for j in $i/*.c; do
[ -f $j ] || continue
newobj=`echo $j | sed -e 's@\.c$@.o@'`
deps="$deps $newobj"
done
for j in $i/*; do
[ -d "$j" ] || continue
[ `basename $j` = "CVS" ] && continue
[ `basename $j` = ".svn" ] && continue
CONTENT=`/bin/ls -d $j/* \
| $GREP -v '.po$' \
| $GREP -v '.gmo$' \
| $GREP -v '.mo$' \
| $GREP -v '.h$' \
| sed -n '$p'`
[ -n "$CONTENT" ] || continue
deps="$deps $j.o"
done
[ -n "$deps" ] || continue
echo "$i.o: $deps" >> $outlink
echo ' $(LD) $(LDFLAGS) -o $@' "$deps" >> $outlink
echo >> $outlink
done
echo ']'
echo "Listing source, object and dependency files"
echo -n "allsrc = " >> $outlist
echo $allsrc | sed 's,src/nls/cat-id-tbl.c,,' | sed -e 's/ / \\!/g'\
| tr '!' '\n' >> $outlist
echo >> $outlist
echo -n "allobj = " >> $outlist
echo $allobj | sed -e 's/ / \\!/g' | tr '!' '\n' >> $outlist
echo >> $outlist
echo -n "alldep = " >> $outlist
echo $alldep | sed -e 's/ / \\!/g' | tr '!' '\n' >> $outlist
echo >> $outlist
echo >> $outlink
# EOF
-33
View File
@@ -1,33 +0,0 @@
#!/bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Last modified: 1994-03-25
# Public domain
errstatus=0
for file in ${1+"$@"} ; do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
for d in ${1+"$@"} ; do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
echo "mkdir $pathcomp" 1>&2
mkdir "$pathcomp" || errstatus=$?
chmod 755 $pathcomp 2>/dev/null
fi
pathcomp="$pathcomp/"
done
done
exit $errstatus
# mkinstalldirs ends here
-65
View File
@@ -1,65 +0,0 @@
#!/bin/sh
#
# Messy script to convert all of the given .po files to a single C file on
# stdout.
cat <<EOF
/*
* Translation table - automatically generated by po2table.sh.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
struct msgtable_s {
char *msgid;
char *msgstr;
};
struct msgtable_s *minigettext__gettable(char *lang)
{
if (0 == lang)
return 0;
EOF
for POFILE in $*; do
LANG=`basename "$POFILE" | sed 's/.po$//'`
echo " if (strncmp(lang, \"$LANG\", 2) == 0) {"
echo " static struct msgtable_s data[] = {";
awk 'BEGIN{i=0;s=0;}
/^msgid[ ]+/ {
if (s) print " }, ";
print " {";
print " " substr($0,7);
i=1;
s=0;
}
/^msgstr[ ]+/ {
print " ,";
i=0;s=1;
print " " substr($0,8);
}
/^[ ]*"/ {
if (i||s) print " " $0;
}
END {if (i||s) print " }\n";}
' < "$POFILE"
echo ' , { 0, 0 } };'
echo " return data;"
echo " }"
done
cat <<EOF
return 0;
}
/* EOF */
EOF
# EOF
-45
View File
@@ -1,45 +0,0 @@
#!/bin/sh
#
# Run a test. Parameters are program name and source directory; if
# additional parameters are given, they are the tests to run, otherwise all
# tests are run.
#
PROG="$1"
SRCDIR="$2"
shift
shift
TESTS="$*"
# Temporary working files
#
TMP1=`mktemp 2>/dev/null` || TMP1=.tmp1
TMP2=`mktemp 2>/dev/null` || TMP2=.tmp2
TMP3=`mktemp 2>/dev/null` || TMP3=.tmp3
TMP4=`mktemp 2>/dev/null` || TMP4=.tmp4
export PROG TMP1 TMP2 TMP3 TMP4 # variables used by test scripts
FAIL=0
test -n "$TESTS" || TESTS=`ls "$SRCDIR/tests" | sort -n`
for SCRIPT in $TESTS; do
test -f "$SCRIPT" || SCRIPT="$SRCDIR/tests/$SCRIPT"
test -f "$SCRIPT" || SCRIPT=`ls "$SRCDIR/tests/$SCRIPT"*`
test -f "$SCRIPT" || continue
echo `basename "$SCRIPT"`: " " | cut -b1-20 | sed 's/-/ - /' | tr "\n" ' '
STATUS=0
sh -e "$SCRIPT" || STATUS=1
test $STATUS -eq 1 && FAIL=1
test $STATUS -eq 1 && echo "FAILED" || echo "OK"
done
rm -f $TMP1 $TMP2 $TMP3 $TMP4
exit $FAIL
# EOF
+223
View File
@@ -0,0 +1,223 @@
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
dnl
dnl License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
AC_INIT([pv], [1.11.0], [https://codeberg.org/ivarch/pv/issues], [pv], [https://ivarch.com/p/pv])
AC_CONFIG_SRCDIR([src/include/config.h.in])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([src/include/config.h])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AC_LANG(C)
AC_PROG_CC
AC_PROG_INSTALL
AC_USE_SYSTEM_EXTENSIONS
AC_C_CONST
AC_HEADER_STDBOOL
AC_SYS_LARGEFILE
AM_GNU_GETTEXT_VERSION([0.21])
AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
AM_GNU_GETTEXT([external])
if test "$USE_NLS" = "yes"; then
CPPFLAGS="$CPPFLAGS -DLOCALEDIR=\\\"\$(localedir)\\\""
LIBS="$LIBS $LIBINTL"
fi
dnl Items we can use if present, but can do without if not present.
AC_CHECK_FUNCS([getopt_long])
AC_CHECK_FUNCS([vsnprintf vasprintf strlcat strtoul memrchr])
AC_CHECK_FUNCS([fdatasync])
AC_CHECK_FUNCS([fpathconf sysconf posix_memalign posix_fadvise])
AC_CHECK_FUNCS([getcwd])
AC_CHECK_FUNCS([nanosleep])
AC_CHECK_FUNCS([setitimer])
AC_CHECK_FUNCS([setproctitle])
AC_CHECK_FUNCS([nftw])
AC_CHECK_FUNCS([strsignal])
AC_CHECK_HEADERS([getopt.h])
AC_CHECK_HEADERS([limits.h])
AC_CHECK_HEADERS([langinfo.h])
AC_CHECK_HEADERS([wctype.h])
AC_CHECK_HEADERS([termios.h])
AC_CHECK_HEADERS([libgen.h])
AC_CHECK_HEADERS([sys/ioctl.h])
AC_CHECK_HEADERS([libintl.h locale.h])
AC_CHECK_HEADERS([sys/sysmacros.h])
AC_CHECK_HEADERS([ftw.h])
AC_CHECK_HEADERS([poll.h sys/poll.h])
AC_CHECK_FUNCS([poll])
AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_CHECK_DECLS([SA_SIGINFO], [], [], [[#include <signal.h>]])
AC_SEARCH_LIBS([sqrtl],[m])
AC_SEARCH_LIBS([fmod],[m])
AC_SEARCH_LIBS([lroundl],[m])
AC_CHECK_HEADERS([math.h])
AC_CHECK_FUNCS([sqrtl])
AC_CHECK_FUNCS([fmod])
AC_CHECK_FUNCS([lroundl])
dnl Libraries that may contain key functions.
AC_SEARCH_LIBS([clock_gettime],[rt])
dnl Items we can't do without.
AC_CHECK_FUNCS([alarm basename clock_gettime dup2 memcpy memmove memset mkdir select setlocale strchr strerror strrchr strstr], [], [AC_MSG_ERROR([required function is missing])])
AC_CHECK_HEADERS([fcntl.h sys/file.h sys/time.h unistd.h], [], [AC_MSG_ERROR([required header file is missing])])
dnl Make sure all the types we use are defined.
AC_TYPE_INT32_T
AC_TYPE_MODE_T
AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T
AC_TYPE_UID_T
AC_CHECK_MEMBERS([struct stat.st_rdev])
dnl Check whether a signal handler can see the PID of the sender.
AC_MSG_CHECKING([siginfo_t provides a signal sender's PID])
AC_RUN_IFELSE(
[AC_LANG_PROGRAM([[
#include <string.h>
#include <signal.h>
#include <unistd.h>
static pid_t signalSender = 0;
#ifdef SA_SIGINFO
static void receiveUSR2( __attribute__((unused))
int sig, siginfo_t * info, __attribute__((unused))
void *ucontext)
{
if (NULL != info)
signalSender = info->si_pid;
}
#endif
]], [[
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
#ifdef SA_SIGINFO
sa.sa_sigaction = receiveUSR2;
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = SA_SIGINFO;
(void) sigaction(SIGUSR2, &sa, NULL);
raise(SIGUSR2);
#endif
return signalSender < 1 ? 1 : 0;
]])], [
AC_MSG_RESULT([yes])
AC_DEFINE([SIGINFO_PROVIDES_PID], [1], [Signal handlers can determine the sending PID])
], [
AC_MSG_RESULT([no])
], [
AC_MSG_RESULT([cannot check, assuming yes])
AC_DEFINE([SIGINFO_PROVIDES_PID], [1], [Signal handlers can determine the sending PID])
]
)
AH_BOTTOM([#include "config-aux.h"])
AC_ARG_ENABLE([debugging],
[AS_HELP_STRING([--enable-debugging], [compile with debugging support])],
if test "$enable_debugging" = "yes"; then
CFLAGS="$CFLAGS -g -Wall"
AC_DEFINE([ENABLE_DEBUGGING], [1], [Debugging support enabled])
fi
)
AC_ARG_ENABLE([profiling],
[AS_HELP_STRING([--enable-profiling], [compile with profiling support])],
if test "$enable_profiling" = "yes"; then
CFLAGS="-pg $CFLAGS"
fi
)
SPLICE_SUPPORT="no"
AC_ARG_ENABLE([splice],
[AS_HELP_STRING([--disable-splice], [do not use splice system call])],
if test "$enable_splice" = "yes"; then
SPLICE_SUPPORT="yes"
fi,
SPLICE_SUPPORT="yes"
)
COPY_FILE_RANGE_SUPPORT="no"
AC_ARG_ENABLE([copy-file-range],
[AS_HELP_STRING([--disable-copy-file-range], [do not use copy_file_range system call])],
if test "$enable_copy_file_range" = "yes"; then
COPY_FILE_RANGE_SUPPORT="yes"
fi,
COPY_FILE_RANGE_SUPPORT="yes"
)
IPC_SUPPORT="no"
AC_ARG_ENABLE([ipc],
[AS_HELP_STRING([--disable-ipc], [turn off IPC messaging])],
if test "$enable_ipc" = "yes"; then
IPC_SUPPORT="yes"
fi,
IPC_SUPPORT="yes"
)
AC_ARG_WITH([ncurses],
[AS_HELP_STRING([--without-ncurses], [disable the use of ncurses for terminal info])],
[],
[with_curses=yes])
AS_IF([test "x$with_ncurses" != xno],
[
AC_SEARCH_LIBS([tigetnum],[tinfo ncurses], [
AC_CHECK_HEADERS([term.h],[
AC_DEFINE([ENABLE_NCURSES], [1], [Build with ncurses support])
])
], [])
],
[])
AC_ARG_ENABLE([static],
[AS_HELP_STRING([--enable-static], [enable static linking])],
[
if test "$enable_static" = "yes"; then
CFLAGS="$CFLAGS -static"
fi
])
dnl AIX needs -lc128
AC_EGREP_CPP([^yes$], [#ifdef _AIX
yes
#endif
], [LIBS="$LIBS -lc128"])
if test "$IPC_SUPPORT" = "yes"; then
AC_CHECK_HEADERS([sys/ipc.h], [], [IPC_SUPPORT=no])
AC_CHECK_HEADERS([sys/shm.h], [], [IPC_SUPPORT=no])
AC_CHECK_HEADERS([sys/param.h])
if test "$IPC_SUPPORT" = "yes"; then
AC_CHECK_FUNCS([shmget], [], [IPC_SUPPORT=no])
fi
fi
if test "$IPC_SUPPORT" = "yes"; then
AC_DEFINE([HAVE_IPC], [1], [IPC support enabled])
fi
if test "$SPLICE_SUPPORT" = "yes"; then
AC_CHECK_FUNCS([splice])
fi
if test "$COPY_FILE_RANGE_SUPPORT" = "yes"; then
AC_CHECK_FUNCS([copy_file_range])
fi
CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/src/include"
dnl This must go after all the compiler based tests above.
AC_LANG_WERROR
AC_CONFIG_FILES([
po/Makefile.in
Makefile
])
AC_OUTPUT
-86
View File
@@ -1,86 +0,0 @@
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
---
-171
View File
@@ -1,171 +0,0 @@
This package is free software, and is being distributed under the terms
of the Artistic License 2.0.
----------------------------------------------------------
Artistic License 2.0
Copyright (c) 2000-2006, The Perl Foundation.
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed. Preamble
This license establishes the terms under which a given free software
Package may be copied, modified, distributed, and/or redistributed. The
intent is that the Copyright Holder maintains some artistic control
over the development of that Package while still keeping the Package
available as open source and free software.
You are always permitted to make arrangements wholly outside of this
license directly with the Copyright Holder of a given Package. If the
terms of this license do not permit the full use that you propose to
make of the Package, you should contact the Copyright Holder and seek
a different licensing arrangement. Definitions
"Copyright Holder" means the individual(s) or organization(s) named in
the copyright notice for the entire Package.
"Contributor" means any party that has contributed code or other material
to the Package, in accordance with the Copyright Holder's procedures.
"You" and "your" means any person who would like to copy, distribute,
or modify the Package.
"Package" means the collection of files distributed by the Copyright
Holder, and derivatives of that collection and/or of those files. A given
Package may consist of either the Standard Version, or a Modified Version.
"Distribute" means providing a copy of the Package or making it accessible
to anyone else, or in the case of a company or organization, to others
outside of your company or organization.
"Distributor Fee" means any fee that you charge for Distributing this
Package or providing support for this Package to another party. It does
not mean licensing fees.
"Standard Version" refers to the Package if it has not been modified,
or has been modified only in ways explicitly requested by the Copyright
Holder.
"Modified Version" means the Package, if it has been changed, and such
changes were not explicitly requested by the Copyright Holder.
"Original License" means this Artistic License as Distributed with the
Standard Version of the Package, in its current version or as it may be
modified by The Perl Foundation in the future.
"Source" form means the source code, documentation source, and
configuration files for the Package.
"Compiled" form means the compiled bytecode, object code, binary, or any
other form resulting from mechanical transformation or translation of
the Source form. Permission for Use and Modification Without Distribution
(1) You are permitted to use the Standard Version and create and use
Modified Versions for any purpose without restriction, provided that you
do not Distribute the Modified Version. Permissions for Redistribution
of the Standard Version
(2) You may Distribute verbatim copies of the Source form of the Standard
Version of this Package in any medium without restriction, either gratis
or for a Distributor Fee, provided that you duplicate all of the original
copyright notices and associated disclaimers. At your discretion, such
verbatim copies may or may not include a Compiled form of the Package.
(3) You may apply any bug fixes, portability changes, and other
modifications made available from the Copyright Holder. The resulting
Package will still be considered the Standard Version, and as such will
be subject to the Original License. Distribution of Modified Versions
of the Package as Source
(4) You may Distribute your Modified Version as Source (either gratis
or for a Distributor Fee, and with or without a Compiled form of the
Modified Version) provided that you clearly document how it differs
from the Standard Version, including, but not limited to, documenting
any non-standard features, executables, or modules, and provided that
you do at least ONE of the following:
(a) make the Modified Version available to the Copyright Holder of the
Standard Version, under the Original License, so that the Copyright Holder
may include your modifications in the Standard Version.
(b) ensure that installation of your Modified Version does not prevent the
user installing or running the Standard Version. In addition, the Modified
Version must bear a name that is different from the name of the Standard
Version.
(c) allow anyone who receives a copy of the Modified Version to make
the Source form of the Modified Version available to others under
(i) the Original License or
(ii) a license that permits the licensee to freely copy, modify and
redistribute the Modified Version using the same licensing terms that apply
to the copy that the licensee received, and requires that the Source form of
the Modified Version, and of any works derived from it, be made freely
available in that license fees are prohibited but Distributor Fees are
allowed. Distribution of Compiled Forms of the Standard Version or Modified
Versions without the Source
(5) You may Distribute Compiled forms of the Standard Version without
the Source, provided that you include complete instructions on how to
get the Source of the Standard Version. Such instructions must be valid
at the time of your distribution. If these instructions, at any time
while you are carrying out such distribution, become invalid, you must
provide new instructions on demand or cease further distribution. If
you provide valid instructions or cease distribution within thirty days
after you become aware that the instructions are invalid, then you do
not forfeit any of your rights under this license.
(6) You may Distribute a Modified Version in Compiled form without the
Source, provided that you comply with Section 4 with respect to the
Source of the Modified Version. Aggregating or Linking the Package
(7) You may aggregate the Package (either the Standard Version or
Modified Version) with other packages and Distribute the resulting
aggregation provided that you do not charge a licensing fee for the
Package. Distributor Fees are permitted, and licensing fees for other
components in the aggregation are permitted. The terms of this license
apply to the use and Distribution of the Standard or Modified Versions
as included in the aggregation.
(8) You are permitted to link Modified and Standard Versions with other
works, to embed the Package in a larger work of your own, or to build
stand-alone binary or bytecode versions of applications that include the
Package, and Distribute the result without restriction, provided the
result does not expose a direct interface to the Package. Items That
are Not Considered Part of a Modified Version
(9) Works (including, but not limited to, modules and scripts) that
merely extend or make use of the Package, do not, by themselves, cause
the Package to be a Modified Version. In addition, such works are not
considered parts of the Package itself, and are not subject to the terms
of this license. General Provisions
(10) Any use, modification, and distribution of the Standard or Modified
Versions is governed by this Artistic License. By using, modifying or
distributing the Package, you accept this license. Do not use, modify,
or distribute the Package, if you do not accept this license.
(11) If your Modified Version has been derived from a Modified Version
made by someone other than you, you are nevertheless required to ensure
that your Modified Version complies with the requirements of this license.
(12) This license does not grant you the right to use any trademark,
service mark, tradename, or logo of the Copyright Holder.
(13) This license includes the non-exclusive, worldwide, free-of-charge
patent license to make, have made, use, offer to sell, sell, import
and otherwise transfer the Package with respect to any patent claims
licensable by the Copyright Holder that are necessarily infringed by the
Package. If you institute patent litigation (including a cross-claim or
counterclaim) against any party alleging that the Package constitutes
direct or contributory patent infringement, then this Artistic License
to you shall terminate on the date that such litigation is filed.
(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT
HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED
WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT
PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER
OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR
CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------
-338
View File
@@ -1,338 +0,0 @@
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
View File
@@ -1 +0,0 @@
pv
-46
View File
@@ -1,46 +0,0 @@
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
View File
@@ -1 +0,0 @@
1.7.0
-19
View File
@@ -1,19 +0,0 @@
Begin3
Title: @PACKAGE@
Version: @VERSION@
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
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.
Keywords: progress bar, console, pipe, transfer rate
Author: Andrew Wood <andrew.wood@ivarch.com>
Maintained-by: Andrew Wood <andrew.wood@ivarch.com>
Primary-site: http://www.ivarch.com/programs/@PACKAGE@.shtml
Alternate-site:
Original-site:
Platforms:
Copying-policy: Artistic 2.0
End
-655
View File
@@ -1,655 +0,0 @@
.TH @UCPACKAGE@ 1 "July 2023" Linux "User Manuals"
.SH NAME
@PACKAGE@ \- monitor the progress of data through a pipe
.SH SYNOPSIS
.B @PACKAGE@
[\fIOPTION\fR]
[\fIFILE\fR]...
.br
.B @PACKAGE@
[\fI\-h\fR|\fI\-V\fR]
.SH DESCRIPTION
.B @PACKAGE@
shows the progress of data through a pipeline by giving information such as
time elapsed, percentage completed (with progress bar), current throughput
rate, total data transferred, and ETA.
To use it, insert it in a pipeline between two processes, with the
appropriate options. Its standard input will be passed through to its
standard output and progress will be shown on standard error.
.B @PACKAGE@
will copy each supplied
.B FILE
in turn to standard output
.BR "" "(" -
means standard input), or if no
.BR FILE s
are specified just standard input is copied. This is the same behaviour
as
.BR cat (1).
A simple example to watch how quickly a file is transferred using
.BR nc (1):
.RS
.B @PACKAGE@ file | nc -w 1 somewhere.com 3000
.RE
A similar example, transferring a file from another process and passing the
expected size to
.BR @PACKAGE@ :
.RS
.B cat file | @PACKAGE@ -s 12345 | nc -w 1 somewhere.com 3000
.RE
A more complicated example using numeric output to feed into the
.BR dialog (1)
program for a full-screen progress display:
.RS
.B (tar cf - . \e
.br
.B " | @PACKAGE@ -n -s $(du -sb . | awk '{print $1}') \e"
.br
.B " | gzip -9 > out.tgz) 2>&1 \e"
.br
.B | dialog --gauge 'Progress' 7 70
.RE
Taking an image of a disk, skipping errors:
.RS
.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/your/disk/device
.RE
Zeroing a disk:
.RS
.B @PACKAGE@ < /dev/zero > /dev/your/disk/device
.RE
Note that if the input size cannot be calculated, and the output is a block
device, then the size of the block device will be used and
.B @PACKAGE@
will automatically stop at that size as if
.B \-S
had been given.
(Linux only): Watching file descriptor 3 opened by another process 1234:
.RS
.B @PACKAGE@ -d 1234:3
.RE
(Linux only): Watching all file descriptors used by process 1234:
.RS
.B @PACKAGE@ -d 1234
.RE
.SH OPTIONS
.B @PACKAGE@
takes many options, which are divided into display switches, output
modifiers, and general options.
.SH DISPLAY SWITCHES
If no display switches are specified,
.B @PACKAGE@
behaves as if
.BR \-p ", " \-t ", " \-e ", " \-r ", and " \-b
had been given (i.e. everything except average rate is switched on).
Otherwise, only those display types that are explicitly switched on will be
shown.
.TP
.B \-p, \-\-progress
Turn the progress bar on. If standard input is not a file and no
size was given (with the
.B \-s
modifier), the progress bar cannot indicate how close to completion the
transfer is, so it will just move left and right to indicate that data is
moving.
.TP
.B \-t, \-\-timer
Turn the timer on. This will display the total elapsed time that
.B @PACKAGE@
has been running for.
.TP
.B \-e, \-\-eta
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.
.TP
.B \-I, \-\-fineta
Turn the ETA timer on, but display the estimated local time of arrival
instead of time left. When the estimated time is more than 6 hours in the
future, the date is shown as well.
.TP
.B \-r, \-\-rate
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 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. Implies
.BR \-C .
.TP
.B \-A, \-\-last\-written NUM
Show the last
.B NUM
bytes written - but see the caveat under
.B %nA
in the
.B FORMATTING
section below. Implies
.BR \-C .
.TP
.B \-F, \-\-format FORMAT
Ignore the options
.BR \-p ,
.BR \-t ,
.BR \-e ,
.BR \-r ,
.BR \-a ,
.BR \-b ,
.BR \-T ,
and
.BR \-A ,
and instead use the format string
.B FORMAT
to determine the output format. See the
.B FORMATTING
section below.
.TP
.B \-n, \-\-numeric
Numeric output. Instead of giving a visual indication of progress,
.B @PACKAGE@
will give an integer percentage, one per line, on standard error, suitable
for piping (via convoluted redirection) into
.BR dialog (1).
Note that
.B \-f
is not required if
.B \-n
is being used.
.TP
.B ""
Note that if
.B \-\-numeric
is in use, then adding
.B \-\-bytes
will cause the number of bytes processed so far to be output instead of a
percentage; if
.B \-\-line\-mode
is also in use, then instead of bytes or a percentage, the number of lines
so far is output. And finally, if
.B \-\-timer
is also in use, then each output line is prefixed with the elapsed time
so far, as a decimal number of seconds.
.TP
.B \-q, \-\-quiet
No output. Useful if the
.B \-L
option is being used on its own to just limit the transfer rate of a pipe.
.SH OUTPUT MODIFIERS
.TP
.B \-W, \-\-wait
Wait until the first byte has been transferred before showing any progress
information or calculating any ETAs. Useful if the program you are piping to
or from requires extra information before it starts, eg piping data into
.BR gpg (1)
or
.BR mcrypt (1)
which require a passphrase before data can be processed.
.TP
.B \-D, \-\-delay-start SEC
Wait until
.B SEC
seconds have passed before showing any progress information, for example in
a script where you only want to show a progress bar if it starts taking a
long time. Note that this can be a decimal such as 0.5.
.TP
.B \-s SIZE, \-\-size SIZE
Assume the total amount of data to be transferred is
.B SIZE
bytes when calculating percentages and ETAs. The same suffixes of "k", "m"
etc can be used as with
.BR -L .
.TP
.B ""
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" .
.TP
.B \-l, \-\-line\-mode
Instead of counting bytes, count lines (newline characters). The progress
bar will only move when a new line is found, and the value passed to the
.B \-s
option will be interpreted as a line count. Note that file sizes are not
automatically calculated when this option is used, to avoid having to read
all files twice.
.TP
.B \-0, \-\-null
Count lines as null terminated. This option implies \-\-line\-mode.
.TP
.B \-i SEC, \-\-interval SEC
Wait
.B SEC
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
characters wide, instead of trying to work it out (or assuming 80 if it
cannot be guessed).
.TP
.B \-H HEIGHT, \-\-height HEIGHT
Assume the terminal is
.B HEIGHT
rows high, instead of trying to work it out (or assuming 25 if it
cannot be guessed).
.TP
.B \-N NAME, \-\-name NAME
Prefix the output information with
.BR NAME .
Useful in conjunction with
.B \-c
if you have a complicated pipeline and you want to be able to tell different
parts of it apart.
.TP
.B \-f, \-\-force
Force output. Normally,
.B @PACKAGE@
will not output any visual display if standard error is not a terminal.
This option forces it to do so.
.TP
.B \-c, \-\-cursor
Use cursor positioning escape sequences instead of just using carriage
returns. This is useful in conjunction with
.B \-N
(name) if you are using multiple
.B @PACKAGE@
invocations in a single, long, pipeline.
.SH DATA TRANSFER MODIFIERS
.TP
.B \-L RATE, \-\-rate-limit RATE
Limit the transfer to a maximum of
.B RATE
bytes per second. A suffix of "K", "M", "G", or "T" can be added to denote
kibibytes (*1024), mebibytes, and so on.
.TP
.B \-B BYTES, \-\-buffer-size BYTES
Use a transfer buffer size of
.B BYTES
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. 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
.BR splice (2),
even if it would normally be possible. The
.BR splice (2)
system call is a more efficient way of transferring data from or to a pipe
than regular
.BR read (2)
and
.BR write (2),
but means that the transfer buffer may not be used. This prevents
.B \-A
and
.B \-T
from working, and makes
.B \-B
redundant, so using
.BR \-A ,
.BR \-T ,
or
.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).
.TP
.B \-E, \-\-skip-errors
Ignore read errors by attempting to skip past the offending sections. The
corresponding parts of the output will be null bytes. At first only a few
bytes will be skipped, but if there are many errors in a row then the skips
will move up to chunks of 512. This is intended to be similar to
.B dd conv=sync,noerror
but has not been as thoroughly tested.
.TP
.B ""
Specify
.B \-E
twice to only report a read error once per file, instead of reporting each
byte range skipped.
.TP
.B \-S, \-\-stop-at-size
If a size was specified with
.BR \-s ,
stop transferring data once that many bytes have been written, instead of
continuing to the end of input.
.TP
.B \-d PID[:FD], \-\-watchfd PID[:FD]
Instead of transferring data, watch file descriptor
.B FD
of process
.BR PID ,
and show its progress. The
.B @PACKAGE@
process will exit when
.B FD
either changes to a different file, changes read/write mode, or is closed;
other data transfer modifiers - and remote control - may not be used with
this option.
.TP
.B ""
If only a
.B PID
is specified, then that process will be watched, and all regular files and
block devices it opens will be shown with a progress bar. The
.B @PACKAGE@
process will exit when process
.B PID
exits.
.TP
.B \-R PID, \-\-remote PID
If
.B PID
is an instance of
.B @PACKAGE@
that is already running,
.B \-R PID
will cause that instance to act as though it had been given
this instance's command line instead. For example, if
.B @PACKAGE@ -L 123K
is running with process ID 9876, then running
.B @PACKAGE@ -R 9876 -L 321K
will cause it to start using a rate limit of 321KiB instead of 123KiB.
Note that some options cannot be changed while running, such as
.BR \-c ,
.BR \-l ,
.BR \-f ,
.BR \-D ,
.BR \-E ,
and
.BR \-S .
.SH GENERAL OPTIONS
.TP
.B \-P FILE, \-\-pidfile FILE
Save the process ID of
.B @PACKAGE@
in
.BR FILE .
The file will be truncated if it already exists, and will be removed when
.B @PACKAGE@
exits. While
.B @PACKAGE@
is running, it will contain a single number - the process ID of
.B @PACKAGE@
- followed by a newline.
.TP
.B \-h, \-\-help
Print a usage message on standard output and exit successfully.
.TP
.B \-V, \-\-version
Print version information on standard output and exit successfully.
.SH FORMATTING
If the
.B \-F
option is given, then the output format is determined by the given format
string. Within that string, the following sequences can be used:
.TP
.B %p
Progress bar.
Expands to fill the remaining space. Should only be specified once.
Equivalent to
.BR \-p .
.TP
.B %t
Elapsed time. Equivalent to
.BR \-t .
.TP
.B %e
ETA as time remaining. Equivalent to
.BR \-e .
.TP
.B %I
ETA as local time of completion. Equivalent to
.BR \-I .
.TP
.B %r
Current data transfer rate. Equivalent to
.BR \-r .
.TP
.B %a
Average data transfer rate. Equivalent to
.BR \-a .
.TP
.B %b
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
.BR \-T .
Shows "{----}" if the transfer is being done with
.BR splice (2),
since splicing to or from pipes does not use the buffer.
.TP
.B %nA
Show the last
.B n
bytes written (e.g.
.B %16A
for the last 16 bytes).
Shows only dots if the transfer is being done with
.BR splice (2),
since splicing to or from pipes does not use the buffer.
.TP
.B %N
Name prefix given by
.BR -N .
Padded to 9 characters with spaces, and suffixed with :.
.TP
.B %%
A single %.
.P
The format string equivalent of turning on all display switches is
.BR "\`%N %b %T %t %r %a %p %e'" .
.SH COMMON SWITCHES
Some suggested common switch combinations:
.TP
.B @PACKAGE@ -ptebar
Show a progress bar, elapsed time, estimated completion time, byte counter,
average rate, and current rate.
.TP
.B @PACKAGE@ -betlap
Show a progress bar, elapsed time, estimated completion time, line counter,
and average rate, counting lines instead of bytes.
.TP
.B @PACKAGE@ -t
Show only the elapsed time - useful as a simple timer, e.g.
.BR "sleep 10m | pv -t" .
.TP
.B @PACKAGE@ -pterb
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
.B \-R
or
.B \-P
options.
Any other exit status is a bitmask of the following:
.TP
.B 2
One or more files could not be accessed,
.BR stat (2)ed,
or opened.
.TP
.B 4
An input file was the same as the output file.
.TP
.B 8
Internal error with closing a file or moving to the next file.
.TP
.B 16
There was an error while transferring data from one or more input files.
.TP
.B 32
A signal was caught that caused an early exit.
.TP
.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's ACKNOWLEDGEMENTS file for a complete list of
contributors.
.SH KNOWN PROBLEMS
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
.B cygserver
running, if started near the bottom of the screen (IPC is needed to handle
the terminal scrolling). To fix this, start
.B cygserver
before using
.BR "@PACKAGE@ -c" .
.P
.TP
.B *
The
.B -R
option is not available on Cygwin without
.B cygserver
running (SYSV IPC is needed). To fix this, start
.B cygserver
before running the instance of
.B @PACKAGE@
you want, at runtime, to change the parameters of.
.P
If you find any other problems, please report them.
.SH REPORTING BUGS
Report bugs in
.B @PACKAGE@
to pv@ivarch.com or use the contact form linked from the
.B @PACKAGE@
home page: <http://www.ivarch.com/programs/pv.shtml>
.SH "SEE ALSO"
.BR cat (1),
.BR dialog (1),
.BR splice (2)
.SH LICENSE
This is free software, distributed under the ARTISTIC 2.0 license.
-19
View File
@@ -1,19 +0,0 @@
Before releasing a new version, go through this checklist:
- check for patches from https://tracker.debian.org/pkg/pv
- bump doc/VERSION
- bump doc/lsm.in
- check doc/NEWS.md is up to date
- check manual is up to date
- make indent; make indent indentclean
- make update-po
- make test
- 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 (sig as both .asc and .txt)
- submit new release to Sourceforge
- upload HTML
- check validator results for project page and manual
+147
View File
@@ -0,0 +1,147 @@
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**, and suggested **--discard**; suggested making **--fineta** have a "FIN" prefix
* 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
* [Andrew Schulman](https://github.com/andrew-schulman) - provided reproducible example of terminal size detection issue in 1.7.17/1.7.18
* [fuschia74](https://github.com/fuchsia74) - provided **--enable-static** patch for "`configure`"
* [Wilhelm von Thiele](https://github.com/TurtleWilly) - assisted with OS X cleanups ([#73](https://codeberg.org/ivarch/pv/issues/73), [#74](https://codeberg.org/ivarch/pv/issues/74))
* Matějů Miroslav, Ing. - suggested fix for ETA and elapsed time faults when suspending and resuming a machine ([#13](https://codeberg.org/ivarch/pv/issues/13))
* Anthony DeRobertis - suggested the **--error-skip-block** option ([#37](https://codeberg.org/ivarch/pv/issues/37))
* Benoit Pierre - provided patches for compilation without IPC support, without HAVE_STRUCT_STAT_ST_BLKSIZE, and on MacOS
* [gustav-b](https://codeberg.org/gustav-b) - suggested percentage formatting correction ([#80](https://codeberg.org/ivarch/pv/issues/80))
* [Thomas Bertels](https://codeberg.org/tbertels) - updated French translations ([#83](https://codeberg.org/ivarch/pv/pulls/83))
* [kevinruddy](https://codeberg.org/kevinruddy) - added decimal units option ([#85](https://codeberg.org/ivarch/pv/pulls/85))
* [xmort](https://codeberg.org/xmort) - added **--output** option ([#90](https://codeberg.org/ivarch/pv/pulls/90))
* [bogiord](https://codeberg.org/bogiord) - reported the loss of output block device size detection in 1.8.10, and suggested the fix ([#91](https://codeberg.org/ivarch/pv/issues/91))
* [eborisch](https://codeberg.org/eborisch) - provided fix for misbehaviour when used with "`zfs send`" due to treating zero sized writes (generally due to timer interruption) as end of file ([#92](https://codeberg.org/ivarch/pv/pulls/92), [#93](https://codeberg.org/ivarch/pv/pulls/93))
* [alexanderperlis](https://codeberg.org/alexanderperlis) - provided initial support for block devices with **--size `@`FILE** ([#94](https://codeberg.org/ivarch/pv/pulls/94))
* [jettero](https://codeberg.org/jettero) - reported double-free coredump when using **--watchfd** after 1.8.10 ([#96](https://codeberg.org/ivarch/pv/issues/96))
* Venky.N.Iyer - suggested **--stats** ([#49](https://codeberg.org/ivarch/pv/issues/49))
* Roland Kletzing - suggested **--rate** with **--numeric** ([#17](https://codeberg.org/ivarch/pv/issues/17))
* [Michael Mior](https://codeberg.org/michaelmior) - suggested **--store-and-forward** ([#100](https://codeberg.org/ivarch/pv/issues/100))
* [dbungert](https://codeberg.org/dbungert) - reported issue with *valgrind* 3.23 misreporting leaking file descriptors ([#97](https://codeberg.org/ivarch/pv/issues/97))
* Joachim Haga - suggested showing progress in the window title ([#3](https://codeberg.org/ivarch/pv/issues/3))
* [Martin Sarsale](https://github.com/runa) - suggested showing progress in the process title ([#4](https://codeberg.org/ivarch/pv/issues/4))
* [2bits](https://github.com/2bits) - reported position sensing fault with **--watchfd** in 1.9.0 ([#118](https://codeberg.org/ivarch/pv/issues/118))
* [heitbaum](https://codeberg.org/heitbaum) - assisted with cross-compilation fault introduced in 1.9.7 ([#120](https://codeberg.org/ivarch/pv/issues/120))
* [meego](https://codeberg.org/meego) - suggested "**%nL**", the last line preview ([#121](https://codeberg.org/ivarch/pv/issues/121))
* [Alexander Petrossian](https://github.com/neopaf) - suggested using Unicode output for a more granular progress bar, and provided the codepoints to use ([#15](https://codeberg.org/ivarch/pv/issues/15))
* [jmealo](https://codeberg.org/jmealo) - suggested JSON progress output ([#127](https://codeberg.org/ivarch/pv/issues/127))
* [ipaqmaster](https://codeberg.org/ipaqmaster) - investigated 100%-CPU utilisation bug when piping to a command that has exited ([#164](https://codeberg.org/ivarch/pv/issues/164))
* Andriy Galetski, and also [thinrope](https://codeberg.org/thinrope) - suggested the "**--sparse**" option ([#45](https://codeberg.org/ivarch/pv/issues/45))
* [KimHansen](https://codeberg.org/KimHansen) - suggested that "**--watchfd**" should keep its display when the process ends ([#81](https://codeberg.org/ivarch/pv/issues/81))
* [njt](https://codeberg.org/njt) - suggested that "**--size** @*PATH*" should accept directories ([#179](https://codeberg.org/ivarch/pv/issues/179))
* [mojohakase](https://codeberg.org/mojohakase) - provided fix for multiplication bug when combining "**--bits**" with "**--gauge**" ([#182](https://codeberg.org/ivarch/pv/issues/182))
* [traq6046](https://codeberg.org/traq6046) - highlighted autoreconf issues with the repository ([#185](https://codeberg.org/ivarch/pv/issues/185))
* [heitbaum](https://codeberg.org/heitbaum) - fixed GCC warning when using glibc 2.43 ([#180](https://codeberg.org/ivarch/pv/pulls/180))
* [haarp](https://codeberg.org/haarp) - reported that control-C writes "^C" over the progress, and suggested a fix ([#187](https://codeberg.org/ivarch/pv/issues/187))
* [Wolfgang Hoschek](https://codeberg.org/whoschek) - provided a fix for the endless wait if the output receiver exits before emptying the pipe ([#189](https://codeberg.org/ivarch/pv/issues/189))
* [oech3](https://codeberg.org/oech3) - suggested and tested performance improvements using `splice()` in more situations on Linux ([#188](https://codeberg.org/ivarch/pv/issues/188), [#191](https://codeberg.org/ivarch/pv/issues/191), [#192](https://codeberg.org/ivarch/pv/issues/192))
* [Barak A. Pearlmutter](https://codeberg.org/barak) - suggested that "**--rate-limit**" should accept non-integer values ([#193](https://codeberg.org/ivarch/pv/issues/193))
Translations provided through [Codeberg Weblate](https://translate.codeberg.org/projects/pv/):
* **Czech**
* [mmatous](https://translate.codeberg.org/user/mmatous/) (135)
* **Finnish**
* [artnay](https://translate.codeberg.org/user/artnay/) (65)
* [Ricky-Tigg](https://translate.codeberg.org/user/Ricky-Tigg/) (66)
* **French**
* anonymous suggestions (7)
* [milimarg](https://codeberg.org/milimarg) (13)
* [Maxi_Mega](https://translate.codeberg.org/user/Maxi_Mega/) (11)
* **German**
* [Hartmut Goebel](https://translate.codeberg.org/user/htgoebel/) (77)
* [m0yellow](https://translate.codeberg.org/user/m0yellow/) (9)
* [Benny](https://translate.codeberg.org/user/Benny/) (7)
* [kre](https://translate.codeberg.org/user/kre/) (2)
* [fnetX](https://translate.codeberg.org/user/fnetX/) (1)
* **Polish**
* [coralpink](https://translate.codeberg.org/user/coralpink/) (122)
* **Russian**
* [0ko](https://translate.codeberg.org/user/0ko/) (157)
* **Turkish**
* [omerdduran](https://translate.codeberg.org/user/omerdduran/) (129)
* [Oğuz Ersen](https://codeberg.org/ersen) (8)
---
+674
View File
@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
+219
View File
@@ -0,0 +1,219 @@
# Notes for developers and translators
The following _configure_ options will be of interest to developers and
translators:
* **--enable-debugging** - build in debugging support
* **--enable-profiling** - build in support for profiling
These targets are available when running _make_:
* "`make analyse`" - run _splint_ and _flawfinder_ on all C source files
## Debugging and profiling support
When "`./configure --enable-debugging`" is used, the _pv_ produced by _make_
will support an extra option, "**--debug FILE**", which will cause debugging
output to be written to *FILE*. This is not recommended for production
builds due to the extra processing it introduces, and the potential size of
the output.
Within the code, "**debug()**" is used in a similar way to "**printf()**".
It will automatically include the calling function, source file, and line
number, so they don't need to be included in the parameters. When debugging
support is not enabled, it evaluates to a null statement.
This does mean that if you call "**debug()**", make sure it has no side
effects, as they won't be present in builds without debugging support.
Builds produced after "`./configure --enable-profiling`" will write profile
data when run, to be used with _gprof_. See "`man gprof`" for details.
Please note that the memory safety checks will fail with profiling enabled.
## Source code analysis
Running "`make analyse`" runs _splint_ and _flawfinder_ on all C sources,
writing the output of both programs to files named _"*.e"_ for each _"*.c"_.
There are no dependency rules set up for these _".e"_ files, so if a header
file is altered, manually remove the relevant _".e"_ files, or update the
timestamp of the relevant _".c"_ files, before running "`make analyse`"
again.
The goal is for all C source files to generate zero warnings from either
tool.
Wherever warnings are disabled by annotations to the source, there should be
associated commentary nearby explaining the rationale behind it, and any
assumptions made. This is so that there can be some assurance that the
issue highlighted by the analyser has been considered properly, as well as
documenting anything that might need further work if the surrounding code is
altered in future.
## Translation notes
Translators can use the Weblate instance hosted by Codeberg:
[https://translate.codeberg.org/projects/pv/](https://translate.codeberg.org/projects/pv/)
If you don't see your language listed, raise an issue on the issue tracker
(or just email the maintainer) asking for it to be added.
Alternatively, read on for details of how to maintain the translations
directly within the source tree.
The message catalogues used to translate program messages into other
languages are in the _"po/"_ directory, named _"xx.po"_, where _"xx"_
is the ISO 639-1 2-letter language code, such as "**fr**" for French.
Each of these files contains lines like this:
#: src/pv/cursor.c:85
msgid "failed to get terminal name"
msgstr "erro ao ler o nome do terminal"
The comment line, starting _"#"_, shows the source filename and line number
at which this message can be found. The _"msgid"_ is the original message
in the program, in English. The _"msgstr"_ is the translated text.
It is the _"msgstr"_ lines which need to be updated by translators.
Message catalogue files should all be encoded as UTF-8.
After making a change to a _".po"_ file, test it by compiling it and
installing to a temporary location, like this:
./configure --enable-debugging --prefix=/tmp/yourtest
make clean
make install
localedef -f UTF-8 -i de_DE /tmp/yourtest/share/locale/de_DE.UTF-8
bash
export LOCPATH=/tmp/yourtest/share/locale
export LC_ALL=de_DE.UTF-8
export LANGUAGE=de_DE
/tmp/yourtest/bin/pv --help
exit
Replace "**--help**" with whatever is appropriate for your test. In this
example, the language being tested is _"de"_ (German), on a system which is
running with UTF-8 support.
In the example above, a new shell is started by typing "`bash`" so that
after your tests, "`exit`" will return you to your previous shell with your
language settings intact.
Note that at the start, you have to re-run _configure_ with "**--prefix**"
rather than using "`make DESTDIR=...`", because the locale directory is set
at compile time. Also, on Debian at least, both the environment variables
_"LC_ALL"_ and _"LANGUAGE"_ must be set.
To find untranslated strings in a language that's already supported but
which you can help with gaps in, use this command:
msgattrib --untranslated < po/fr.po
replacing _"po/fr.po"_ as appropriate.
To add a new language, create the new message catalogue file under _"po/"_
by copying _"po/pv.pot"_ to _"po/xx.po"_, where _"xx"_ is the language code,
and adjusting it. The _".pot"_ file is generated automatically by _make_.
Next, add the language code to _"po/LINGUAS"_ - this is a list of the
2-letter codes of the supported languages.
Finally, run "`./config.status`" and "`make -C po update-po`".
When the source code is updated, running "`make -C po update-po`" will
update the _"pv.pot"_ file so that it lists where all the messages are in
the source. It will also use _msgmerge_ to update all of the _".po"_ files
from the updated _"pv.pot"_ file. After doing this, look for missing
translations (empty _"msgstr"_ lines) or translations marked as "fuzzy", as
these will need to be corrected by translators.
## Benchmarking
The "`docs/benchmark-pv-transfers.sh`" script, introduced in
[#198](https://codeberg.org/ivarch/pv/issues/198), is used to check that new
changes to **pv** aren't making it less efficient at transferring data. Run
it with the **--help** option for a summary of its options.
In _benchmark_ mode, it takes multiple rounds of measurements of the
transfer rate using various different transfer options. The mean (μ) and
standard deviation (σ) of each measurement is produced at the end of the
run. All data is written to the standard output - pipe to "`tee OUTPUT`" to
write to a file _OUTPUT_ while still displaying it on the terminal.
Either a specific **pv** binary can be benchmarked (with the **-p** option),
or multiple **pv** versions can be benchmarked in a single call, each one
counting as an individual run (with the **-d** option, pointing to a
directory containing _tar.gz_ source archives).
Transfer rate measurements use up to two test files, the size of which can
be overridden by the **-s** option, and some measurements will transfer and
discard zeros from _/dev/zero_, the amount of which can be overridden with
the **-z** option.
The measured rates may vary significantly due to external factors such as
system load, so multiple measurement rounds (the **-r** option) are
recommended per run.
In _analyse_ mode, the results of multiple runs are read from standard
input, and a report is produced that shows how each measurement differs
between runs.
If the input data is from multiple versions of **pv**, the differences
between versions will be compared; otherwise, the differences between
individual runs will be compared. The **-c** option overrides this.
When re-using data from multiple runs, the **-f** option causes the report
to only show the differences between the last two runs (or versions).
The **-t** option produces a terse report that is more machine-readable.
In _measurements_ mode, a list of all of the measurement types is produced.
Each type of measurement has an associated ID - these IDs can be passed to
the benchmark mode to only run a subset of the measurements in that run.
## Release checklist
The package maintainer should run through these steps for a new release:
* Check for patches and bug reports:
* <https://codeberg.org/ivarch/pv/issues>
* <https://tracker.debian.org/pkg/pv>
* <https://launchpad.net/ubuntu/+source/pv>
* <https://archlinux.org/packages/extra/x86_64/pv/>
* <https://packages.gentoo.org/packages/sys-apps/pv>
* <https://cvsweb.openbsd.org/ports/sysutils/pv/>
* <https://packages.fedoraproject.org/pkgs/pv/pv/>
* Check for translation updates <https://translate.codeberg.org/projects/pv>
* Run "`make indent; make indent indentclean check`"
* Check that _po/POTFILES.in_ is up to date
* Run "`make -C po update-po`"
* Run "`make analyse`" and see whether remaining warnings can be addressed
* Version bump and documentation checks:
* Update the version in _configure.ac_ and _docs/NEWS.md_
* Check that _docs/NEWS.md_ is up to date
* Check that the manual _docs/pv.1_ is up to date
* Run "`make docs/pv.1.md`" and, if using VPATH, copy the result to the source directory
* Check that the year displayed by _src/main/version.c_ is correct
* Ensure everything has been committed to the repository
* Run "`autoreconf -is`" in the source directory
* Consistency and build checks:
* Wipe the build directory, and run _configure_ there
* Run "`make distcheck`"
* Run "`./configure && make check`" on all test systems including Cygwin, using the `tar.gz` that was just created
* Run a cross-compilation check
* Run "`make release MAINTAINER=<signing-user>`"
* Update the project web site:
* Copy the release _.tar.gz_, _.txt_, and _.asc_ files to the web site
* Use "`pandoc --from markdown --to html`" to convert the news and manual to HTML
* Update the news and manual on the web site
* Update the version numbers on the web site
* Update the package index on the web site
* Create a new release in the repository, and apply the associated tag
View File
+658
View File
@@ -0,0 +1,658 @@
### 1.11.0 - 11 June 2026
* *feature:* new **--monitor** option to run a command and watch its input, output, or both ([#67](https://codeberg.org/ivarch/pv/issues/67))
* *feature:* allow decimal values for **--rate-limit** ([#193](https://codeberg.org/ivarch/pv/issues/193))
* *feature:* extend the **--format** string **%T**/**%{buffer-percent}** to indicate the transfer method when the buffer isn't being used
* *performance:* insert an intermediate input pipe where it would allow `splice()` to be used in more circumstances ([#188](https://codeberg.org/ivarch/pv/issues/188))
* *performance:* use `copy_file_range`(2) when the input and output are both regular files ([#196](https://codeberg.org/ivarch/pv/issues/196))
* *performance:* improve **--discard** performance by splicing to /dev/null internally ([#191](https://codeberg.org/ivarch/pv/issues/191))
* *fix:* report signal interrupts on a new line, so that control-C doesn't write "^C" over the progress ([#187](https://codeberg.org/ivarch/pv/issues/187))
* *fix:* prevent an endless wait if there is unread data in the output pipe when its reader terminates ([#189](https://codeberg.org/ivarch/pv/issues/189))
* *fix:* prevent `splice()` from falling back to `read()` when using **--rate-limit**
* *fix:* stop spliced transfers requiring two EOFs when the input is a terminal
* *fix:* add timer interrupt to spliced transfers to avoid progress display lockup when the receiver stalls
* *fix:* exit with an error if the PID file given to **--pidfile** cannot be replaced
* *fix:* correct the **--help** word wrapping on very small terminals
* *i18n:* Polish translations updated
* *i18n:* Finnish translations updated
* *i18n:* German translations updated
* *i18n:* French translations updated
* *i18n:* partial draft of Georgian translations added
* *i18n:* removed empty unmaintained translation catalogue for Spanish
* *cleanup:* fix GCC warning when using glibc 2.43 ([#180](https://codeberg.org/ivarch/pv/pulls/180))
* *cleanup:* fix warning in pv_remote_check() stub on OpenBSD
* *cleanup:* use dynamic line buffers for **--watchfd** process lookups
* *cleanup:* replace the blanket 100,000-hour clamp on displayed times with a million days for timer and ETA, and 7,000 years for estimated finish time, on 64-bit systems
* *cleanup:* use rounding when calculating ETA, and avoid integer overflows, particularly on 32-bit systems
* *cleanup:* standardise the error reporting mechanism
* *cleanup:* improve code comments
### 1.10.5 - 22 March 2026
* *fix:* when using **--bits** with **--gauge**, don't incorrectly multiply the rate twice ([#182](https://codeberg.org/ivarch/pv/issues/182))
### 1.10.4 - 8 March 2026
* *fix:* when using **--size @PATH**, *PATH* can be a directory, and the total size of all files within it will be used ([#179](https://codeberg.org/ivarch/pv/issues/179))
### 1.10.3 - 15 December 2025
* *fix:* stop truncating the process title set by **--extra-display**
### 1.10.2 - 22 November 2025
* *i18n:* Finnish translations updated
* *cleanup:* adjust valgrind suppressions so memory safety tests work on LTO builds ([#174](https://codeberg.org/ivarch/pv/issues/174)/[Debian bug 1121157](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1121157))
### 1.10.1 - 12 November 2025
* *fix:* correct **--watchfd** memory allocation error when given multiple arguments ([#170](https://codeberg.org/ivarch/pv/issues/170))
### 1.10.0 - 7 November 2025
* *feature:* new **--query** option to show the transfer status of another running **pv** ([#101](https://codeberg.org/ivarch/pv/issues/101))
* *fix:* make the timers work consistently in **--watchfd** if paused and resumed ([#169](https://codeberg.org/ivarch/pv/issues/169))
### 1.9.44 - 18 October 2025
* *feature:* new **--sparse** option to write sparse output ([#45](https://codeberg.org/ivarch/pv/issues/45))
* *fix:* don't clear the **--watchfd** display when the watched process ends ([#81](https://codeberg.org/ivarch/pv/issues/81))
### 1.9.42 - 11 October 2025
* *feature:* permit multiple arguments to **--watchfd** ([#12](https://codeberg.org/ivarch/pv/issues/12))
* *feature:* new "**=NAME**" syntax for **--watchfd** to watch processes by name using **pgrep**(1) ([#95](https://codeberg.org/ivarch/pv/issues/95))
* *feature:* new "**@LISTFILE**" syntax for **--watchfd** to watch processes listed in a file
* *fix:* improve support for changing the format of a **--watchfd** process with **--remote**
* *fix:* don't read more than **--size** bytes when using **--stop-at-size** ([#166](https://codeberg.org/ivarch/pv/issues/166))
* *fix:* transfer nothing if **--stop-at-size** is given a **--size** of 0 ([#166](https://codeberg.org/ivarch/pv/issues/166))
* *i18n:* Finnish translation stub added
* *i18n:* Turkish translations updated
### 1.9.34 - 26 July 2025
* *fix:* prevent tight loop consuming CPU when waiting for a partially filled output pipe to be drained ([#164](https://codeberg.org/ivarch/pv/issues/164))
* *fix:* correct a memory handling fault when using **--bar-style** with **--watchfd** ([#163](https://codeberg.org/ivarch/pv/issues/163))
* *i18n:* French translations updated
### 1.9.31 - 28 January 2025
* *feature:* the **--format** option can now be used with **--numeric** for customised numeric output, such as JSON ([#127](https://codeberg.org/ivarch/pv/issues/127))
* *i18n:* German translations updated
* *i18n:* Polish translations updated
* *i18n:* Russian translations updated
### 1.9.27 - 12 January 2025
* *fix:* turn off IPC support if _sys/shm.h_ is not available, for compilation on Termux
* *fix:* bypass valgrind checks on ARM by default due to false positives
### 1.9.25 - 22 December 2024
* *fix:* test failure of **--watchfd** on macOS corrected ([#124](https://codeberg.org/ivarch/pv/issues/124))
### 1.9.24 - 19 December 2024
* *feature:* new **--format** sequences for graphical progress bars - "**%{bar-block}**", "**%{bar-granular}**", and "**%{bar-shaded}**" ([#15](https://codeberg.org/ivarch/pv/issues/15))
* *feature:* new **--format** sequence "**%{sgr:colour,...}**" to use ECMA-48 Select Graphic Rendition codes to add colours
* *feature:* new **--bar-style** option to change the default bar style ([#15](https://codeberg.org/ivarch/pv/issues/15))
* *feature:* allow decimal values such as "1.5G" with "**--size**", "**--rate-limit**", "**--buffer-size**", and "**error-skip-block**" ([#35](https://codeberg.org/ivarch/pv/issues/35))
* *cleanup:* improve progress bar granularity on wide displays by internally tracking the transfer percentage as a decimal number
* *cleanup:* correct detection of **--remote** usability on GNU Hurd
* *cleanup:* reduce likelihood of race conditions in tests when running on slow systems
* *cleanup:* reduce memory footprint
* *docs:* simplified the synopsis section of the manual
### 1.9.15 - 8 December 2024
* *feature:* new **--format** sequence "**%nL**", showing the most recent line written ([#121](https://codeberg.org/ivarch/pv/issues/121))
* *feature:* each **--format** sequence now has a more readable equivalent name, for example "**%r**" can be written as "**%{rate}**"
* *feature:* new **--format** sequences "**%{progress-bar-only}**" and "**%{progress-amount-only}**"
* *fix:* allow **--format** to include "%nA" more than once, with different "n" values ([#122](https://codeberg.org/ivarch/pv/issues/122))
* *fix:* allow **--format** to include "%p" more than once, with optional width prefix
* *fix:* calculate width correctly when wide characters are in **--format** strings
* *fix:* add _configure_ script fallback for **--remote** check when cross-compiling ([#120](https://codeberg.org/ivarch/pv/issues/120))
* *fix:* allow **extra-display** to be changed by **--remote** ([#123](https://codeberg.org/ivarch/pv/issues/123))
* *cleanup:* refactored display formatters into separate functions
* *cleanup:* improve format parser handling of dangling or invalid "%" sequences
### 1.9.7 - 2 December 2024
* *feature:* new **--extra-display** option to update window and process titles ([#3](https://codeberg.org/ivarch/pv/issues/3), [#4](https://codeberg.org/ivarch/pv/issues/4))
* *fix:* correct failure to report file positions in **--watchfd** ([#118](https://codeberg.org/ivarch/pv/issues/118))
* *i18n:* Russian translations added
* *cleanup:* tests added for **--watchfd** ([#10](https://codeberg.org/ivarch/pv/issues/10))
* *cleanup:* worked around file descriptor leak false positives in valgrind 3.23 ([#97](https://codeberg.org/ivarch/pv/issues/97))
* *cleanup:* cleared all *shellcheck* warnings in the test scripts
* *cleanup:* check at compile-time whether **--remote** is going to be usable ([#119](https://codeberg.org/ivarch/pv/issues/119))
### 1.9.0 - 15 October 2024
* *feature:* new **--store-and-forward** option to read input to a file first, then write it to the output ([#100](https://codeberg.org/ivarch/pv/issues/100))
* *feature:* new **--stats** option to show transfer stats at the end, like "`ping`" ([#49](https://codeberg.org/ivarch/pv/issues/49))
* *feature:* **--rate** can now be used with **--numeric** ([#17](https://codeberg.org/ivarch/pv/issues/17))
* *feature:* **--gauge** with **--progress** to show rate gauge when size is unknown ([#46](https://codeberg.org/ivarch/pv/issues/46))
* *i18n:* comprehensive German translations update
* *i18n:* comprehensive Polish translations update
* *i18n:* complete Turkish translations added
* *i18n:* complete Czech translations added
* *i18n:* updates to French translations
* *fix:* resume stopped pipelines when running in the background (part of [#56](https://codeberg.org/ivarch/pv/issues/56))
* *fix:* inspect the output pipe buffer to give a more accurate progress indicator of how much the next command has consumed
* *fix:* prefix completion time (**--fineta**) with *FIN* rather than *ETA* ([#43](https://codeberg.org/ivarch/pv/issues/43))
* *fix:* surround average rate (**--average-rate**) with brackets rather than square brackets
* *fix:* correct a memory leak in **--watchfd PID**
* *fix:* make **--direct-io** work correctly with **--output** instead of assuming stdout
* *fix:* call `posix_fadvise()` on every input, not just the first one
* *fix:* write UTC timestamps in debugging mode to avoid lockups in signal handlers
* *security:* added a signed *MANIFEST* file to releases
* *cleanup:* removed TODO.md, since it's just an outdated copy of the issue tracker
* *cleanup:* re-ordered structure members to reduce padding
* *cleanup:* improved readability of *SIGTTOU* handling code
* *cleanup:* refactored to separate display, transfer, and calculation more cleanly
* *cleanup:* instead of moving stderr when backgrounded, set a suspend-output flag
### 1.8.14 - 7 September 2024
* *fix:* correct double-free on exit when using **--watchfd** ([#96](https://codeberg.org/ivarch/pv/issues/96)) reported by [jettero](https://codeberg.org/jettero)
### 1.8.13 - 18 August 2024
* *feature:* when using **--size @FILE**, *FILE* can be a block device, and its size will be used (pull request [#94](https://codeberg.org/ivarch/pv/pulls/94)) supplied by [alexanderperlis](https://codeberg.org/alexanderperlis)
### 1.8.12 - 18 July 2024
* *fix:* correct the detection of output block device size that was broken in 1.8.10 ([#91](https://codeberg.org/ivarch/pv/issues/91))
* *fix:* do not treat a zero/interrupted write as an end of file (pull requests [#92](https://codeberg.org/ivarch/pv/pulls/92) and [#93](https://codeberg.org/ivarch/pv/pulls/93))
### 1.8.10 - 15 June 2024
* *feature:* new **--output** option to write to a file instead of standard output (pull request [#90](https://codeberg.org/ivarch/pv/pulls/90)) supplied by [xmort](https://codeberg.org/xmort)
### 1.8.9 - 21 April 2024
* *feature:* new **--si** option to display and interpret size suffixes in multiples of 1000 rather than 1024 (pull request [#85](https://codeberg.org/ivarch/pv/pulls/85)) supplied by [kevinruddy](https://codeberg.org/kevinruddy)
* *fix:* continue producing progress output when the output is blocking writes ([#34](https://codeberg.org/ivarch/pv/issues/34), [#86](https://codeberg.org/ivarch/pv/issues/86), [#87](https://codeberg.org/ivarch/pv/issues/87))
* *fix:* honour the *TMPDIR* / *TMP* environment variables again, rather than hard-coding "`/tmp`", when using a terminal lock file (originally removed in 1.8.0) ([#88](https://codeberg.org/ivarch/pv/issues/88))
* *i18n:* corrections and missing strings added to French translations (pull request [#83](https://codeberg.org/ivarch/pv/pulls/83)) supplied by [Thomas Bertels](https://codeberg.org/tbertels)
### 1.8.5 - 19 November 2023
* *fix:* corrected percentage formatting so it doesn't jump from 2 to 3 characters wide at 100% ([#80](https://codeberg.org/ivarch/pv/issues/80))
* *fix:* replaced **--remote** mechanism, using a temporary file instead of SysV IPC, so it can work reliably even when there are multiple PV instances
* *fix:* corrected compilation failure when without IPC support
* *security:* addressed all issues highlighted by the software auditing tools "`splint`" and "`flawfinder`" (see "`make analyse`") ([#77](https://codeberg.org/ivarch/pv/issues/77))
* *cleanup:* compilation warnings fixed on non-IPC and MacOS systems
### 1.8.0 - 24 September 2023
#### Features
* *feature:* new **--discard** option to discard input as if writing to */dev/null* ([#42](https://codeberg.org/ivarch/pv/issues/42))
* *feature:* new **--error-skip-block** option to make **--skip-errors** skip whole blocks ([#37](https://codeberg.org/ivarch/pv/issues/37))
* *feature:* use `posix_fadvise()` like `cat`(1) does, to improve efficiency ([#39](https://codeberg.org/ivarch/pv/issues/39))
* *feature:* new **--enable-static** option to "`configure`" for static builds ([#75](https://codeberg.org/ivarch/pv/pulls/75))
#### Security
* *security:* with **--pidfile**, write to a temporary file and rename it into place, to improve security
* *security:* keep self-contained copies of name and format string in PV internal state for memory safety
* *security:* ignore *TMP* / *TMPDIR* environment variables when using a terminal lock file
#### Fixes
* *fix:* only report errors about missing files when starting to transfer from them, not while calculating size, and behave more like `cat`(1) by skipping them and moving on
* *fix:* auto-calculate total line count with **--line-mode** when all inputs are regular files
* *fix:* use `clock_gettime()` in ETA calculation to cope with machine suspend/resume ([#13](https://codeberg.org/ivarch/pv/issues/13))
* *fix:* if **--width** or **--height** were provided, do not change them when the window size changes ([#36](https://codeberg.org/ivarch/pv/issues/36))
* *fix:* when a file descriptor position in **--watchfd** moves backwards, show the rate using the correct prefix ([#41](https://codeberg.org/ivarch/pv/issues/41))
* *fix:* rewrite terminal state save/restore so state is not intermittently garbled on exit when using **--cursor** ([#20](https://codeberg.org/ivarch/pv/issues/20)), ([#24](https://codeberg.org/ivarch/pv/issues/24))
#### Cleanups
* *cleanup:* addressed many potential issues highlighted by the software auditing tools "`splint`" and "`flawfinder`" (see new target "`make analyse`")
* *cleanup:* switched the build system to GNU Automake
* *cleanup:* replaced the test harness with the one native to GNU Automake
* *cleanup:* added a test for terminal width detection to "`make check`"
* *cleanup:* added a test to "`make check`" to ensure that "`make install`" installs everything expected
* *cleanup:* replaced *AC_HEADER_TIOCGWINSZ* with *AC_CHECK_HEADERS(sys/ioctl.h)* for better MacOS compatibility ([#74](https://codeberg.org/ivarch/pv/issues/74))
* *cleanup:* with **--sync**, call `fsync()` instead of `fdatasync()` on incapable systems ([#73](https://codeberg.org/ivarch/pv/issues/73))
* *cleanup:* the manual is now a static file instead of needing to be built with "`configure`"
#### Dropped items
* *dropped:* dropped support for **--enable-static-nls**
* *dropped:* removed the Linux Software Map file, as the LSM project appears to be long dead
* *dropped:* will no longer publish to SourceForge as it has a chequered history and is unnecessary
* *dropped:* removed project from GitHub and moved to Codeberg - see "[Give Up GitHub](https://giveupgithub.org/)"
#### Other items
* licensing change from Artistic 2.0 to GPLv3+
### 1.7.24 - 30 July 2023
* *fix:* correct terminal size detection, broken in 1.7.17 by the configuration script rewrite ([#72](https://codeberg.org/ivarch/pv/issues/72))
* *security:* removed *DEBUG* environment variable in debug mode, added **--debug** instead
* *cleanup:* added "`make analyse`" to run "`splint`" and "`flawfinder`" on all source files
* *cleanup:* corrected detection of boolean capability
* *cleanup:* word wrapping of **--help** output is now multi-byte locale aware
* *cleanup:* adjusted "`indent`" rules to line length of 120 and reformatted code
### 1.7.18 - 28 July 2023
* *fix:* language file installation had been broken by the configuration script rewrite
### 1.7.17 - 27 July 2023
* *feature:* new **--sync** option to flush cache to disk after every write (related to [#6](https://codeberg.org/ivarch/pv/issues/6), to improve accuracy when writing to slow disks)
* *feature:* new **--direct-io** option to bypass cache - implements [#29 "Option to enable O_DIRECT"](https://codeberg.org/ivarch/pv/issues/29) - requested by Romain Kang, Jacek Wielemborek
* *fix:* correct byte prefix size to 2 spaces in rate display, so progress display size remains constant at low transfer rates
* *cleanup:* rewrote `configure.in` as per suggestions in newer "`autoconf`" manuals
* *cleanup:* replaced `header.in` with one generated by "`autoheader`", moving custom logic to a separate header file "`config-aux.h`"
* *cleanup:* added copyright notice to all source files as per GNU standards
* *cleanup:* changed **--version** output to conform to GNU standards
* *cleanup:* replaced backticks with `$()` in all shell scripts that did not come from elsewhere, as backticks are deprecated and harder to read
* *cleanup:* improved the output formatting of "`make test`"
* *cleanup:* extended the "`make test`" mechanism to allow certain tests to be skipped on platforms that cannot support them
* *cleanup:* skip the "pipe" test (for *SIGPIPE*) if GNU "`head`" is not available, so that "`make test`" on stock OpenBSD 7.3 works
* *cleanup:* added a lot more tests to "`make test`"
* *cleanup:* replace all calls to `sprintf()` and `snprintf()` with a new wrapper function `pv_snprintf()` to improve security and compatibility
* *cleanup:* replace all calls to `strcat()` with a wrapper `pv_strlcat()` to improve security and compatibility
* *cleanup:* replace all `write()` calls to the terminal with a wrapper `pv_write_retry()` for consistency
* *cleanup:* tidy up and fix compilation warning in **--watchfd** code
* *cleanup:* rewrote all local shell scripts to pass analysis by [ShellCheck](https://www.shellcheck.net)
### 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://codeberg.org/ivarch/pv/pulls/57) supplied by [Dave Beckett](https://github.com/dajobe))
* *feature:* the **--watchfd** option is now available on OS X (pull request [#60](https://codeberg.org/ivarch/pv/pulls/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://codeberg.org/ivarch/pv/pulls/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://codeberg.org/ivarch/pv/pulls/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://codeberg.org/ivarch/pv/pulls/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 [#19 "No output in Arch Linux initcpio after 1.6.6"](https://codeberg.org/ivarch/pv/issues/19), [#31 "No output written from inside zsh <() construct"](https://codeberg.org/ivarch/pv/issues/31), [#55 "pv Stopped Working in the Background"](https://codeberg.org/ivarch/pv/issues/55) (pull request [#64](https://codeberg.org/ivarch/pv/pulls/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://codeberg.org/ivarch/pv/pulls/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 [#33 "Fix compilation problems due to `stat64()` on Apple Silicon"](https://codeberg.org/ivarch/pv/issues/33)
* *fix:* add burst rate limit to transfer, so rate limits are not broken by bursty traffic (pull request [#62](https://codeberg.org/ivarch/pv/pulls/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 [#23 "No output with "-f" when run in background after 1.6.6"](https://codeberg.org/ivarch/pv/issues/23) and helps to correct [#31 "No output written from inside zsh <() construct"](https://codeberg.org/ivarch/pv/issues/31)
* *fix:* corrected elapsed time display to show as D:HH:MM:SS after 1 day, like the ETA does - corrects [#16 "Show days in same format in ETA as in elapsed time"](https://codeberg.org/ivarch/pv/issues/16)
* *fix:* corrected bug where percentages went down after 100% when in **--numeric** mode with a **--size** that was too small - corrects [#26 "Correct "-n" behaviour when going past 100% of "-s" size"](https://codeberg.org/ivarch/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 package documentation 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
+701
View File
@@ -0,0 +1,701 @@
#!/bin/bash
#
# Benchmark transfer rates, and analyse benchmark results.
#
# Measures transfer rates and CPU usage with various different options,
# multiple times, then calculates the mean and standard deviation for each
# set of measurements.
#
# The results are written to stdout as tab-separated values, each line
# prefixed with an opaque system ID (based on "uname -a"), the PV version
# expressed as an integer, and a run ID based on the start date and time.
#
# In analysis mode, reads results from multiple benchmark runs on standard
# input, and for each type of measurement, show the differences between
# either the different PV versions or the different runs.
# Defaults.
pv='pv' # PV executable to run the measurements with
rounds='10' # how many rounds of measurements to take
testFileMB='256' # max size of each of the test files, in MiB
testZeroesMB='1024' # amount of /dev/zero data to use, in MiB
sourcesDir='' # directory containing sources to benchmark
compareWhat='auto' # what to compare in the analysis
finalLineOnly='false' # whether to only show the last measurement's analysis
terseFormat='false' # whether to use a terse report format
# Script information for --help and --version.
programName='benchmark-pv-transfers'
programVersion='1.0.0'
bugReportsTo='https://codeberg.org/ivarch/pv/issues'
copyrightYear='2026'
copyrightHolder='Andrew Wood'
# Constants.
fieldsPerRecord='4' # measurements taken: rate, time - real, user, sys.
# Hash function - write hex on stdout based on a hash of stdin.
runHash () {
command -v md5sum >/dev/null 2>&1 && exec md5sum
# OpenBSD has no "md5sum" but does have "cksum -a md5".
cksum -r -a md5 2>/dev/null || cksum
}
# Define the measurements. Each measurement definition contains:
# - The ID of the measurement
# - The name of the measurement
# - A space-separated list of single-letter options that PV must support
# - How many testFileMB multiples are transferred, or Z for testZeroesMB
# - The command to run
# In the command to run, {PV} is replaced with the path to PV, {FILE1} and
# {FILE2} are replaced by the random data filenames, {ZSIZE} is replaced by
# testZeroesMB, and {OUTPUT} is replaced by a temporary output filename.
# Each definition is stored as single line, with the above parts separated
# by "!".
measurementDefinitions=''
# Add a definition (name, options list, data size, command) to the
# definitions array.
addDefinition () {
measurementDefinitions="$(
printf '%s\n%s!%s!%s!%s!%s\n' \
"${measurementDefinitions}" \
"$(printf '%s\n' "$1" | runHash | cut -b1-7)" \
"$1" "$2" "$3" "$4" \
| grep .
)"
}
# Add a set of standard definitions for measurements, naming them with a
# prefix "$1: ", each with extra options "$2".
addStandardMeasurements () {
# From file via stdin to file via stdout.
addDefinition "$1: stdin file to file" "$2" 1 "{PV} $2 < {FILE1} > {OUTPUT}"
# From file to file via stdout.
addDefinition "$1: file to file" "$2" 1 "{PV} $2 {FILE1} > {OUTPUT}"
# From two files to file via stdout.
addDefinition "$1: two files to file" "$2" 2 "{PV} $2 {FILE1} {FILE2} > {OUTPUT}"
# From pipe to file via stdout.
addDefinition "$1: pipe to file" "$2" 1 "cat {FILE1} | {PV} $2 > {OUTPUT}"
# From file via stdin to pipe.
addDefinition "$1: stdin file to pipe" "$2" 1 "{PV} $2 < {FILE1} | cat > {OUTPUT}"
# From file to pipe.
addDefinition "$1: file to pipe" "$2" 1 "{PV} $2 {FILE1} | cat > {OUTPUT}"
# From two files to pipe.
addDefinition "$1: two files to pipe" "$2" 2 "{PV} $2 {FILE1} {FILE2} | cat > {OUTPUT}"
# From pipe to pipe.
addDefinition "$1: pipe to pipe" "$2" 1 "cat {FILE1} | {PV} $2 | cat > {OUTPUT}"
}
# Generate the measurement definitions, most of which are based on repeated
# blocks of the above standard measurements, with various different options.
defineMeasurements () {
addStandardMeasurements 'Default' ''
addStandardMeasurements 'No-splice' '-C'
addStandardMeasurements 'Pipe buffer 1M' '-J 1M'
addStandardMeasurements 'Transfer buffer 1M' '-B 1M'
addStandardMeasurements 'Discard' '-X'
addStandardMeasurements 'Discard with no-splice' '-X -C'
addStandardMeasurements 'Discard with pipe buffer 1M' '-X -J 1M'
addStandardMeasurements 'Discard with transfer buffer 1M' '-X -B 1M'
addDefinition "Zeroes: stdout to /dev/null" '-S -s' Z "{PV} -S -s {ZSIZE}M /dev/zero > /dev/null"
addDefinition "Zeroes: stdout to pipe" '-S -s' Z "{PV} -S -s {ZSIZE}M /dev/zero | cat > /dev/null"
addDefinition "Zeroes: discarded" '-X -S -s' Z "{PV} -X -S -s {ZSIZE}M /dev/zero"
addDefinition "Zeroes: stdout to /dev/null with no-splice" '-C -S -s' Z "{PV} -C -S -s {ZSIZE}M /dev/zero > /dev/null"
addDefinition "Zeroes: stdout to pipe with no-splice" '-C -S -s' Z "{PV} -C -S -s {ZSIZE}M /dev/zero | cat > /dev/null"
addDefinition "Zeroes: discarded with no-splice" '-C -X -S -s' Z "{PV} -C -X -S -s {ZSIZE}M /dev/zero"
}
# Write an error message $1 to standard error, prefixed with the program
# name.
error () {
printf '%s: %s\n' "${programName}" "$1" >&2
}
# Output an error message $1, and exit with a failure status.
die () {
error "$1"
exit 1
}
# Show all measurement definitions.
showMeasurementDefinitions () {
printf '%s\n%s\n' 'ID!Name!Opts!Size!Command' "${measurementDefinitions}" \
| awk -F '!' '{printf "%s\t%-60s\t%s\n", $1, $2, $5}'
}
# Sort a list of version numbers on stdin, in version order.
versionSort () {
# If sort has no -V, like on CentOS 5, fall back to a simplistic
# substitute.
sort -V 2>/dev/null \
|| perl -pe '$x=$_;$x=~s/(0*[0-9]+)/sprintf("%09d",$1)/ge;chomp $x;$_=$x." ".$_' | sort | awk '{print $2}'
}
# Write a line of results for the measurement with ID $1 and name $2, round
# ${thisRound}, reading the times from ${workDir}/times and deriving the
# rate from the elapsed time (the real time in the times file) and the size
# written in ${workDir}/size. Removes those two files in the process.
#
# The results are also spooled to ${workDir}/results for later analysis,
# prefixed with only the ID $1.
resultsLine () {
testTimeReal="$(awk '$1=="real" {print $2}' "${workDir}/times")"
testTimeUser="$(awk '$1=="user" {print $2}' "${workDir}/times")"
testTimeSystem="$(awk '$1=="sys" {print $2}' "${workDir}/times")"
testRate="$(awk -v t="${testTimeReal}" '{if (t>0) { printf "%.3f\n", $1/t } else { print "-" }}' < "${workDir}/size")"
test -n "${testRate}" || testRate='-'
rm -f "${workDir}/times" "${workDir}/size"
printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' "${outputPrefix}" "${thisRound}" "$1" "${testRate}" "${testTimeReal}" "${testTimeUser}" "${testTimeSystem}" "$2"
printf '%s\t%s\t%s\t%s\t%s\n' "$1" "${testRate}" "${testTimeReal}" "${testTimeUser}" "${testTimeSystem}" >> "${workDir}/results"
}
# Run $2 in a shell under "time", writing $1 to ${workDir}/size and the
# times to ${workDir}/times.
captureTimes () {
printf '%s\n' "$1" > "${workDir}/size"
(
TIMEFORMAT="real %3R
user %3U
sys %3S"
time sh -c "{ $2; } 2>&3"
) 3>&2 2>"${workDir}/times"
}
# Run all defined measurements for which the required options are available.
#
# If "${workDir}/permitted-measurements" is not empty, only measurements
# with IDs listed in that file will be taken.
gatherMeasurements () {
printf '%s\n' "${measurementDefinitions}" \
| {
while read -r definitionLine; do
measurementId="${definitionLine%%!*}"
measurementName="${definitionLine#*!}"
measurementName="${measurementName%%!*}"
requiredOptions="${definitionLine#*!}"
requiredOptions="${requiredOptions#*!}"
requiredOptions="${requiredOptions%%!*}"
dataSize="${definitionLine#*!}"
dataSize="${dataSize#*!}"
dataSize="${dataSize#*!}"
dataSize="${dataSize%%!*}"
templateCommand="${definitionLine##*!}"
test -n "${templateCommand}" || continue
if test -s "${workDir}/permitted-measurements"; then
grep -Fqx "${measurementId}" "${workDir}/permitted-measurements" || continue
fi
if test -n "${requiredOptions}"; then
optionLetters="$(printf 'x%s\n' "${requiredOptions}" | tr -d '!' | sed 's/-/!-/g' | tr '!' '\n' | grep '^-' | cut -b 2)"
optionsPresent='true'
for pvOption in ${optionLetters}; do
grep -Fq " -${pvOption}" "${workDir}/help" || optionsPresent='false'
done
${optionsPresent} || continue
fi
# Add some display options to make more information visible
# on versions that support them.
pvExtraOptions=''
pvFormatString='%b %t %r %p %e %T'
if grep -Fq " -N" "${workDir}/help"; then
pvExtraOptions="${pvExtraOptions} -N '${measurementId}'"
pvFormatString="%N ${pvFormatString}"
fi
grep -Fq " -F" "${workDir}/help" && pvExtraOptions="${pvExtraOptions} -F '${pvFormatString}'"
activeCommand="$(
printf '%s\n' "${templateCommand}" | sed \
-e "s!{PV}!${pv}${pvExtraOptions}!g" \
-e "s!{FILE1}!${workDir}/file1!g" \
-e "s!{FILE2}!${workDir}/file2!g" \
-e "s!{ZSIZE}!${testZeroesMB}!g" \
-e "s!{OUTPUT}!${workDir}/output!g"
)"
if test "${dataSize}" = "Z"; then
dataSize="${testZeroesMB}"
else
dataSize=$((dataSize*testFileMB))
fi
rm -f "${workDir}/output1" "${workDir}/output2"
captureTimes "${dataSize}" "${activeCommand}"
resultsLine "${measurementId}" "${measurementName}"
done
}
}
# Run several rounds of benchmark measurements using $1 as the pv
# executable, producing tab-separated data, including a final section
# containing the means and standard deviations for each measurement type.
#
# If $2 is not blank, only run the measurements whose IDs are listed in it.
runBenchmarks () {
pv="$1"
restrictTo="$2"
# Check there's enough room for the test files, meaning that 2 test
# files + 1 output file + 2MB doesn't add up to more than 75% of the
# space on the filesystem holding TMPDIR - make the test files
# smaller, if not.
tmpSpaceMB="$(df -kP "${TMPDIR:-/tmp}" | awk 'FNR==2 {print int($4*3/4096)}')"
while test "${testFileMB}" -gt 4; do
test "${tmpSpaceMB}" -gt $((2+3*testFileMB)) && break
testFileMB=$((testFileMB/2))
done
# Capture the help text so that capabilities can be checked.
${pv} -h > "${workDir}/help"
# Write a list of permitted measurement IDs, one per line. An empty
# file means no restriction.
# shellcheck disable=SC2020 # silence the warning about "tr" here.
printf '%s\n' "${restrictTo}" \
| tr ',; \t' '\n\n\n\n' \
| sort -u \
| grep . \
> "${workDir}/permitted-measurements"
# Define identifiers for the system this is running on, the pv
# version being benchmarked, and this specific benchmark run.
sysId="$(uname -a | runHash | cut -b1-7)"
pvId="$(${pv} --version | awk 'FNR==1{print $2}' | awk -F . '{print 1000000*$1+1000*$2+$3}')"
runId="$(date '+%Y%m%d%H%M%S')"
outputPrefix="$(printf '%s\t%s\t%s\n' "${sysId}" "${pvId}" "${runId}")"
# Basic system information, and a header line for the test results.
printf '%s\t%s\t%s\n' "${outputPrefix}" 'System hostname' "$(uname -n)"
printf '%s\t%s\t%s\n' "${outputPrefix}" 'System load' "$(uptime | awk '{printf "%.2f\n",$(NF-2)}')"
printf '%s\t%s\t%s\n' "${outputPrefix}" 'System kernel type' "$(uname -s)"
printf '%s\t%s\t%s\n' "${outputPrefix}" 'System kernel release' "$(uname -r)"
printf '%s\t%s\t%s\n' "${outputPrefix}" 'System OS' "$(uname -o)"
printf '%s\t%s\t%s\n' "${outputPrefix}" 'PV path' "${pv}"
printf '%s\t%s\t%s\n' "${outputPrefix}" 'PV version' "$(${pv} -V | awk 'FNR==1 {print $2}')"
printf '%s\t%s\t%s\n' "${outputPrefix}" 'Test file size (MB)' "${testFileMB}"
# Generate two files of random data.
dd if='/dev/urandom' of="${workDir}/file1" bs=1048576 count="${testFileMB}" 2>/dev/null
dd if='/dev/urandom' of="${workDir}/file2" bs=1048576 count="${testFileMB}" 2>/dev/null
# Run several rounds of measurements.
printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' "${outputPrefix}" '#' 'ID' 'MiB/sec' 'Real time' 'User CPU time' 'System CPU time' 'Raw measurement'
thisRound=0
while test ${thisRound} -lt "${rounds}"; do
thisRound=$((1+thisRound))
gatherMeasurements
done
# For each of the types of measurement, report the mean and standard
# deviation of each field.
awk -F "\t" '{print $1}' < "${workDir}/results" > "${workDir}/measurement-ids"
true > "${workDir}/measurement-ids-used"
printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' "${outputPrefix}" 'μ/σ' 'ID' 'MiB/sec' 'Real time' 'User CPU time' 'System CPU time' 'Aggregated measurement'
{
while read -r measurementId; do
# Skip this type of measurement if already processed.
grep -Fqx "${measurementId}" "${workDir}/measurement-ids-used" && continue
printf '%s\n' "${measurementId}" >> "${workDir}/measurement-ids-used"
# Get the associated measurement name.
measurementName="$(printf '%s\n' "${measurementDefinitions}" | awk -F '!' -v "x=${measurementId}" '$1==x{print $2}')"
# Separate out this measurement type's results.
awk -F "\t" -v "mId=${measurementId}" '$1==mId {print}' < "${workDir}/results" \
> "${workDir}/measurements"
# Calculate the mean of each field.
awk -F "\t" -v "mId=${measurementId}" -v "mName=${measurementName}" -v "fieldcount=${fieldsPerRecord}" \
'BEGIN { samples=0 }
{ samples++; for (field=1; field<=fieldcount; field++) { total[field] += $(1+field) } }
END { printf "%s\t%s", "μ", mId; for (field=1; field<=fieldcount; field++) { printf "\t%.3f", total[field]/samples }; printf "\t%s\n", mName }' \
< "${workDir}/measurements" > "${workDir}/mean"
# Calculate the standard deviation of each field.
cat "${workDir}/mean" "${workDir}/measurements" \
| awk -F "\t" -v "mId=${measurementId}" -v "mName=${measurementName}" -v "fieldcount=${fieldsPerRecord}" \
'BEGIN { samples=0 }
FNR==1 { for (field=1; field<=fieldcount; field++) { mean[field] += $(2+field) } }
FNR>1 { samples++; for (field=1; field<=fieldcount; field++) { variance=$(1+field)-mean[field]; sum_variance_squared[field] += (variance*variance) } }
END { printf "%s\t%s", "σ", mId; for (field=1; field<=fieldcount; field++) { printf "\t%.3f", sqrt(sum_variance_squared[field]/samples) }; printf "\t%s\n", mName }' \
> "${workDir}/stddev"
sed "s,^,${outputPrefix}!," "${workDir}/mean" "${workDir}/stddev" | tr '!' '\t'
done
} < "${workDir}/measurement-ids"
rm -f "${workDir}/file1" "${workDir}/file2" "${workDir}/output1" "${workDir}/output2"
}
# Reformat data on stdin so that each (whitespace-separated) column is
# space-padded and right-aligned to a consistent width for all rows.
#
# Note that this can only handle ASCII, not UTF-8.
lineUpColumns () {
tee "${workDir}/lineup-temp" \
| awk 'BEGIN {cols=0}
/./ {
if (NF > cols)
cols=NF
for (col=1; col<=NF; col++) {
if (length($col) >= max[col])
max[col]=length($col)
}
}
END {
for (col=1; col<=cols; col++) {
printf "%d ", max[col]
}
printf "\n"
}
' > "${workDir}/lineup-colwidths"
cat "${workDir}/lineup-colwidths" "${workDir}/lineup-temp" \
| awk '
FNR==1 { cols=NF; for (col=1; col<=NF; col++) { max[col]=$col } }
FNR>1 {
for (col=1; col<=cols; col++) {
if (col>1)
printf " "
val=(col<=NF ? $col : "")
printf "%" max[col] "s", val
}
printf "\n"
}'
}
# Read a stream of benchmark data on stdin containing runs from a single
# system, and report how the measurements changed across $1 - either "runs"
# for benchmark runs, or "versions" for PV versions.
compareResults () {
comparisonSelector="$1"
cat > "${workDir}/raw-system-data"
# List the measurement IDs in the order they appear in the data.
awk -F "\t" '$4=="σ"{print $5}' < "${workDir}/raw-system-data" > "${workDir}/measurement-ids"
case "${comparisonSelector}" in
'versions')
# List all PV versions for which any data is available.
awk -F "\t" '$4=="PV version"{print $2,$5}' "${workDir}/raw-system-data" | sort -nu > "${workDir}/comparison-items"
itemHeading='Version'
itemField=2
;;
'runs')
# List all runs.
awk -F "\t" '$4=="σ"{print $3,$3}' "${workDir}/raw-system-data" | sort -nu > "${workDir}/comparison-items"
itemHeading='Run'
itemField=3
;;
esac
# Report on each measurement type in turn.
true > "${workDir}/measurement-ids-seen"
{
measurementsCounter=0
while read -r measurementId; do
# Skip if this measurement was already processed.
grep -Fqx "${measurementId}" "${workDir}/measurement-ids-seen" && continue
printf '%s\n' "${measurementId}" >> "${workDir}/measurement-ids-seen"
# Collect this measurement's mean and standard deviation
# records for each distinct item (version or run). If
# there's more than one for a single item, average them.
{
while read -r itemId itemName; do
awk -F "\t" \
-v "itemField=${itemField}" -v "itemId=${itemId}" -v "itemName=${itemName}" \
-v "mId=${measurementId}" \
-v "fieldcount=${fieldsPerRecord}" \
'BEGIN {samples=0}
$itemField==itemId && $5==mId && $4=="μ" { samples++; for (field=1; field<=fieldcount; field++) { mean[field] += $(5+field) } }
$itemField==itemId && $5==mId && $4=="σ" { for (field=1; field<=fieldcount; field++) { stddev[field] += $(5+field) } }
END {
if (samples > 0) {
printf "%s", itemName
for (field=1; field<=fieldcount; field++) {
printf "\t%.3f\t%.3f", mean[field]/samples, stddev[field]/samples
}
printf "\n"
}
}' \
< "${workDir}/raw-system-data"
done
} < "${workDir}/comparison-items" > "${workDir}/measurements-per-item"
# If there are not at least 2 items for which this
# measurement was available, report nothing as no comparison
# can be made.
test "$(grep -c . "${workDir}/measurements-per-item")" -lt 2 && continue
# Show the measurement name and associated command.
# Take the measurement name from the input data.
measurementName="$(awk -F "\t" -v "mId=${measurementId}" '$4=="σ" && $5==mId {print $NF;exit}' "${workDir}/raw-system-data")"
if ! ${terseFormat}; then
# Take the command from the definitions.
templateCommand="$(printf '%s\n' "${measurementDefinitions}" | awk -F '!' -v "mId=${measurementId}" '$1==mId {print $5}')"
printf '\n%s\n' "${measurementName}"
test -n "${templateCommand}" && printf ' (%s)\n' "${templateCommand}"
fi
# Report each item's measurements and how they compare to
# the previous item.
awk -F "\t" -v "fieldcount=${fieldsPerRecord}" \
'{
printf "%s", $1
for (field=0; field<fieldcount; field++) {
if (field > 0) {
printf "\t%s", "-";
}
mean=$(2+2*field)
stddev=$(3+2*field)
changescore=0
printf "\t%.3f\t%.3f", mean, stddev;
if (FNR>1) {
low=mean-stddev;
high=mean+stddev;
range=high-low;
prevlow=pmean[field]-pstddev[field];
prevhigh=pmean[field]+pstddev[field];
prevrange=prevhigh-prevlow;
if (prevrange < 1)
prevrange = 1;
if (high > prevhigh) {
changescore = (high - prevhigh) / prevrange;
} else if (low < prevlow) {
changescore = 0 - ((prevlow - low) / prevrange);
}
}
if (changescore < 0.01 && changescore > -0.01) {
printf "\t%d", 0
} else {
printf "\t%s%.2f", (changescore > 0.00 ? "+" : ""), changescore
}
pmean[field]=mean;
pstddev[field]=stddev;
}
printf "\n"
}' \
< "${workDir}/measurements-per-item" \
> "${workDir}/item-report"
# Leave only the last line if finalLineOnly is set.
${finalLineOnly} && sed -i -n '$p' "${workDir}/item-report"
# In terse mode, prefix each line with the measurement name,
# having replaced spaces in it with underscores.
if ${terseFormat}; then
showName="$(printf '%s\n' "${measurementName}" | tr ' ' '_')"
sed "s,^,${showName}!," < "${workDir}/item-report" | tr '!' '\t' > "${workDir}/item-report.prefixed"
mv -f "${workDir}/item-report.prefixed" "${workDir}/item-report"
fi
# Format the report.
# Since the column widths are set by an awk script which
# doesn't support UTF-8, ASCII headings are used initially,
# and adjusted after formatting.
measurementsCounter=$((1+measurementsCounter))
{
# In terse mode, only print one header per system.
if test ${measurementsCounter} -eq 1 || ! ${terseFormat}; then
printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' \
"${itemHeading}" \
'M:Rate' 'S:Rate' 'C:Rate' \
'-' \
'M:tReal' 'S:tReal' 'C:tReal' \
'-' \
'M:tUser' 'S:tUser' 'C:tUser' \
'-' \
'M:tSys' 'S:tSys' 'C:tSys' \
| {
if ${terseFormat}; then
sed 's,^,Measurement!,' | tr '!' '\t'
else
cat
fi
}
fi
cat "${workDir}/item-report"
} \
> "${workDir}/item-report-with-heading"
if ${terseFormat}; then
cat "${workDir}/item-report-with-heading"
else
lineUpColumns < "${workDir}/item-report-with-heading" \
| sed '1{s,M:,μ:,g;s,S:,σ:,g;s,C:,±:,g;}'
fi
done
} < "${workDir}/measurement-ids" \
> "${workDir}/measurements-report"
if "${terseFormat}"; then
lineUpColumns < "${workDir}/measurements-report" \
| sed '1{s,M:,μ:,g;s,S:,σ:,g;s,C:,±:,g;}'
else
cat "${workDir}/measurements-report"
fi
}
# Read a stream of benchmark data from stdin containing one or more runs
# from one or more systems, and for each individual system, report how the
# measurements changed across either the different PV versions or between
# runs, depending on whether $1 is "versions" or "runs".
#
# If $1 is "auto", then it will be "versions" if data for more than one PV
# version is present, otherwise it will be "runs".
runAnalysis () {
analysisSelector="$1"
cat > "${workDir}/raw-data"
# Auto-detect what to analyse.
if test "${analysisSelector}" = 'auto'; then
if test "$(awk -F "\t" '$4=="σ"{print $2}' < "${workDir}/raw-data" | sort -u | grep -c .)" -gt 1; then
analysisSelector='versions'
else
analysisSelector='runs'
fi
fi
# List the system IDs in the order they appear in the data.
awk -F "\t" '{print $1}' < "${workDir}/raw-data" | uniq > "${workDir}/sysids"
# Report on each system in turn.
true > "${workDir}/sysids-seen"
{
while read -r sysId; do
# Skip if this system was already processed.
grep -Fqx "${sysId}" "${workDir}/sysids-seen" && continue
printf '%s\n' "${sysId}" >> "${workDir}/sysids-seen"
# Extract the data for just this system.
awk -F "\t" -v "s=${sysId}" '$1==s {print}' < "${workDir}/raw-data" > "${workDir}/system-data"
# Report preamble.
printf '%79s\n' '' | tr ' ' '-'
printf '%s: %s - %s - %s %s\n' \
'System' \
"$(awk -F "\t" '$4=="System hostname"{print $5;exit}' "${workDir}/system-data")" \
"$(awk -F "\t" '$4=="System OS"{print $5;exit}' "${workDir}/system-data")" \
"$(awk -F "\t" '$4=="System kernel type"{print $5;exit}' "${workDir}/system-data")" \
"$(awk -F "\t" '$4=="System kernel release"{print $5;exit}' "${workDir}/system-data")"
${terseFormat} || cat <<EOF
For each measurement type, each of its aggregate benchmark results are
shown. Each field's mean and standard deviation are displayed along with a
change indicator showing how different this line's value is from the
previous line.
EOF
compareResults "${analysisSelector}" < "${workDir}/system-data"
done
} < "${workDir}/sysids"
}
##############################################################################
# Main entry point.
# Process any command-line options.
action='benchmark'
restrictMeasurementIdList=''
while test -n "$1"; do
arg="$1"
shift
case "${arg}" in
'measurements'|'benchmark'|'analyse') action="${arg}" ;;
'-h'|'--help')
cat - <<EOF
Usage: ${programName} [OPTIONS] [ACTION]
Benchmark pv transfers - take measurements of transfer rate and CPU usage
when calling pv in various different ways, and analyse results from multiple
benchmark runs to show how each measurement changes between runs or versions.
Actions:
benchmark - take several rounds of measurements (default action)
analyse - analyse benchmark data on stdin from multiple runs
measurements - list all benchmark measurement definitions
Benchmark options:
-p, --program FILE benchmark using FILE as the pv executable (${pv})
-r, --rounds ROUNDS run ROUNDS sets of measurements (${rounds})
-m, --measurement ID only run this specific measurement
-s, --size SIZE attempt to use a test file of SIZE MiB (${testFileMB})
-z, --zeroes SIZE stop at SIZE MiB for /dev/zero measurements (${testZeroesMB})
-d, --dir DIR compile and benchmark each of the tar.gz files in DIR
Analysis options:
-c, --compare WHAT analyse differences in runs, versions, or auto (${compareWhat})
-f, --final show only the final item's line in each measurement analysis
-t, --terse produce a terser report
Other options:
-h, --help show this help
-V, --version show script version
Default values are shown in brackets.
Please report any bugs to: ${bugReportsTo}
EOF
exit 0
;;
'-V'|'--version')
cat - <<EOF
${programName} (pv) ${programVersion}
Copyright ${copyrightYear} ${copyrightHolder}
License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
EOF
exit 0
;;
'-p'|'--program'|'--pv') pv="$1"; test $# -gt 0 && shift ;;
'--program='*|'--pv='*) pv="${arg#*=}" ;;
'-r'|'--rounds') rounds="$1"; test $# -gt 0 && shift ;;
'--rounds='*) rounds="${arg#*=}" ;;
'-m'|'--measurement') restrictMeasurementIdList="${restrictMeasurementIdList} $1"; test $# -gt 0 && shift ;;
'--measurement='*) restrictMeasurementIdList="${restrictMeasurementIdList} ${arg#*=}" ;;
'-s'|'--size') testFileMB="$1"; test $# -gt 0 && shift ;;
'--size='*) testFileMB="${arg#*=}" ;;
'-z'|'--zeroes') testZeroesMB="$1"; test $# -gt 0 && shift ;;
'--zeroes='*) testZeroesMB="${arg#*=}" ;;
'-d'|'--dir') sourcesDir="$1"; test $# -gt 0 && shift ;;
'--dir='*) sourcesDir="${arg#*=}" ;;
'-c'|'--compare') compareWhat="$1"; test $# -gt 0 && shift ;;
'--compare='*) compareWhat="${arg#*=}" ;;
'-f'|'--final') finalLineOnly='true' ;;
'-t'|'--terse') terseFormat='true' ;;
'-'*) die "${arg}: unknown option - try \`--help'" ;;
*) die "${arg}: unexpected argument - try \`--help'" ;;
esac
done
# Check validity of compareWhat, and normalise it.
case "${compareWhat}" in
'runs'|'run') compareWhat='runs' ;;
'versions'|'version') compareWhat='versions' ;;
'auto') ;;
*) die "--compare: ${compareWhat}: invalid value" ;;
esac
# Use /dev/shm for workspace if possible, to eliminate disk I/O as a factor.
if test -z "${TMPDIR}" && test -d '/dev/shm' && mountpoint -q '/dev/shm'; then
TMPDIR='/dev/shm'
export TMPDIR
fi
# Temporary working area, cleaned up on exit.
workDir="$(mktemp -d)" || exit 1
trap 'rm -rf "${workDir}"' EXIT
# Set everything to the "C" locale.
LANG=C
LC_ALL=C
export LANG LC_ALL
# Define the measurements.
defineMeasurements
# Run the selected action.
case "${action}" in
'measurements') showMeasurementDefinitions ;;
'benchmark')
if test -z "${sourcesDir}"; then
runBenchmarks "${pv}" "${restrictMeasurementIdList}"
else
find "${sourcesDir}" -type f -name "*.tar.gz" \
| versionSort \
| while read -r sourcesFile; do
buildDir="$(mktemp -d "${sourcesFile}.build.XXXXXX")" || continue
trap 'rm -rf "${workDir}" "${buildDir}"' EXIT
tar xzf "${sourcesFile}" -C "${buildDir}" \
&& (
cd "${buildDir}"/* \
&& sh ./configure 1>&2 \
&& make 1>&2 \
&& mv pv ..
) \
&& runBenchmarks "${buildDir}/pv" "${restrictMeasurementIdList}"
rm -rf "${buildDir}"
trap 'rm -rf "${workDir}"' EXIT
done
fi
;;
'analyse') runAnalysis "${compareWhat}" ;;
esac
@@ -5,35 +5,33 @@
# time, as suggested by Ville Herva <Ville.Herva@iki.fi>.
#
test_input=`mktemp /tmp/pvbench1XXXXXX`
strace_output=`mktemp /tmp/pvbench2XXXXXX`
test_input=$(mktemp /tmp/pvbench1XXXXXX)
strace_output=$(mktemp /tmp/pvbench2XXXXXX)
trap "rm -f ${test_input} ${strace_output}" 0
trap 'rm -f ${test_input} ${strace_output}' EXIT
pv=${pv:-./pv}
test -x ${pv} || pv=pv
test -x "${pv}" || pv="pv"
dd if=/dev/zero of=${test_input} bs=1k count=1k >/dev/null 2>&1
dd if=/dev/zero of="${test_input}" bs=1k count=1k >/dev/null 2>&1
echo -e "Buf(k)\tRate(k)\tReads\tRsize\tWrites\tWsize"
for ((buffer=100; buffer<=1000; buffer+=100)); do
for ((rate=0; rate<=1000; rate+=100)); do
for ((rate=100; rate<=1000; rate+=100)); do
rateparm="-L ${rate}k"
test ${rate} -eq 0 && rateparm=""
strace -tt -o ${strace_output} \
${pv} ${rateparm} -B ${buffer}k \
-f < ${test_input} > /dev/null 2>&1
strace -tt -o "${strace_output}" \
"${pv}" "${rateparm}" -B "${buffer}k" \
-f < "${test_input}" > /dev/null 2>&1
rdata=$(
awk '$2~/^read\(0,/{c++;t+=$NF}END{print c "\t" t/c}' \
${strace_output}
"${strace_output}"
)
wdata=$(
awk '$2~/^write\(1,/{c++;t+=$NF}END{print c "\t" t/c}' \
${strace_output}
"${strace_output}"
)
echo -e "${buffer}\t${rate}\t${rdata}\t${wdata}"
done
done
# EOF
+942
View File
@@ -0,0 +1,942 @@
.TH PV 1 2026-06-11 pv-1.11.0 "User Commands"
.\"
.SH NAME
pv \- monitor and manage the progress of data through a pipe
.\"
.SH SYNOPSIS
.B pv
[\fIOPTION\fR]... [\fIFILE\fR]...
.PP
\fBpv\fR [\fIOPTION\fR]... \fB\-d\fR|\fB\-\-watchfd\fR
\fIPID\fR[:\fIFD\fR]|=\fINAME\fR|@\fILISTFILE\fR...
.PP
\fBpv\fR \fB\-R\fR|\fB\-\-remote\fR \fIPID\fR [\fIOPTION\fR]...
.PP
\fBpv\fR \fB\-Q\fR|\fB\-\-query\fR \fIPID\fR [\fIOPTION\fR]...
.PP
\fBpv\fR [\fIOPTION\fR]... \fB\-M\fR|\fB\-\-monitor\fR \fISIDE\fR \-\- \fICOMMAND\fR [\fIARGS\fR]...
.\"
.SH DESCRIPTION
Show the progress of data through a pipeline by giving information such as
time elapsed, percentage completed (with progress bar), current throughput
rate, total data transferred, and ETA.
The data flow rate, error handling strategy, buffer size, and cache
interaction can all be adjusted.
.PP
Each \fIFILE\fR is copied to standard output.
With no \fIFILE\fR, or when \fIFILE\fR is \*(lq-\*(rq, standard input is
read.
.PP
In \*(lq\fB\-\-watchfd\fR\*(rq mode, inspect another process and show its
progress through the files it has open.
.PP
In \*(lq\fB\-\-monitor\fR\*(rq mode, run a command and display the progress
of data through both its standard input and its standard output.
.\"
.SH OPTIONS
.\"
.SS "Display switches"
If no display switches are specified, \fBpv\fR behaves as if
\*(lq\fB\-\-progress\fR\*(rq, \*(lq\fB\-\-timer\fR\*(rq,
\*(lq\fB\-\-eta\fR\*(rq, \*(lq\fB\-\-rate\fR\*(rq, and
\*(lq\fB\-\-bytes\fR\*(rq had been given.
Otherwise, only those display types that are explicitly switched on will be
shown.
.TP
.B \-p, \-\-progress
Turn the progress bar on.
If any inputs are not files, or are unreadable, and no size was explicitly
given with \*(lq\fB\-\-size\fR\*(rq, the progress bar cannot indicate how
close to completion the transfer is, so it will just move left and right to
indicate that data is moving - or, with \*(lq\fB\-\-gauge\fR\*(rq, the bar
will indicate the current rate as a percentage of the maximum rate seen so
far.
.TP
.B \-t, \-\-timer
Turn the timer on.
This will display the total elapsed time that \fBpv\fR has been running for.
.TP
.B \-e, \-\-eta
Turn the ETA countdown on.
This will estimate, based on current transfer rates and the total data size,
how long it will be before completion.
The countdown is prefixed with \*(lqETA\*(rq.
This option will have no effect if the total data size cannot be determined.
.TP
.B \-I, \-\-fineta
Turn the ETA countdown on, but display the estimated local time at which the
transfer will finish, instead of the amount of time remaining.
When the estimated time is more than 6 hours in the future, the date is
shown as well.
The time is prefixed with \*(lqFIN\*(rq for finish time.
As with \*(lq\fB\-\-eta\fR\*(rq, this option will have no effect if the
total data size cannot be determined.
.TP
.B \-r, \-\-rate
Turn the rate counter on.
This will display the current rate of data transfer.
The rate is shown in square brackets \*(lq[]\*(rq.
.TP
.B \-a, \-\-average\-rate
Turn the average rate counter on.
This will display the current average rate of data transfer, over the last
30 seconds by default (see \*(lq\fB\-\-average-rate-window\fR\*(rq).
The average rate is shown in brackets \*(lq()\*(rq.
.TP
.B \-b, \-\-bytes
Turn the total byte counter on.
This will display the total amount of data transferred so far.
.TP
.B \-T, \-\-buffer\-percent
Turn on the transfer buffer percentage display.
This will show the percentage of the transfer buffer in use.
Implies \*(lq\fB\-\-no\-splice\fR\*(rq.
The transfer buffer percentage is shown in curly brackets \*(lq{}\*(rq.
.TP
.BI \-A\ NUM \fR,\ \fB\-\-last\-written\ NUM
Show the last \fINUM\fR bytes written.
Implies \*(lq\fB\-\-no\-splice\fR\*(rq.
.TP
.BI \-F\ FORMAT \fR,\ \fB\-\-format\ FORMAT
Ignore all of the above options and instead use the format string
\fIFORMAT\fR to determine the output format.
See the \fBFORMATTING\fR section below.
.TP
.B \-n, \-\-numeric
Numeric output.
Instead of giving a visual indication of progress, write an integer
percentage, one per line, on standard error, suitable for passing to a tool
such as \fBdialog\fR(1).
Note that \*(lq\fB\-\-force\fR\*(rq is not required if
\*(lq\fB\-\-numeric\fR\*(rq is being used.
.IP
Combining \*(lq\fB\-\-numeric\fR\*(rq with \*(lq\fB\-\-bytes\fR\*(rq will
cause the number of bytes processed so far to be output instead of a
percentage.
Adding \*(lq\fB\-\-line\-mode\fR\*(rq as well as \*(lq\fB\-\-bytes\fR\*(rq
writes the number of lines instead of bytes or a percentage.
Adding \*(lq\fB\-\-rate\fR\*(rq adds the transfer rate to each output line
(if \*(lq\fB\-\-bytes\fR\*(rq is also in use, the rate comes after the
byte/line count).
Adding \*(lq\fB\-\-timer\fR\*(rq prefixes each output line with the elapsed
time so far, as a decimal number of seconds.
.IP
Combining \*(lq\fB\-\-numeric\fR\*(rq with \*(lq\fB\-\-format\fR\*(rq allows
for custom output. The default format string components for
\*(lq\fB\-\-numeric\fR\*(rq are
\*(lq\fB%t\~%b\~%r\~%{progress\-amount\-only}\fR\*(rq in that order, each
item being active or inactive according to the rules above (so the default
with no other options is \*(lq\fB%{progress\-amount\-only}\fR\*(rq).
.TP
.B \-q, \-\-quiet
No output.
Useful if the \*(lq\fB\-\-rate\-limit\fR\*(rq option is being used on its
own to limit the transfer rate of a pipe.
.\"
.SS "Output modifiers"
.TP
.B \-8, \-\-bits
Use bits instead of bytes for the byte and rate counters.
The output suffix will be \*(lqb\*(rq instead of \*(lqB\*(rq.
.TP
.B \-k, \-\-si
Display and interpret suffixes as multiples of 1000 rather than the default
of 1024.
Note that this only takes effect on options after this one, so for
consistency, specify this option first.
.TP
.B \-W, \-\-wait
Wait until the first byte has been transferred before showing any progress
information or calculating any ETAs.
For example, use this option when piping data into tools such as
\fBgpg\fR(1) or \*(lq\fBmysql\~\-p\fR\*(rq so the count only starts after
the password prompt has been answered.
.TP
.BI \-D\ SEC \fR,\ \fB\-\-delay\-start\ SEC
Wait until \fISEC\fR seconds have passed before showing any progress
information, so that a transfer that is over quickly won't display anything.
The value of \fISEC\fR can be a decimal such as \*(lq0.5\*(rq.
.TP
.BI \-s\ SIZE \fR,\ \fB\-\-size\ SIZE
Assume the total amount of data to be transferred is \fISIZE\fR bytes when
calculating percentages and ETAs.
A suffix of \*(lqK\*(rq, \*(lqM\*(rq, \*(lqG\*(rq, or \*(lqT\*(rq can be
added to denote kibibytes (*1024), mebibytes, gibibytes, tebibytes.
If \*(lq\fB\-\-si\fR\*(rq appears before this option, suffixes will denote
kilobytes (*1000), megabytes, and so on instead.
.IP
If \fISIZE\fR starts with \*(lq\fB@\fR\*(rq, the size of file whose name
follows the @ will be used; if that is a directory, the size of all files
under it will be used, like \*(lq\fBdu\~\-\-apparent\-size\~\-b\fR\*(rq.
.TP
.B \-g, \-\-gauge
If the progress bar is shown but the size is not known, then instead of
moving the bar left and right to show progress, show the current transfer
rate as a percentage of the maximum rate seen so far.
.TP
.B \-l, \-\-line\-mode
Instead of counting bytes, count lines (newline characters).
The progress bar will only move when a new line is found, and the value
passed to \*(lq\fB\-\-size\fR\*(rq will be interpreted as a line count.
.IP
If this option is used without \*(lq\fB\-\-size\fR\*(rq, the "total size"
(in this case, total line count) is calculated by reading through all input
files once before transfer starts.
If any inputs are pipes or non-regular files, or are unreadable, the total
size will not be calculated.
.TP
.B \-0, \-\-null
Count lines as terminated with a null byte instead of with a newline.
This option implies \*(lq\fB\-\-line\-mode\fR\*(rq.
.TP
.BI \-i\ SEC \fR,\ \fB\-\-interval\ SEC
Wait \fISEC\fR seconds between updates.
The default is to update every second.
The value of \fISEC\fR can be a decimal such as \*(lq0.1\*(rq.
.TP
.BI \-m\ SEC \fR,\ \fB\-\-average-rate-window\ SEC
Compute current average rate over a \fISEC\fR seconds window for average
rate and ETA calculations.
The default is 30 seconds.
The value must be an integer.
.TP
.BI \-w\ WIDTH \fR,\ \fB\-\-width\ WIDTH
Assume the terminal is \fIWIDTH\fR columns wide, instead of autodetecting
the width (or assuming 80 if detection fails).
If this option is used, the output width will not be adjusted if the width
of the terminal changes while the transfer is running.
.TP
.BI \-H\ HEIGHT \fR,\ \fB\-\-height\ HEIGHT
Assume the terminal is \fIHEIGHT\fR rows high, instead of autodetecting
the height (or assuming 25 if detection fails).
If this option is used, the output height will not be adjusted if the height
of the terminal changes while the transfer is running.
.TP
.BI \-N\ NAME \fR,\ \fB\-\-name\ NAME
Prefix the output information with \fINAME\fR.
Often used with \*(lq\fB\-\-cursor\fR\*(rq to identify each progress bar in
a pipeline containing more than one \fBpv\fR.
.TP
.BI \-u\ STYLE \fR,\ \fB\-\-bar\-style\ STYLE
Change the default progress bar style shown by \*(lq\fB\-\-progress\fR\*(rq,
or by the \*(lq\fB\-\-format\fR\*(rq sequences \*(lq\fB%{progress}\fR\*(rq
or \*(lq\fB%{progress\-bar\-only}\fR\*(rq, to \fISTYLE\fR.
The \fISTYLE\fR can be one of \fBplain\fR (the default), \fBblock\fR,
\fBgranular\fR, or \fBshaded\fR.
These styles are described in the \fBFORMATTING\fR section below.
.TP
.BI \-x\ SPEC \fR,\ \fB\-\-extra\-display\ SPEC
As well as displaying progress to the terminal, also write it to \fISPEC\fR.
The \fISPEC\fR must start with a comma-separated list of destinations, and
can optionally be followed by a colon and a format string.
The destinations can be \fBwindowtitle\fR or \fBwindow\fR for the xterm
window title, and \fBprocesstitle\fR, \fBproctitle\fR, \fBprocess\fR, or
\fBproc\fR for the process title displayed by \fBps\fR(1).
If a format string is not supplied, the same format is used as for the
terminal.
For example, \*(lq\fB\-x\~'window,process:%t\~%b\~%r'\fR\*(rq will show the
elapsed time, bytes transferred, and rate, in both the window title and the
process title.
.TP
.B \-v, \-\-stats
At the end of the transfer, write an additional line showing the transfer
rate minimum, mean, maximum, and standard deviation.
The values are always in bytes per second (or bits, with
\*(lq\fB\-\-bits\fR\*(rq).
.TP
.B \-f, \-\-force
Force output.
Normally, \fBpv\fR will not output any visual display if standard error is
not a terminal.
This option forces it to do so.
.TP
.B \-c, \-\-cursor
Use cursor positioning escape sequences to move to the initial terminal row
when updating the display, instead of only using carriage returns.
This allows multiple \fBpv\fR instances to show progress on the same
terminal together.
.IP
For example:
.IP
.in +4
.EX
pv --cursor --name input file.gz | gzip -d | pv --cursor --name output > file
.EE
.in
.IP
As the example shows, this is often used with \*(lq\fB\-\-name\fR\*(rq.
.\"
.SS "Data transfer modifiers"
.TP
.BI \-o\ FILE \fR,\ \fB\-\-output\ FILE
Write data to \fIFILE\fR instead of standard output.
If the file already exists, it will be truncated.
.TP
.BI \-L\ RATE \fR,\ \fB\-\-rate-limit\ RATE
Limit the transfer to a maximum of \fIRATE\fR bytes per second.
The same suffixes as \*(lq\fB\-\-size\fR\*(rq can be used.
Decimal values are allowed.
Specifying 0 will turn off rate limiting, which is useful with
\*(lq\fB\-\-remote\fR\*(rq.
.TP
.BI \-B\ BYTES \fR,\ \fB\-\-buffer-size\ BYTES
Use a transfer buffer size of \fIBYTES\fR bytes.
The same suffixes as \*(lq\fB\-\-size\fR\*(rq can be used.
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.
This can be useful on platforms like macOS with pipelines that perform
better with specific buffer sizes such as 1024.
Implies \*(lq\fB\-\-no\-splice\fR\*(rq.
.TP
.B \-C, \-\-no-splice
Prevent the use of \fBsplice\fR(2) and \fBcopy_file_range\fR(2), which are
normally used on systems that support it to improve efficiency by
eliminating the need for a transfer buffer.
.IP
In the default case that \fBsplice\fR(2) or \fBcopy_file_range\fR(2) are
used, the lack of a transfer buffer prevents
\*(lq\fB\-\-buffer\-percent\fR\*(rq and
\*(lq\fB\-\-last\-written\fR\*(rq from working and makes
\*(lq\fB\-\-buffer\-size\fR\*(rq redundant, so using any of those options
automatically switches on \*(lq\fB\-\-no\-splice\fR\*(rq.
.IP
Sparse files cannot be written with \fBsplice\fR(2) or
\fBcopy_file_range\fR(2), so using
\*(lq\fB\-\-sparse\fR\*(rq automatically switches on
\*(lq\fB\-\-no\-splice\fR\*(rq.
.IP
Switching on \*(lq\fB\-\-no\-splice\fR\*(rq results in a small loss of
transfer efficiency.
It has no effect on systems where \fBsplice\fR(2) and
\fBcopy_file_range\fR(2) are unavailable.
.TP
.BI \-J\ BYTES \fR,\ \fB\-\-pipe\-buffer\-size\ BYTES
Attempt to set the size of the output pipe buffer, and the intermediate
input pipe buffer if one is needed, to \fIBYTES\fR bytes.
This will silently do nothing if the requested size cannot be achieved.
If this option is not specified, and both the output and the first input are
pipes, then the output pipe buffer size will automatically be increased to
match the input pipe buffer, if it was smaller.
.TP
.B \-E, \-\-skip-errors
Ignore read errors by attempting to skip past the offending sections.
The corresponding parts of the output will be null bytes.
At first only a few bytes will be skipped, but if there are many errors in a
row then the skips will move up to chunks of 512.
This is intended to be similar to \*(lq\fIdd\~conv=sync,noerror\fR\*(rq.
.IP
Specify \*(lq\fB\-\-skip\-errors\fR\*(rq twice to only report a read error
once per file, instead of reporting each byte range skipped.
.TP
.BI \-Z\ BYTES \fR,\ \fB\-\-error\-skip\-block\ BYTES
When ignoring read errors with \*(lq\fB\-\-skip\-errors\fR\*(rq, instead of
trying to adaptively skip by reading small amounts and skipping
progressively larger sections until a read succeeds, move to the next file
block of \fIBYTES\fR bytes as soon as an error occurs.
There may still be some shorter skips where the block being skipped
coincides with the end of the transfer buffer.
The same suffixes as \*(lq\fB\-\-size\fR\*(rq can be used.
.IP
This option can only be used with \*(lq\fB\-\-skip\-errors\fR\*(rq
and is intended for use when reading from a block device, such as
\*(lq\fB\-\-skip\-errors\~\-\-error\-skip\-block\~4K\fR\*(rq
to skip in 4 kibibyte blocks.
This will speed up reads from faulty media, at the expense of potentially
losing more data.
.TP
.B \-S, \-\-stop-at-size
If a size was specified with \*(lq\fB\-\-size\fR\*(rq, stop transferring
data once that many bytes have been written, instead of continuing to the
end of input.
.TP
.B \-Y, \-\-sync
After every write operation, synchronise the buffer caches to disk with
\fBsync\fR(2), or \fBfdatasync\fR(2) if possible.
This has no effect when the output is a pipe.
Using \*(lq\fB\-\-sync\fR\*(rq may improve the accuracy of the progress bar
when writing to a slow disk.
.TP
.B \-K, \-\-direct-io
Set the \fBO_DIRECT\fR flag on all inputs and outputs, if it is available.
This will minimise the effect of caches, at the cost of performance.
Due to memory alignment requirements, it also may cause read or write
failures with an error of \*(lqInvalid argument\*(rq, especially if reading
and writing files across a variety of filesystems in a single \fBpv\fR call.
Use this option with caution.
.TP
.B \-O, \-\-sparse
When writing null bytes, try to seek, producing a sparse output file.
Implies \*(lq\fB\-\-no\-splice\fR\*(rq.
On filesystems without sparse file support, or when the output is not
seekable, this option will have no effect other than to turn on
\*(lq\fB\-\-no\-splice\fR\*(rq.
.TP
.B \-X, \-\-discard
Instead of transferring input data to standard output, discard it.
This is equivalent to redirecting standard output to \fI/dev/null\fR,
except that \fBwrite\fR(2) is never called.
.TP
.BI \-U\ FILE \fR,\ \fB\-\-store\-and\-forward\ FILE
Instead of passing data through immediately, do it in two stages - first
read all input and write it to \fIFILE\fR, and then once the input is
exhausted, read all of \fIFILE\fR and write it to the output.
\fIFILE\fR remains in place afterwards, unless it is
\*(lq\fB-\fR\*(rq, in which case \fBpv\fR creates a temporary file for this
purpose, and automatically removes it afterwards.
.IP
A common use for this is this where one part of a pipeline generates data
quickly but of unknown size, and the next part processes it slowly.
With \*(lq\fIquick\fR\~\fB|\~pv\~\-U\~\-\~|\fR\~\fIslow\fR\*(rq, a progress
bar is displayed with unknown size for the \fIquick\fR part, then a second
is shown with a known size and ETA for the \fIslow\fR part.
.\"
.\"
.SS "Alternative operating modes"
.TP
\fB\-d\fR, \fB\-\-watchfd\fR \fIPID\fR[:\fIFD\fR]|=\fINAME\fR|@\fILISTFILE\fR...
Instead of transferring data, watch file descriptor \fIFD\fR of process
\fIPID\fR, and show its progress.
Other data transfer modifiers - and remote control - may not be used with
this option.
.IP
If a \fIPID\fR is specified without an \fIFD\fR, then that process will be
watched, and all regular files and block devices it opens will be shown with
a progress bar.
.IP
If a \fINAME\fR is specified, prefixed with "=", then processes with that
name will be found with \fBpgrep\fR(1), and as watched described above.
.IP
If a \fILISTFILE\fR is specified, prefixed with "@", the lines in that file
will be used as additional arguments.
.IP
All remaining non-option arguments will also be treated as additional
arguments.
.IP
The \fBpv\fR process will exit when all \fIFD\fRs have either changed to a
different file, changed read/write mode, or have closed, and all \fIPID\fRs
(without a specific \fIFD\fR) have exited.
.TP
.BI \-R\ PID \fR,\ \fB\-\-remote\ PID
Remotely control another instance of \fBpv\fR with process ID \fIPID\fR,
making it act as though it had been given this instance's command line.
For example, if \*(lq\fBpv\~\-\-rate\-limit\~123K\fR\*(rq is running with
process ID 9876, then running
\*(lq\fBpv\~\-\-remote\~9876\~\-\-rate\-limit\~321K\fR\*(rq will cause
process 9876 to start using a rate limit of 321KiB instead of 123KiB.
Note that some options cannot be changed while running, such as
\*(lq\fB\-\-cursor\fR\*(rq, \*(lq\fB\-\-line\-mode\fR\*(rq,
\*(lq\fB\-\-force\fR\*(rq, \*(lq\fB\-\-delay\-start\fR\*(rq,
\*(lq\fB\-\-skip\-errors\fR\*(rq, and \*(lq\fB\-\-stop\-at\-size\fR\*(rq.
.TP
.BI \-Q\ PID \fR,\ \fB\-\-query\ PID
Display the transfer progress of another instance of \fBpv\fR with process
ID \fIPID\fR, owned by the same user.
.IP
Some output modifiers can only be used while querying another process if
they match those of that process - such as
\*(lq\fB\-\-line\-mode\fR\*(rq,
\*(lq\fB\-\-null\fR\*(rq, and
\*(lq\fB\-\-average\-rate\-window\fR\*(rq.
Data transfer modifiers will have no effect.
.TP
.BR \-M " \fISIDE\fR, " \-\-monitor " \fISIDE\fR"
Run the command specified by the remaining arguments, and monitor its
standard input, its standard output, or both, depending on whether
\fISIDE\fR is \*(lq\fBin\fR\*(rq, \*(lq\fBout\fR\*(rq, or
\*(lq\fBboth\fR\*(rq.
Use \*(lq\fB\-\-\fR\*(rq after all of the \fBpv\fR options to keep the
monitored command's options separate.
.IP
With a \fISIDE\fR of \*(lq\fBboth\fR\*(rq, two progress bars will be shown.
All of \fBpv\fR's display switches, output modifiers, and data transfer
modifiers will apply to both sides.
.IP
For example,
\*(lq\fBpv\~\-\-cursor\~\-\-monitor\~both\~\-\-\~gzip\~\-9\fR\*(rq is
equivalent to
\*(lq\fBpv\~\-\-cursor\~|\~gzip\~\-9\~|\~pv\~\-\-cursor\fR\*(rq, except that
the latter can't show the input:output ratio.
.IP
The \*(lq\fB\-\-format\fR\*(rq and \*(lq\fB\-\-name\fR\*(rq options may be
specified twice, in which case the first one applies to the input side and
the second applies to the output side.
If no \*(lq\fB\-\-format\fR\*(rq options are specified, the default format
based on the other display switches is used as normal, except that the
ratio is added to the output side when \fISIDE\fR is \*(lq\fBboth\fR\*(rq.
.IP
The values \*(lq\fB0\fR\*(rq, \*(lq\fB1\fR\*(rq, and \*(lq\fB2\fR\*(rq may
be used as synonyms for \*(lq\fBin\fR\*(rq, \*(lq\fBout\fR\*(rq, and
\*(lq\fBboth\fR\*(rq.
.IP
This option cannot be used with \*(lq\fB\-\-store\-and\-forward\*(rq.
.\"
.SS "Other options"
.TP
.BI \-P\ FILE \fR,\ \fB\-\-pidfile\ FILE
Save the process ID of \fBpv\fR in \fIFILE\fR.
The file will be replaced if it already exists, and will be removed when
\fBpv\fR exits.
While \fBpv\fR is running, \fIFILE\fR will contain a single number - the
process ID of \fBpv\fR - followed by a newline.
.TP
.B \-h, \-\-help
Print a usage message on standard output and exit successfully.
.TP
.B \-V, \-\-version
Print version information on standard output and exit successfully.
.\"
.SH FORMATTING
Format strings used by \*(lq\fB\-\-format\fR\*(rq and
\*(lq\fB\-\-extra\-display\fR\*(rq can contain the following sequences:
.TP
.BR %p ", " %{progress}
Progress bar (suffixed with a percentage if the size is known).
Equivalent to \*(lq\fB\-\-progress\fR\*(rq.
Expands to fill the remaining space unless prefixed by a number to set the
width, such as \*(lq\fB%20p\fR\*(rq or \*(lq\fB%20{progress}\fR\*(rq.
.TP
.BR %{progress\-bar\-only}
Progress bar, without any sides, and without any percentage displayed
afterwards.
Expands to fill the remaining space unless prefixed by a number.
.TP
.B %{progress\-amount\-only}
The percentage completion (or maximum rate, with \*(lq\fB\-\-gauge\fR\*(rq
when the size is unknown).
.TP
.B %{bar\-plain}
Progress bar in the standard plain format, without any sides, and without
any percentage displayed afterwards.
Expands to fill the remaining space unless prefixed by a number.
.TP
.B %{bar\-block}
Progress bar using Unicode full blocks, without any sides, and without any
percentage displayed afterwards.
Expands to fill the remaining space unless prefixed by a number.
If UTF-8 output is not available, the plain format is used.
.TP
.B %{bar\-granular}
Progress bar using Unicode full blocks, and 1/8th blocks for partial fills,
providing a more granular display.
Like the other \*(lq%{bar}\*(rq strings this shows the bar without any
sides, and without any percentage displayed afterwards, and expands to fill
the remaining space unless prefixed by a number.
If UTF-8 output is not available, the plain format is used.
.TP
.B %{bar\-shaded}
Progress bar using Unicode full blocks and shade characters - dark and
medium shade are used for partial fills, and the light shade is used for the
background.
Like the other \*(lq%{bar}\*(rq strings this shows the bar without any
sides, and without any percentage displayed afterwards, and expands to fill
the remaining space unless prefixed by a number.
If UTF-8 output is not available, the plain format is used.
.TP
.BR %t ", " %{timer}
Elapsed time.
Equivalent to \*(lq\fB\-\-timer\fR\*(rq.
.TP
.BR %e ", " %{eta}
ETA as time remaining.
Equivalent to \*(lq\fB\-\-eta\fR\*(rq.
.TP
.BR %I ", " %{fineta}
ETA as local time at which the transfer will finish.
Equivalent to \*(lq\fB\-\-fineta\fR\*(rq.
.TP
.BR %r ", " %{rate}
Current data transfer rate.
Equivalent to \*(lq\fB\-\-rate\fR\*(rq.
.TP
.BR %a ", " %{average\-rate}
Average data transfer rate.
Equivalent to \*(lq\fB\-\-average\-rate\fR\*(rq.
.TP
.BR %b ", " %{bytes} ", " %{transferred}
Bytes transferred so far (or lines if \*(lq\fB\-\-line\-mode\fR\*(rq was specified).
Equivalent to \*(lq\fB\-\-bytes\fR\*(rq.
If \*(lq\fB\-\-bits\fR\*(rq was specified, \*(lq\fB%b\fR\*(rq shows the bits
transferred so far, not bytes.
.TP
.B %{ratio}
Show the ratio of bytes transferred by the other side to the bytes
transferred by this side, in \*(lq\fB\-\-monitor\~both\fR\*(rq mode.
.TP
.BR %T ", " %{buffer\-percent}
Percentage of the transfer buffer in use.
Equivalent to \*(lq\fB\-\-buffer\-percent\fR\*(rq, but using it does not
turn on \*(lq\fB\-\-no\-splice\fR\*(rq.
.IP
If the transfer is using \fBsplice\fR(2), displays \*(lq{\-\-\-\-}\*(rq; if
the transfer is using \fBsplice\fR(2) via an intermediate input pipe,
displays \*(lq{\-||\-}\*(rq; and if the transfer is using
\fBcopy_file_range\fR(2), displays \*(lq{\-\-\->}\*(rq.
.TP
.BR %nA ", " %n{last\-written}
Show the last \fIn\fR bytes written (for example, \*(lq\fB%16A\fR\*(rq shows
the last 16 bytes).
Shows only dots if the transfer is using \fBsplice\fR(2) or
\fBcopy_file_range\fR(2), since these transfer modes do not use the buffer.
.TP
.BR %nL ", " %n{previous\-line}
Show the first \fIn\fR bytes of the most recently written line (for example,
\*(lq\fB%40L\fR\*(rq shows the first 40 bytes).
If no \fIn\fR is given, then this expands to fill the available space.
Shows only spaces if the transfer is using \fBsplice\fR(2) or
\fBcopy_file_range\fR(2).
.TP
.BR %N ", " %{name}
Show the name prefix given by \*(lq\fB\-\-name\fR\*(rq.
Padded to 9 characters with spaces, and suffixed with \*(lq:\*(rq.
.TP
.B %{sgr:colour,...}
Emit ECMA-48 SGR (Select Graphic Rendition) codes if the terminal supports
colours, where \fIcolour,...\fR is a comma-separated list of any of the
keywords below, or the numeric values from \fBconsole_codes\fR(4). If
colour support is not available, nothing is emitted.
.IP
Supported keywords are:
\fBreset\fR or \fBnone\fR,
\fBblack\fR,
\fBred\fR,
\fBgreen\fR,
\fBbrown\fR or \fByellow\fR,
\fBblue\fR,
\fBmagenta\fR,
\fBcyan\fR,
\fBwhite\fR,
\fBfg\-black\fR,
\fBfg\-red\fR,
\fBfg\-green\fR,
\fBfg\-brown\fR or \fBfg\-yellow\fR,
\fBfg\-blue\fR,
\fBfg\-magenta\fR,
\fBfg\-cyan\fR,
\fBfg\-white\fR,
\fBfg\-default\fR,
\fBbg\-black\fR,
\fBbg\-red\fR,
\fBbg\-green\fR,
\fBbg\-brown\fR or \fBbg\-yellow\fR,
\fBbg\-blue\fR,
\fBbg\-magenta\fR,
\fBbg\-cyan\fR,
\fBbg\-white\fR,
\fBbg\-default\fR,
\fBbold\fR,
\fBdim\fR,
\fBitalic\fR,
\fBunderscore\fR or \fBunderline\fR,
\fBblink\fR,
\fBreverse\fR,
\fBno\-bold\fR or \fBno\-dim\fR,
\fBno\-italic\fR,
\fBno\-underscore\fR or \fBno\-underline\fR,
\fBno\-blink\fR,
\fBno\-reverse\fR.
.IP
With colours, the optional "fg-" prefix indicates foreground; a prefix of
"bg-" indicates background.
.IP
For example, \*(lq\fB%{sgr:green,bold}TEXT%{sgr:reset}\fR\*(lq will make
\fITEXT\fR bold green on supported terminals.
.TP
.B %%
A single \*(lq%\*(rq.
.PP
Any other contents are reproduced in the progress display as-is.
.PP
The format string equivalent of the default display switches is
\*(lq\fB%b\~%t\~%r\~%p\~%e\fR\*(rq.
.\"
.SH EXAMPLES
Some suggested common switch combinations:
.TP
.B pv \-ptebar
Show a progress bar, elapsed time, estimated completion time, byte counter,
average rate, and current rate.
.TP
.B pv \-betlap
Show a progress bar, elapsed time, estimated completion time, line counter,
and average rate, counting lines instead of bytes.
.TP
.B pv \-btrpg
Show the amount transferred, elapsed time, current rate, and a gauge showing
the current rate as a percentage of the maximum rate seen - useful in a
pipeline where the total size is unknown.
(If the size \fIis\fR known, these options will show the percentage
completion instead of the rate gauge).
.TP
.B pv \-t
Show only the elapsed time - useful as a simple timer, such as
\*(lq\fBsleep\~10m\~|\~pv\~\-t\fR\*(rq.
.TP
.B pv \-pterb
The default behaviour: progress bar, elapsed time, estimated completion
time, current rate, and byte counter.
.PP
On macOS, it may be useful to specify \*(lq\fB\-\-buffer\-size\~1024\fR\*(rq
in a pipeline, as this may improve performance.
.PP
To watch how quickly a file is transferred using \fBnc\fR(1):
.PP
.in +4
.EX
pv file | nc \-w 1 somewhere.com 3000
.EE
.in
.PP
A similar example, transferring a file from another process and passing the
expected size to \fBpv\fR:
.PP
.in +4
.EX
cat file | pv \-\-size 12345 | nc \-w 1 somewhere.com 3000
.EE
.in
.PP
To watch the progress of creating a tar.gz archive:
.PP
.in +4
.EX
tar cf \- directory/ \e
| pv \-\-size $(du \-sb directory/ | awk '{print $1}') \e
| gzip \-9 \e
> out.tar.gz
.EE
.in
.PP
An alternative way of doing the same thing:
.PP
.in +4
.EX
tar cf \- directory/ \e
| pv \-\-size @directory/ \e
| gzip \-9 \e
> out.tar.gz
.EE
.in
.PP
Taking an image of a disk, skipping errors:
.PP
.in +4
.EX
pv \-EE /dev/your/disk/device > disk-image.img
.EE
.in
.PP
Writing an image back to a disk:
.PP
.in +4
.EX
pv disk-image.img > /dev/your/disk/device
.EE
.in
.PP
Zeroing a disk:
.PP
.in +4
.EX
pv < /dev/zero > /dev/your/disk/device
.EE
.in
.PP
Note that if the input size cannot be calculated, and the output is a block
device, then the size of the block device will be used and \fBpv\fR will
automatically stop at that size as if \*(lq\fB\-\-stop\-at\-size\fR\*(rq had
been given.
.PP
(Linux and macOS only): Watching file descriptor 3 opened by another process 1234:
.PP
.in +4
.EX
pv \-\-watchfd 1234:3
.EE
.in
.PP
(Linux and macOS only): Watching all file descriptors used by process 1234:
.PP
.in +4
.EX
pv \-\-watchfd 1234
.EE
.in
.PP
Rate-limiting the transfer between two processes in a pipeline, with no
display:
.PP
.in +4
.EX
producer | pv \-\-quiet \-\-rate\-limit 1M | consumer
.EE
.in
.PP
Sending logs to a processing script, showing the most recent line as part of
the progress display:
.PP
.in +4
.EX
pv \-\-no\-splice \-\-format '%a %p : %L' big.log | processing-script
.EE
.in
.PP
Showing progress as lines of JSON data:
.PP
.in +4
.EX
pv \-\-numeric \-\-format '{"elapsed":%t,"bytes":%b,"rate":%r,"percentage":%{progress-amount-only}}' big.log | processing-script
.EE
.in
.\"
.SH EXIT STATUS
An exit status of 1 indicates a problem with the \*(lq\fB\-\-remote\fR\*(rq,
\*(lq\fB\-\-query\fR\*(rq, \*(lq\fB\-\-pidfile\fR\*(rq, or
\*(lq\fB\-\-monitor\fR\*(rq options.
.PP
Any other exit status is a bitmask of the following:
.TP 5
\~\fB2\fR
One or more files could not be accessed, \fBstat\fR(2)ed, or opened.
.TP
\~\fB4\fR
An input file was the same as the output file.
.TP
\~\fB8\fR
Internal error with closing a file or moving to the next file.
.TP
\~\fB16\fR
There was an error while transferring data from one or more input files.
.TP
\~\fB32\fR
A signal was caught that caused an early exit.
.TP
\~\fB64\fR
Memory allocation failed.
.PP
A zero exit status indicates no problems.
.\"
.SH ENVIRONMENT
The following environment variables may affect \fBpv\fR:
.TP
.B HOME
The current user's home directory.
This may be used by \*(lq\fB\-\-remote\fR\*(rq and \*(lq\fB\-\-query\fR\*(rq
to exchange messages between \fBpv\fR instances: if the \fI/run/user/UID/\fR
directory does not exist (where \fIUID\fR is the current user ID), then
\fI$HOME/.pv/\fR will be used instead.
.TP
.BR TMPDIR ", " TMP
The directory to create per-tty lock files for the terminal when using
\*(lq\fB\-\-cursor\fR\*(rq.
If \fBTMPDIR\fR is set to a non-empty value, it is the directory under which
lock files are created.
Otherwise, \fBTMP\fR is used.
If neither are set, then \fI/tmp\fR is used.
.\"
.SH NOTES
In some versions of \fBbash\fR(1) and \fBzsh\fR(1), the construct
\*(lq\fB<(pv\~filename)\fR\*(rq 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 \*(lq\fB\-\-force\fR\*(rq.
.PP
If \fBpv\fR is used in a pipeline in \fBzsh\fR version 5.8, and the last
command in the pipeline is based on shell builtins, \fBzsh\fR takes control
of the terminal away from \fBpv\fR, preventing progress from being
displayed.
For example, this will produce no progress bar:
.PP
.in +4n
.EX
pv InputFile | { while read \-r line; do sleep 0.1; done; }
.EE
.in
.PP
To work around this, put the last commands of the pipeline in
normal brackets to force the use of a subshell:
.PP
.in +4n
.EX
pv InputFile | ( while read \-r line; do sleep 0.1; done; )
.EE
.in
.PP
Refer to
.UR https://codeberg.org/ivarch/pv/issues/105
issue #105
.UE
for full details.
.PP
The \*(lq\fB\-\-remote\fR\*(rq and \*(lq\fB\-\-query\fR\*(rq options require
that either \fI/run/user/<uid>/\fR or \fI$HOME/\fR can be written to, for
inter-process communication.
.PP
The \*(lq\fB\-\-size\fR\*(rq option has no effect if used with
\*(lq\fB\-\-watchfd\fR\~\fIPID\fR\*(rq to watch all file descriptors of a
process, but will work with \*(lq\fB\-\-watchfd\fR\~\fIPID\fR:\fIFD\fR\*(rq
to watch a single file descriptor.
.PP
If the input size cannot be calculated, and the output is a block device,
then \fBpv\fR will read the output device's size, use that as if it had been
passed to \*(lq\fB\-\-size\fR\*(rq, and activate
\*(lq\fB\-\-stop\-at\-size\fR\*(rq.
.PP
The \*(lq\fB%nA\fR\*(rq and \*(lq\fB%nL\fR\*(rq format sequences may not be
effective with small input files, and \*(lq\fB%nL\fR\*(rq may be a few lines
out due to buffering within the pipeline itself.
.PP
Numbers passed to \*(lq\fB\-\-size\fR\*(rq,
\*(lq\fB\-\-buffer\-size\fR\*(rq, \*(lq\fB\-\-pipe\-buffer\-size\fR\*(rq,
and \*(lq\fB\-\-error\-skip\-block\fR\*(rq may all be expressed as decimals
if followed by a suffix, so for example \*(lq\fI\-\-size\~1.5G\fR\*(rq is
equivalent to \*(lq\fI\-\-size\~1536M\fR\*(rq.
.PP
Numbers passed to \*(lq\fB\-\-rate\-limit\fR\*(rq may be expressed as
decimals with or without a suffix.
.PP
Numbers passed to \*(lq\fB\-\-interval\fR\*(rq and
\*(lq\fB\-\-delay\-start\fR\*(rq may be integers or decimals, but may not
have a suffix.
.PP
Numbers passed to \*(lq\fB\-\-last\-written\fR\*(rq,
\*(lq\fB\-\-width\fR\*(rq, \*(lq\fB\-\-height\fR\*(rq,
\*(lq\fB\-\-average\-rate\-window\fR\*(rq, \*(lq\fB\-\-remote\fR\*(rq, and
\*(lq\fB\-\-query\fR\*(rq must be integers with no suffix.
.PP
When \*(lq\fB\-\-sparse\fR\*(rq is in effect and output is being written to
a file, that file may look like it has stopped growing if inspected with
\fBls\fR(1) while null bytes are being written, even though \fBpv\fR still
reports progress.
This is because of the way sparse output is achieved, and the file will be
the correct size when the transfer ends.
.\"
.SH REPORTING BUGS
Please report bugs or feature requests via the issue tracker linked from the
.UR https://ivarch.com/p/pv
\fBpv\fR home page
.UE .
.\"
.SH "SEE ALSO"
.BR cat (1),
.BR splice (2),
.BR copy_file_range (2),
.BR fsync (2),
.BR fdatasync (2),
.BR open (2)
(for \fBO_DIRECT\fR),
.BR console_codes (4)
.\"
.SH COPYRIGHT
Copyright \(co 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood.
.PP
License GPLv3+:
.UR https://www.gnu.org/licenses/gpl-3.0.html
GNU GPL version 3 or later
.UE .
.PP
This is free software: you are free to change and redistribute it. There is
NO WARRANTY, to the extent permitted by law.
.PP
Please see the package's ACKNOWLEDGEMENTS file for a complete list of
contributors.
+885
View File
@@ -0,0 +1,885 @@
# NAME
pv - monitor and manage the progress of data through a pipe
# SYNOPSIS
**pv** \[*OPTION*\]\... \[*FILE*\]\...
**pv** \[*OPTION*\]\... **-d**\|**\--watchfd**
*PID*\[:*FD*\]\|=*NAME*\|@*LISTFILE*\...
**pv** **-R**\|**\--remote** *PID* \[*OPTION*\]\...
**pv** **-Q**\|**\--query** *PID* \[*OPTION*\]\...
**pv** \[*OPTION*\]\... **-M**\|**\--monitor** *SIDE* \-- *COMMAND*
[*ARGS*\]\...
# DESCRIPTION
Show the progress of data through a pipeline by giving information such
as time elapsed, percentage completed (with progress bar), current
throughput rate, total data transferred, and ETA. The data flow rate,
error handling strategy, buffer size, and cache interaction can all be
adjusted.
Each *FILE* is copied to standard output. With no *FILE*, or when *FILE*
is "-", standard input is read.
In "**\--watchfd**" mode, inspect another process and show its progress
through the files it has open.
In "**\--monitor**" mode, run a command and display the progress of data
through both its standard input and its standard output.
# OPTIONS
## Display switches
If no display switches are specified, **pv** behaves as if
"**\--progress**", "**\--timer**", "**\--eta**", "**\--rate**", and
"**\--bytes**" had been given. Otherwise, only those display types that
are explicitly switched on will be shown.
**-p, \--progress**
: Turn the progress bar on. If any inputs are not files, or are
unreadable, and no size was explicitly given with "**\--size**", the
progress bar cannot indicate how close to completion the transfer
is, so it will just move left and right to indicate that data is
moving - or, with "**\--gauge**", the bar will indicate the current
rate as a percentage of the maximum rate seen so far.
**-t, \--timer**
: Turn the timer on. This will display the total elapsed time that
**pv** has been running for.
**-e, \--eta**
: Turn the ETA countdown on. This will estimate, based on current
transfer rates and the total data size, how long it will be before
completion. The countdown is prefixed with "ETA". This option will
have no effect if the total data size cannot be determined.
**-I, \--fineta**
: Turn the ETA countdown on, but display the estimated local time at
which the transfer will finish, instead of the amount of time
remaining. When the estimated time is more than 6 hours in the
future, the date is shown as well. The time is prefixed with "FIN"
for finish time. As with "**\--eta**", this option will have no
effect if the total data size cannot be determined.
**-r, \--rate**
: Turn the rate counter on. This will display the current rate of data
transfer. The rate is shown in square brackets "\[\]".
**-a, \--average-rate**
: Turn the average rate counter on. This will display the current
average rate of data transfer, over the last 30 seconds by default
(see "**\--average-rate-window**"). The average rate is shown in
brackets "()".
**-b, \--bytes**
: Turn the total byte counter on. This will display the total amount
of data transferred so far.
**-T, \--buffer-percent**
: Turn on the transfer buffer percentage display. This will show the
percentage of the transfer buffer in use. Implies
"**\--no-splice**". The transfer buffer percentage is shown in curly
brackets "{}".
**-A NUM, \--last-written NUM**
: Show the last *NUM* bytes written. Implies "**\--no-splice**".
**-F FORMAT, \--format FORMAT**
: Ignore all of the above options and instead use the format string
*FORMAT* to determine the output format. See the **FORMATTING**
section below.
**-n, \--numeric**
: Numeric output. Instead of giving a visual indication of progress,
write an integer percentage, one per line, on standard error,
suitable for passing to a tool such as **dialog**(1). Note that
"**\--force**" is not required if "**\--numeric**" is being used.
Combining "**\--numeric**" with "**\--bytes**" will cause the number
of bytes processed so far to be output instead of a percentage.
Adding "**\--line-mode**" as well as "**\--bytes**" writes the
number of lines instead of bytes or a percentage. Adding
"**\--rate**" adds the transfer rate to each output line (if
"**\--bytes**" is also in use, the rate comes after the byte/line
count). Adding "**\--timer**" prefixes each output line with the
elapsed time so far, as a decimal number of seconds.
Combining "**\--numeric**" with "**\--format**" allows for custom
output. The default format string components for "**\--numeric**"
are "**%t %b %r %{progress-amount-only}**" in that order, each item
being active or inactive according to the rules above (so the
default with no other options is "**%{progress-amount-only}**").
**-q, \--quiet**
: No output. Useful if the "**\--rate-limit**" option is being used on
its own to limit the transfer rate of a pipe.
## Output modifiers
**-8, \--bits**
: Use bits instead of bytes for the byte and rate counters. The output
suffix will be "b" instead of "B".
**-k, \--si**
: Display and interpret suffixes as multiples of 1000 rather than the
default of 1024. Note that this only takes effect on options after
this one, so for consistency, specify this option first.
**-W, \--wait**
: Wait until the first byte has been transferred before showing any
progress information or calculating any ETAs. For example, use this
option when piping data into tools such as **gpg**(1) or
"**mysql -p**" so the count only starts after the password prompt
has been answered.
**-D SEC, \--delay-start SEC**
: Wait until *SEC* seconds have passed before showing any progress
information, so that a transfer that is over quickly won\'t display
anything. The value of *SEC* can be a decimal such as "0.5".
**-s SIZE, \--size SIZE**
: Assume the total amount of data to be transferred is *SIZE* bytes
when calculating percentages and ETAs. A suffix of "K", "M", "G", or
"T" can be added to denote kibibytes (\*1024), mebibytes, gibibytes,
tebibytes. If "**\--si**" appears before this option, suffixes will
denote kilobytes (\*1000), megabytes, and so on instead.
If *SIZE* starts with "**@**", the size of file whose name follows
the @ will be used; if that is a directory, the size of all files
under it will be used, like "**du \--apparent-size -b**".
**-g, \--gauge**
: If the progress bar is shown but the size is not known, then instead
of moving the bar left and right to show progress, show the current
transfer rate as a percentage of the maximum rate seen so far.
**-l, \--line-mode**
: Instead of counting bytes, count lines (newline characters). The
progress bar will only move when a new line is found, and the value
passed to "**\--size**" will be interpreted as a line count.
If this option is used without "**\--size**", the \"total size\" (in
this case, total line count) is calculated by reading through all
input files once before transfer starts. If any inputs are pipes or
non-regular files, or are unreadable, the total size will not be
calculated.
**-0, \--null**
: Count lines as terminated with a null byte instead of with a
newline. This option implies "**\--line-mode**".
**-i SEC, \--interval SEC**
: Wait *SEC* seconds between updates. The default is to update every
second. The value of *SEC* can be a decimal such as "0.1".
**-m SEC, \--average-rate-window SEC**
: Compute current average rate over a *SEC* seconds window for average
rate and ETA calculations. The default is 30 seconds. The value must
be an integer.
**-w WIDTH, \--width WIDTH**
: Assume the terminal is *WIDTH* columns wide, instead of
autodetecting the width (or assuming 80 if detection fails). If this
option is used, the output width will not be adjusted if the width
of the terminal changes while the transfer is running.
**-H HEIGHT, \--height HEIGHT**
: Assume the terminal is *HEIGHT* rows high, instead of autodetecting
the height (or assuming 25 if detection fails). If this option is
used, the output height will not be adjusted if the height of the
terminal changes while the transfer is running.
**-N NAME, \--name NAME**
: Prefix the output information with *NAME*. Often used with
"**\--cursor**" to identify each progress bar in a pipeline
containing more than one **pv**.
**-u STYLE, \--bar-style STYLE**
: Change the default progress bar style shown by "**\--progress**", or
by the "**\--format**" sequences "**%{progress}**" or
"**%{progress-bar-only}**", to *STYLE*. The *STYLE* can be one of
**plain** (the default), **block**, **granular**, or **shaded**.
These styles are described in the **FORMATTING** section below.
**-x SPEC, \--extra-display SPEC**
: As well as displaying progress to the terminal, also write it to
*SPEC*. The *SPEC* must start with a comma-separated list of
destinations, and can optionally be followed by a colon and a format
string. The destinations can be **windowtitle** or **window** for
the xterm window title, and **processtitle**, **proctitle**,
**process**, or **proc** for the process title displayed by
**ps**(1). If a format string is not supplied, the same format is
used as for the terminal. For example,
"**-x \'window,process:%t %b %r\'**" will show the elapsed time,
bytes transferred, and rate, in both the window title and the
process title.
**-v, \--stats**
: At the end of the transfer, write an additional line showing the
transfer rate minimum, mean, maximum, and standard deviation. The
values are always in bytes per second (or bits, with "**\--bits**").
**-f, \--force**
: Force output. Normally, **pv** will not output any visual display if
standard error is not a terminal. This option forces it to do so.
**-c, \--cursor**
: Use cursor positioning escape sequences to move to the initial
terminal row when updating the display, instead of only using
carriage returns. This allows multiple **pv** instances to show
progress on the same terminal together.
For example:
pv --cursor --name input file.gz | gzip -d | pv --cursor --name output > file
As the example shows, this is often used with "**\--name**".
## Data transfer modifiers
**-o FILE, \--output FILE**
: Write data to *FILE* instead of standard output. If the file already
exists, it will be truncated.
**-L RATE, \--rate-limit RATE**
: Limit the transfer to a maximum of *RATE* bytes per second. The same
suffixes as "**\--size**" can be used. Decimal values are allowed.
Specifying 0 will turn off rate limiting, which is useful with
"**\--remote**".
**-B BYTES, \--buffer-size BYTES**
: Use a transfer buffer size of *BYTES* bytes. The same suffixes as
"**\--size**" can be used. 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. This can be useful on
platforms like macOS with pipelines that perform better with
specific buffer sizes such as 1024. Implies "**\--no-splice**".
**-C, \--no-splice**
: Prevent the use of **splice**(2) and **copy_file_range**(2), which
are normally used on systems that support it to improve efficiency
by eliminating the need for a transfer buffer.
In the default case that **splice**(2) or **copy_file_range**(2) are
used, the lack of a transfer buffer prevents "**\--buffer-percent**"
and "**\--last-written**" from working and makes
"**\--buffer-size**" redundant, so using any of those options
automatically switches on "**\--no-splice**".
Sparse files cannot be written with **splice**(2) or
**copy_file_range**(2), so using "**\--sparse**" automatically
switches on "**\--no-splice**".
Switching on "**\--no-splice**" results in a small loss of transfer
efficiency. It has no effect on systems where **splice**(2) and
**copy_file_range**(2) are unavailable.
**-J BYTES, \--pipe-buffer-size BYTES**
: Attempt to set the size of the output pipe buffer, and the
intermediate input pipe buffer if one is needed, to *BYTES* bytes.
This will silently do nothing if the requested size cannot be
achieved. If this option is not specified, and both the output and
the first input are pipes, then the output pipe buffer size will
automatically be increased to match the input pipe buffer, if it was
smaller.
**-E, \--skip-errors**
: Ignore read errors by attempting to skip past the offending
sections. The corresponding parts of the output will be null bytes.
At first only a few bytes will be skipped, but if there are many
errors in a row then the skips will move up to chunks of 512. This
is intended to be similar to "*dd conv=sync,noerror*".
Specify "**\--skip-errors**" twice to only report a read error once
per file, instead of reporting each byte range skipped.
**-Z BYTES, \--error-skip-block BYTES**
: When ignoring read errors with "**\--skip-errors**", instead of
trying to adaptively skip by reading small amounts and skipping
progressively larger sections until a read succeeds, move to the
next file block of *BYTES* bytes as soon as an error occurs. There
may still be some shorter skips where the block being skipped
coincides with the end of the transfer buffer. The same suffixes as
"**\--size**" can be used.
This option can only be used with "**\--skip-errors**" and is
intended for use when reading from a block device, such as
"**\--skip-errors \--error-skip-block 4K**" to skip in 4 kibibyte
blocks. This will speed up reads from faulty media, at the expense
of potentially losing more data.
**-S, \--stop-at-size**
: If a size was specified with "**\--size**", stop transferring data
once that many bytes have been written, instead of continuing to the
end of input.
**-Y, \--sync**
: After every write operation, synchronise the buffer caches to disk
with **sync**(2), or **fdatasync**(2) if possible. This has no
effect when the output is a pipe. Using "**\--sync**" may improve
the accuracy of the progress bar when writing to a slow disk.
**-K, \--direct-io**
: Set the **O_DIRECT** flag on all inputs and outputs, if it is
available. This will minimise the effect of caches, at the cost of
performance. Due to memory alignment requirements, it also may cause
read or write failures with an error of "Invalid argument",
especially if reading and writing files across a variety of
filesystems in a single **pv** call. Use this option with caution.
**-O, \--sparse**
: When writing null bytes, try to seek, producing a sparse output
file. Implies "**\--no-splice**". On filesystems without sparse file
support, or when the output is not seekable, this option will have
no effect other than to turn on "**\--no-splice**".
**-X, \--discard**
: Instead of transferring input data to standard output, discard it.
This is equivalent to redirecting standard output to */dev/null*,
except that **write**(2) is never called.
**-U FILE, \--store-and-forward FILE**
: Instead of passing data through immediately, do it in two stages -
first read all input and write it to *FILE*, and then once the input
is exhausted, read all of *FILE* and write it to the output. *FILE*
remains in place afterwards, unless it is "**-**", in which case
**pv** creates a temporary file for this purpose, and automatically
removes it afterwards.
A common use for this is this where one part of a pipeline generates
data quickly but of unknown size, and the next part processes it
slowly. With "*quick* **\| pv -U - \|** *slow*", a progress bar is
displayed with unknown size for the *quick* part, then a second is
shown with a known size and ETA for the *slow* part.
## Alternative operating modes
**-d**, **\--watchfd** *PID*\[:*FD*\]\|=*NAME*\|@*LISTFILE*\...
: Instead of transferring data, watch file descriptor *FD* of process
*PID*, and show its progress. Other data transfer modifiers - and
remote control - may not be used with this option.
If a *PID* is specified without an *FD*, then that process will be
watched, and all regular files and block devices it opens will be
shown with a progress bar.
If a *NAME* is specified, prefixed with \"=\", then processes with
that name will be found with **pgrep**(1), and as watched described
above.
If a *LISTFILE* is specified, prefixed with \"@\", the lines in that
file will be used as additional arguments.
All remaining non-option arguments will also be treated as
additional arguments.
The **pv** process will exit when all *FD*s have either changed to a
different file, changed read/write mode, or have closed, and all
*PID*s (without a specific *FD*) have exited.
**-R PID, \--remote PID**
: Remotely control another instance of **pv** with process ID *PID*,
making it act as though it had been given this instance\'s command
line. For example, if "**pv \--rate-limit 123K**" is running with
process ID 9876, then running
"**pv \--remote 9876 \--rate-limit 321K**" will cause process 9876
to start using a rate limit of 321KiB instead of 123KiB. Note that
some options cannot be changed while running, such as
"**\--cursor**", "**\--line-mode**", "**\--force**",
"**\--delay-start**", "**\--skip-errors**", and
"**\--stop-at-size**".
**-Q PID, \--query PID**
: Display the transfer progress of another instance of **pv** with
process ID *PID*, owned by the same user.
Some output modifiers can only be used while querying another
process if they match those of that process - such as
"**\--line-mode**", "**\--null**", and "**\--average-rate-window**".
Data transfer modifiers will have no effect.
**-M** *SIDE*, **\--monitor** *SIDE*
: Run the command specified by the remaining arguments, and monitor
its standard input, its standard output, or both, depending on
whether *SIDE* is "**in**", "**out**", or "**both**". Use "**\--**"
after all of the **pv** options to keep the monitored command\'s
options separate.
With a *SIDE* of "**both**", two progress bars will be shown. All of
**pv**\'s display switches, output modifiers, and data transfer
modifiers will apply to both sides.
For example, "**pv \--cursor \--monitor both \-- gzip -9**" is
equivalent to "**pv \--cursor \| gzip -9 \| pv \--cursor**", except
that the latter can\'t show the input:output ratio.
The "**\--format**" and "**\--name**" options may be specified
twice, in which case the first one applies to the input side and the
second applies to the output side. If no "**\--format**" options are
specified, the default format based on the other display switches is
used as normal, except that the ratio is added to the output side
when *SIDE* is "**both**".
The values "**0**", "**1**", and "**2**" may be used as synonyms for
"**in**", "**out**", and "**both**".
This option cannot be used with "**\--store-and-forward".**
## Other options
**-P FILE, \--pidfile FILE**
: Save the process ID of **pv** in *FILE*. The file will be replaced
if it already exists, and will be removed when **pv** exits. While
**pv** is running, *FILE* will contain a single number - the process
ID of **pv** - followed by a newline.
**-h, \--help**
: Print a usage message on standard output and exit successfully.
**-V, \--version**
: Print version information on standard output and exit successfully.
# FORMATTING
Format strings used by "**\--format**" and "**\--extra-display**" can
contain the following sequences:
**%p**, **%{progress}**
: Progress bar (suffixed with a percentage if the size is known).
Equivalent to "**\--progress**". Expands to fill the remaining space
unless prefixed by a number to set the width, such as "**%20p**" or
"**%20{progress}**".
**%{progress-bar-only}**
: Progress bar, without any sides, and without any percentage
displayed afterwards. Expands to fill the remaining space unless
prefixed by a number.
**%{progress-amount-only}**
: The percentage completion (or maximum rate, with "**\--gauge**" when
the size is unknown).
**%{bar-plain}**
: Progress bar in the standard plain format, without any sides, and
without any percentage displayed afterwards. Expands to fill the
remaining space unless prefixed by a number.
**%{bar-block}**
: Progress bar using Unicode full blocks, without any sides, and
without any percentage displayed afterwards. Expands to fill the
remaining space unless prefixed by a number. If UTF-8 output is not
available, the plain format is used.
**%{bar-granular}**
: Progress bar using Unicode full blocks, and 1/8th blocks for partial
fills, providing a more granular display. Like the other "%{bar}"
strings this shows the bar without any sides, and without any
percentage displayed afterwards, and expands to fill the remaining
space unless prefixed by a number. If UTF-8 output is not available,
the plain format is used.
**%{bar-shaded}**
: Progress bar using Unicode full blocks and shade characters - dark
and medium shade are used for partial fills, and the light shade is
used for the background. Like the other "%{bar}" strings this shows
the bar without any sides, and without any percentage displayed
afterwards, and expands to fill the remaining space unless prefixed
by a number. If UTF-8 output is not available, the plain format is
used.
**%t**, **%{timer}**
: Elapsed time. Equivalent to "**\--timer**".
**%e**, **%{eta}**
: ETA as time remaining. Equivalent to "**\--eta**".
**%I**, **%{fineta}**
: ETA as local time at which the transfer will finish. Equivalent to
"**\--fineta**".
**%r**, **%{rate}**
: Current data transfer rate. Equivalent to "**\--rate**".
**%a**, **%{average-rate}**
: Average data transfer rate. Equivalent to "**\--average-rate**".
**%b**, **%{bytes}**, **%{transferred}**
: Bytes transferred so far (or lines if "**\--line-mode**" was
specified). Equivalent to "**\--bytes**". If "**\--bits**" was
specified, "**%b**" shows the bits transferred so far, not bytes.
**%{ratio}**
: Show the ratio of bytes transferred by the other side to the bytes
transferred by this side, in "**\--monitor both**" mode.
**%T**, **%{buffer-percent}**
: Percentage of the transfer buffer in use. Equivalent to
"**\--buffer-percent**", but using it does not turn on
"**\--no-splice**".
If the transfer is using **splice**(2), displays "{\-\-\--}"; if the
transfer is using **splice**(2) via an intermediate input pipe,
displays "{-\|\|-}"; and if the transfer is using
**copy_file_range**(2), displays "{\-\--\>}".
**%nA**, **%n{last-written}**
: Show the last *n* bytes written (for example, "**%16A**" shows the
last 16 bytes). Shows only dots if the transfer is using
**splice**(2) or **copy_file_range**(2), since these transfer modes
do not use the buffer.
**%nL**, **%n{previous-line}**
: Show the first *n* bytes of the most recently written line (for
example, "**%40L**" shows the first 40 bytes). If no *n* is given,
then this expands to fill the available space. Shows only spaces if
the transfer is using **splice**(2) or **copy_file_range**(2).
**%N**, **%{name}**
: Show the name prefix given by "**\--name**". Padded to 9 characters
with spaces, and suffixed with ":".
**%{sgr:colour,\...}**
: Emit ECMA-48 SGR (Select Graphic Rendition) codes if the terminal
supports colours, where *colour,\...* is a comma-separated list of
any of the keywords below, or the numeric values from
**console_codes**(4). If colour support is not available, nothing is
emitted.
Supported keywords are: **reset** or **none**, **black**, **red**,
**green**, **brown** or **yellow**, **blue**, **magenta**, **cyan**,
**white**, **fg-black**, **fg-red**, **fg-green**, **fg-brown** or
**fg-yellow**, **fg-blue**, **fg-magenta**, **fg-cyan**,
**fg-white**, **fg-default**, **bg-black**, **bg-red**,
**bg-green**, **bg-brown** or **bg-yellow**, **bg-blue**,
**bg-magenta**, **bg-cyan**, **bg-white**, **bg-default**, **bold**,
**dim**, **italic**, **underscore** or **underline**, **blink**,
**reverse**, **no-bold** or **no-dim**, **no-italic**,
**no-underscore** or **no-underline**, **no-blink**, **no-reverse**.
With colours, the optional \"fg-\" prefix indicates foreground; a
prefix of \"bg-\" indicates background.
For example, "**%{sgr:green,bold}TEXT%{sgr:reset}**" will make
*TEXT* bold green on supported terminals.
**%%**
: A single "%".
Any other contents are reproduced in the progress display as-is.
The format string equivalent of the default display switches is
"**%b %t %r %p %e**".
# EXAMPLES
Some suggested common switch combinations:
**pv -ptebar**
: Show a progress bar, elapsed time, estimated completion time, byte
counter, average rate, and current rate.
**pv -betlap**
: Show a progress bar, elapsed time, estimated completion time, line
counter, and average rate, counting lines instead of bytes.
**pv -btrpg**
: Show the amount transferred, elapsed time, current rate, and a gauge
showing the current rate as a percentage of the maximum rate seen -
useful in a pipeline where the total size is unknown. (If the size
*is* known, these options will show the percentage completion
instead of the rate gauge).
**pv -t**
: Show only the elapsed time - useful as a simple timer, such as
"**sleep 10m \| pv -t**".
**pv -pterb**
: The default behaviour: progress bar, elapsed time, estimated
completion time, current rate, and byte counter.
On macOS, it may be useful to specify "**\--buffer-size 1024**" in a
pipeline, as this may improve performance.
To watch how quickly a file is transferred using **nc**(1):
pv file | nc -w 1 somewhere.com 3000
A similar example, transferring a file from another process and passing
the expected size to **pv**:
cat file | pv --size 12345 | nc -w 1 somewhere.com 3000
To watch the progress of creating a tar.gz archive:
tar cf - directory/ \
| pv --size $(du -sb directory/ | awk '{print $1}') \
| gzip -9 \
> out.tar.gz
An alternative way of doing the same thing:
tar cf - directory/ \
| pv --size @directory/ \
| gzip -9 \
> out.tar.gz
Taking an image of a disk, skipping errors:
pv -EE /dev/your/disk/device > disk-image.img
Writing an image back to a disk:
pv disk-image.img > /dev/your/disk/device
Zeroing a disk:
pv < /dev/zero > /dev/your/disk/device
Note that if the input size cannot be calculated, and the output is a
block device, then the size of the block device will be used and **pv**
will automatically stop at that size as if "**\--stop-at-size**" had
been given.
(Linux and macOS only): Watching file descriptor 3 opened by another
process 1234:
pv --watchfd 1234:3
(Linux and macOS only): Watching all file descriptors used by process
1234:
pv --watchfd 1234
Rate-limiting the transfer between two processes in a pipeline, with no
display:
producer | pv --quiet --rate-limit 1M | consumer
Sending logs to a processing script, showing the most recent line as
part of the progress display:
pv --no-splice --format '%a %p : %L' big.log | processing-script
Showing progress as lines of JSON data:
pv --numeric --format '{"elapsed":%t,"bytes":%b,"rate":%r,"percentage":%{progress-amount-only}}' big.log | processing-script
# EXIT STATUS
An exit status of 1 indicates a problem with the "**\--remote**",
"**\--query**", "**\--pidfile**", or "**\--monitor**" options.
Any other exit status is a bitmask of the following:
 **2**
: One or more files could not be accessed, **stat**(2)ed, or opened.
 **4**
: An input file was the same as the output file.
 **8**
: Internal error with closing a file or moving to the next file.
 **16**
: There was an error while transferring data from one or more input
files.
 **32**
: A signal was caught that caused an early exit.
 **64**
: Memory allocation failed.
A zero exit status indicates no problems.
# ENVIRONMENT
The following environment variables may affect **pv**:
**HOME**
: The current user\'s home directory. This may be used by
"**\--remote**" and "**\--query**" to exchange messages between
**pv** instances: if the */run/user/UID/* directory does not exist
(where *UID* is the current user ID), then *\$HOME/.pv/* will be
used instead.
**TMPDIR**, **TMP**
: The directory to create per-tty lock files for the terminal when
using "**\--cursor**". If **TMPDIR** is set to a non-empty value, it
is the directory under which lock files are created. Otherwise,
**TMP** is used. If neither are set, then */tmp* is used.
# NOTES
In some versions of **bash**(1) and **zsh**(1), the construct
"**\<(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 "**\--force**".
If **pv** is used in a pipeline in **zsh** version 5.8, and the last
command in the pipeline is based on shell builtins, **zsh** takes
control of the terminal away from **pv**, preventing progress from being
displayed. For example, this will produce no progress bar:
pv InputFile | { while read -r line; do sleep 0.1; done; }
To work around this, put the last commands of the pipeline in normal
brackets to force the use of a subshell:
pv InputFile | ( while read -r line; do sleep 0.1; done; )
Refer to [issue #105](https://codeberg.org/ivarch/pv/issues/105) for
full details.
The "**\--remote**" and "**\--query**" options require that either
*/run/user/\<uid\>/* or *\$HOME/* can be written to, for inter-process
communication.
The "**\--size**" option has no effect if used with
"**\--watchfd** *PID*" to watch all file descriptors of a process, but
will work with "**\--watchfd** *PID*:*FD*" to watch a single file
descriptor.
If the input size cannot be calculated, and the output is a block
device, then **pv** will read the output device\'s size, use that as if
it had been passed to "**\--size**", and activate "**\--stop-at-size**".
The "**%nA**" and "**%nL**" format sequences may not be effective with
small input files, and "**%nL**" may be a few lines out due to buffering
within the pipeline itself.
Numbers passed to "**\--size**", "**\--buffer-size**",
"**\--pipe-buffer-size**", and "**\--error-skip-block**" may all be
expressed as decimals if followed by a suffix, so for example
"*\--size 1.5G*" is equivalent to "*\--size 1536M*".
Numbers passed to "**\--rate-limit**" may be expressed as decimals with
or without a suffix.
Numbers passed to "**\--interval**" and "**\--delay-start**" may be
integers or decimals, but may not have a suffix.
Numbers passed to "**\--last-written**", "**\--width**",
"**\--height**", "**\--average-rate-window**", "**\--remote**", and
"**\--query**" must be integers with no suffix.
When "**\--sparse**" is in effect and output is being written to a file,
that file may look like it has stopped growing if inspected with
**ls**(1) while null bytes are being written, even though **pv** still
reports progress. This is because of the way sparse output is achieved,
and the file will be the correct size when the transfer ends.
# REPORTING BUGS
Please report bugs or feature requests via the issue tracker linked from
the [**pv** home page](https://ivarch.com/p/pv).
# SEE ALSO
**cat**(1), **splice**(2), **copy_file_range**(2), **fsync**(2),
**fdatasync**(2), **open**(2) (for **O_DIRECT**), **console_codes**(4)
# COPYRIGHT
Copyright © 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew
Wood.
License GPLv3+: [GNU GPL version 3 or
later](https://www.gnu.org/licenses/gpl-3.0.html).
This is free software: you are free to change and redistribute it. There
is NO WARRANTY, to the extent permitted by law.
Please see the package\'s ACKNOWLEDGEMENTS file for a complete list of
contributors.
+51
View File
@@ -0,0 +1,51 @@
# Configuration for the foss-release.sh script.
# The script is here: https://codeberg.org/ivarch/scripts
set maintainer andrew.wood@ivarch.com
set mainprogram auto
set version auto
set mandir docs
set newsdir docs
export SKIP_VALGRIND_TESTS=1
section Initial checks
action check_po
action check_version_news
action check_version_autoconf
action check_version_man
section Initial build
action configure
action make
action check_analyse
action check_version_program
action check_version_year
section Documentation and source reformatting
action man_md
action man_html
action news_html
action make_indent
section Update po files
action make_update_po
section Run autoreconf
action autoreconf
section Commit check
action check_git_status
section Release archive
action check_make_distcheck
action make_dist
section Lab tests
action labtest
section Sign release
action sign_tarball
section Build OS packages
action parmo_build
-32
View File
@@ -1,32 +0,0 @@
#!/bin/sh
#
# Script to autogenerate the `configure' script, and rebuild the dependency
# list.
set -e
cd `dirname $0`
cd autoconf
autoconf configure.in > ../configure
cd ..
chmod 755 configure
echo > autoconf/make/depend.mk~
echo > autoconf/make/filelist.mk~
echo > autoconf/make/modules.mk~
MAKE=make
which gmake >/dev/null 2>&1 && MAKE=gmake
rm -rf .gen
mkdir .gen
cd .gen
sh ../configure
$MAKE make
$MAKE dep
cd ..
rm -rf .gen
rm -rf autoconf/autom4te.cache
# EOF
+10
View File
@@ -0,0 +1,10 @@
Makevars.template
*.sed
*.gmo
*.header
*.sin
*.pot
Rules-quot
stamp-po
*~
Makefile.in.in
+9
View File
@@ -0,0 +1,9 @@
cs
de
fi
fr
ka
pl
pt
ru
tr
+82
View File
@@ -0,0 +1,82 @@
# Makefile variables for PO directory in any package using GNU gettext.
#
# Copyright (C) 2003-2019 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation gives
# unlimited permission to use, copy, distribute, and modify it.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
# These two variables depend on the location of this directory.
subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
# package. (Note that the msgstr strings, extracted from the package's
# sources, belong to the copyright holder of the package.) Translators are
# expected to transfer the copyright for their translations to this person
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
COPYRIGHT_HOLDER = Andrew Wood
# This tells whether or not to prepend "GNU " prefix to the package
# name that gets inserted into the header of the $(DOMAIN).pot file.
# Possible values are "yes", "no", or empty. If it is empty, try to
# detect it automatically by scanning the files in $(top_srcdir) for
# "GNU packagename" string.
PACKAGE_GNU =
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
# - Strings which are not entire sentences, see the maintainer guidelines
# in the GNU gettext documentation, section 'Preparing Strings'.
# - Strings which use unclear terms or require additional context to be
# understood.
# - Strings which make invalid assumptions about notation of date, time or
# money.
# - Pluralisation problems.
# - Incorrect English spelling.
# - Incorrect formatting.
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
MSGID_BUGS_ADDRESS =
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
# context. Possible values are "yes" and "no". Set this to yes if the
# package uses functions taking also a message context, like pgettext(), or
# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
USE_MSGCTXT = no
# These options get passed to msgmerge.
# Useful options are in particular:
# --previous to keep previous msgids of translated messages,
# --quiet to reduce the verbosity.
MSGMERGE_OPTIONS =
# These options get passed to msginit.
# If you want to disable line wrapping when writing PO files, add
# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
# MSGINIT_OPTIONS.
MSGINIT_OPTIONS =
# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
# has changed. Possible values are "yes" and "no". Set this to no if
# the POT file is checked in the repository and the version control
# program ignores timestamps.
PO_DEPENDS_ON_POT = yes
# This tells whether or not to forcibly update $(DOMAIN).pot and
# regenerate PO files on "make dist". Possible values are "yes" and
# "no". Set this to no if the POT file and PO files are maintained
# externally.
DIST_DEPENDS_ON_UPDATE_PO = yes
+33
View File
@@ -0,0 +1,33 @@
src/main/debug.c
src/main/help.c
src/main/main.c
src/main/options.c
src/main/version.c
src/pv/calc.c
src/pv/cursor.c
src/pv/display.c
src/pv/elapsedtime.c
src/pv/file.c
src/pv/format/averagerate.c
src/pv/format/barstyle.c
src/pv/format/bufferpercent.c
src/pv/format/bytes.c
src/pv/format/eta.c
src/pv/format/fineta.c
src/pv/format/lastwritten.c
src/pv/format/name.c
src/pv/format/previousline.c
src/pv/format/progressbar.c
src/pv/format/rate.c
src/pv/format/ratio.c
src/pv/format/sgr.c
src/pv/format/timer.c
src/pv/loop.c
src/pv/number.c
src/pv/proctitle.c
src/pv/remote.c
src/pv/signal.c
src/pv/state.c
src/pv/string.c
src/pv/transfer.c
src/pv/watchpid.c
+609
View File
@@ -0,0 +1,609 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2024-10-13 20:43+0000\n"
"Last-Translator: mmatous <mmatous@users.noreply.translate.codeberg.org>\n"
"Language-Team: Czech <https://translate.codeberg.org/projects/pv/pv/cs/>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Weblate 5.7.2\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "ukaž indikátor průběhu"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "ukaž uběhlý čas"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "ukaž přibližný zbývající čas"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "ukaž přibližný čas dokončení"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "ukaž okamžitou rychlost přenosu dat"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "ukaž průměrnou rychlost přenosu dat"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "ukaž počet přenesených bajtů"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "ukaž procento využité vyrovnávací paměti"
#: src/main/help.c:323
msgid "NUM"
msgstr "ČÍS"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "zobraz ČÍS posledních zapsaných bajtů"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "FORMÁT"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "nastav formát výstupu na FORMÁT"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "vypisuj procenta, ne vizuální informace"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "nevypisuj žádné informace o přenosu"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "ukaž počet přenesených bitů"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "zacházej se suffixy jako s násobky 1000 namísto 1024"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "nic nevypisuj, dokud není přenesen první byte"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "SEK"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "nic nevypisuj, dokud neuplyne SEK sekund"
#: src/main/help.c:348
msgid "SIZE"
msgstr "VEL"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "nastav očekávanou velikost dat na VEL bajtů"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr "pokud je velikost neznámá, ukaž rychlost vs maximální rychlost"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "počítej řádky místo bajtů"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "řádky jsou zakončené nulovým znakem"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "aktualizuj každých SEK sekund"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr "počítej průměrnou rychlost za posledních SEK sekund (výchozí: 30)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "ŠÍŘ"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "předpokládej šířku terminálu ŠÍŘ znaků"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "VÝŠ"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "předpokládej výšku terminálu VÝŠ znaků"
#: src/main/help.c:372
msgid "NAME"
msgstr "JMÉNO"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "přidej JMÉNO před vizuální informace"
#: src/main/help.c:375
msgid "STYLE"
msgstr ""
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr ""
#: src/main/help.c:378
msgid "SPEC"
msgstr ""
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "po dokončení vypiš údaje o přenosu"
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr "vypisuj výstup i pokud standardní chybový výstup není terminál"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr "pozicuj kurzor pomocí řídících znaků"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "SOUBOR"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "zapiš výstup do SOUBORu namísto standardního výstupu"
#: src/main/help.c:394
msgid "RATE"
msgstr "RYCH"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "omez přenosovou rychlost na RYCH bajtů za sekundu"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "BAJT"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "použij vyrovnávací pamět BAJT bajtů"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "nepoužívej splice(), vždy použij read/write"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr ""
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "ignoruj chyby při čtení vstupu"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "přeskakuj chyby v blocích BAJTů naráz"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "zastav po přenosu --size bajtů"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "po každém zápisu vyprázdni cache na disk"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr "použij přímý V/V k obejítí cache"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr ""
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "zahoď vstup namísto zápisu na výstup"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr "zapiš veškerý vstup do SOUBORu před výpisem na výstup"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr ""
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "sleduj soubor DS otevřený procesem PID"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr "PID"
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "aktualizuj nastavení procesu PID"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr ""
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "ulož id procesu do SOUBORu"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "ukaž pomoc a skonči"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "ukaž informace o verzi a skonči"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "zapiš ladící záznamy do SOUBORu"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Použití: %s [VOLBY] [SOUBOR]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
"Spoj SOUBOR(y) nebo standardní vstup na standardního výstup, s monitoringem."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Prosím, hlašte veškeré chyby na: %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(vstup)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr ""
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "chyba přidělování paměti"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr ""
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "očekáváno ID procesu nebo dvojice PID:DS"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "neplatné ID procesu"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr ""
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "očekáván celočíselný argument"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "očekáván číselný argument"
#: src/main/options.c:863
msgid "missing filename"
msgstr ""
#: src/main/options.c:889
msgid "missing process name"
msgstr ""
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr ""
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Zkuste `%s --help' pro více informací."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Zkuste `%s --h' pro více informací."
#: src/main/options.c:1227
msgid ""
"cannot use line mode or transfer modifier options when watching file "
"descriptors"
msgstr ""
"při sledování deskriptorů souborů nelze použít řádkový mód nebo volby pro "
"modifikaci přenosu"
#: src/main/options.c:1235
msgid "cannot use cursor positioning when watching file descriptors"
msgstr "při sledování deskriptorů souborů nelze pozicování kurzoru použít"
#: src/main/options.c:1243
msgid "cannot use remote control when watching file descriptors"
msgstr "při sledování deskriptorů souborů nelze použít vzdálené ovládání"
#: src/main/options.c:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr "při sledování deskriptorů souborů nelze použít přenos souborů"
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "není dostupné na systémech bez /proc/self/fdinfo"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr ""
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr ""
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr ""
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "Licence: GPLv3+ <https://jxself.org/translations/gpl-3.cz.shtml>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr "Toto je svobodný software; můžete ho volně měnit a šířit."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr "Na program se nevztahuje ŽÁDNÁ ZÁRUKA, v míře povolené zákonem."
#: src/main/version.c:32
msgid "Project web site"
msgstr "Stránka projektu"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "selhalo otevření zámkového souboru"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "přerušeno signálem"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr "yzafpnum kMGTPEZY"
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnum KMGTPEZY"
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr ""
#: src/pv/file.c:371
msgid "error closing file"
msgstr "chyba při zavírání souboru"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "vstupní soubor je rovněž výstupem"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(žádný)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr "(stdin)"
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr "b/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr "/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "B/s"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr "b"
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr "B"
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr "ETA"
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr "FIN"
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr "rychlost min/avg/max/std"
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "rychlost neměřena"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr "pid"
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr "ds"
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "zpráva nepřijata"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO není na tomto systému podporováno"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "varování: detekovány chyby při čtení"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr "chyba přeskočena"
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "chyba při zápisu"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "není obyčejný soubor nebo blokové zařízení"
#~ msgid "state allocation failed"
#~ msgstr "selhala alokace stavu"
#~ msgid "failed to stat file"
#~ msgstr "nebylo možné zjistit informace o souboru"
#~ msgid "is a directory"
#~ msgstr "je adresář"
#~ msgid "failed to generate sysfs filename"
#~ msgstr "selhalo vytváření jména pro soubor v sysfs"
#~ msgid "failed to read sysfs size file"
#~ msgstr "selhalo čtení velikosti souboru v sysfs"
#~ msgid "failed to open block device"
#~ msgstr "selhalo otevření blokového zařízení"
#~ msgid "failed to determine size of block device"
#~ msgstr "selhalo zjištění velikosti blokového zařízení"
#~ msgid "option structure allocation failed"
#~ msgstr "selhala alokace struktury pro volby"
#~ msgid "option structure argv allocation failed"
#~ msgstr "selhala alokace struktury pro argv"
#~ msgid "failed to get terminal name"
#~ msgstr "selhalo zjištění názvu terminálu"
#~ msgid "lock attempt failed"
#~ msgstr "selhal pokus o uzamčení"
#~ msgid "failed to open terminal"
#~ msgstr "selhalo otevření terminálu"
#~ msgid "failed to seek to start of output"
#~ msgstr "selhalo posunutí za začátek výstupu"
#~ msgid "failed to read file"
#~ msgstr "selhalo čtení ze souboru"
#~ msgid "failed to stat output file"
#~ msgstr "selhalo zjištění informací o výstupním souboru"
#~ msgid "history structure allocation failed"
#~ msgstr "selhala alokace struktury historie"
#~ msgid "file list allocation failed"
#~ msgstr "selhala alokace seznamu souborů"
#~ msgid "read failed"
#~ msgstr "čtení selhalo"
#~ msgid "file is not seekable"
#~ msgstr "souborem nelze procházet"
#~ msgid "failed to seek past error"
#~ msgstr "selhal skok za chybu"
#~ msgid "no transfer buffer allocated"
#~ msgstr "vyrovnávací paměť není alokována"
#~ msgid "failed to set interval timer"
#~ msgstr "selhalo nastavení intervalového časovače"
#~ msgid "failed to clear interval timer"
#~ msgstr "selhalo vynulování intervalového časovače"
#~ msgid "line position buffer allocation failed"
#~ msgstr "selhala alokace vyrovnávací paměti pro pozici v řádcích"
#~ msgid "select call failed"
#~ msgstr "selhalo volání select"
#~ msgid "PID[:FD]"
#~ msgstr "PID[:DS]"
+638
View File
@@ -0,0 +1,638 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2025-01-14 20:39+0000\n"
"Last-Translator: Benny <benny@users.noreply.translate.codeberg.org>\n"
"Language-Team: German <https://translate.codeberg.org/projects/pv/pv/de/>\n"
"Language: de\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.9.2\n"
"Date: 1999-06-01 15:18:29+0100\n"
"From: Andrew Wood <ivarch@ubik>\n"
"Xgettext-Options: --default-domain=pkgbuild --directory=./.pkgdir --add-"
"comments --keyword=_ --keyword=N_\n"
"Files: src/getopt/getopt.c src/getopt/getopt1.c src/version.c src/main/"
"init.c src/main/help.c src/main/xpmptr.c src/guts/load.c src/guts/stop.c src/"
"guts/configure.c src/guts/make.c src/guts/install.c src/guts/prefs.c src/ui/"
"generate.c src/ui/main.c src/ui/xpm.c src/ui/status.c src/ui/activate.c src/"
"ui/handlers/main.c src/ui/handlers/package.c src/ui/handlers/prefs.c src/ui/"
"handlers/dirsel.c src/ui/handlers/popup.c src/ui/handlers/help.c src/ui/"
"textout.c src/ui/report.c src/ui/callback.c src/nls/intl/bindtextdom.c src/"
"nls/intl/dcgettext.c src/nls/intl/dgettext.c src/nls/intl/finddomain.c src/"
"nls/intl/gettext.c src/nls/intl/loadmsgcat.c src/nls/intl/localealias.c src/"
"nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
"compat.c\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "Fortschritts-Anzeige"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "zeige die verstrichene Zeit an"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "zeige die erwartete Zeit bis zum Ende an"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "zeige die absolute geschätzte Zeit bis zur Fertigstellung"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "zeige die Datentransferrate an"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "zeige die durchschnittliche Übertragungsrate"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "zeige die Anzahl der übertragenen Bytes"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "zeige, wie viel Prozent des Übertragungsbuffers in Benutzung sind"
#: src/main/help.c:323
msgid "NUM"
msgstr "NUM"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "NUM zeige die zuletzt geschriebenen NUM Bytes"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "setze das Ausgabeformat auf FORMAT"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "Ausgabe von Prozent-Angaben statt visueller Darstellung"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "sämtliche Transferinformationen unterdrücken"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "zeige die Anzahl der übertragenen Bits"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "behandle Endungen als Vielfache von 1000 statt von 1024"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "keine Ausgabe bevor das erste Byte übertragen wurde"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "SEK"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "nichts anzeigen ehe SEK Sekunden vergangen sind"
#: src/main/help.c:348
msgid "SIZE"
msgstr "GRÖẞE"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "setze erwartete Datenlänge auf SIZE Byte"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr "zeige Rate vs maximale Rate, falls die größe unbekannt ist"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "zähle Zeilen anstelle von Bytes"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "Zeilen sind nullterminiert"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "aktualisiere Ausgabe nach SEK Sekunden Intervall"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr ""
"berechne die durchschnittliche Übertragungsrate über die letzten SEK "
"Sekunden (Standard 30s)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "BREITE"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "setze Terminal-Breite auf BREITE Zeichen"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "HÖHE"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "setze Terminal-Höhe auf HÖHE Zeichen"
#: src/main/help.c:372
msgid "NAME"
msgstr "NAME"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "setze den NAMEn für visuelle Darstellung"
#: src/main/help.c:375
msgid "STYLE"
msgstr "STIL"
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr "setze die voreingestellte Darstellung auf STIL"
#: src/main/help.c:378
msgid "SPEC"
msgstr "SPEC"
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr "Fortschritt auch an SPEC senden"
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "Übertragungsstatistiken am Ende ausgeben"
#: src/main/help.c:385
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:388
msgid "use cursor positioning escape sequences"
msgstr "benutze Escape-Sequenzen zur Cursor-Positionierung"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "DATEI"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "schreibe die Ausgabe in DATEI statt in die Standardausgabe"
#: src/main/help.c:394
msgid "RATE"
msgstr "RATE"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "beschränke die Transferrate auf RATE Byte pro Sekunde"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "BYTES"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "benutze einen Puffer in der Größe von BYTES"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "anstelle von splice() immer read/write benutzen"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr "benutze einen Pipe-Puffer in der Größe von BYTES"
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "Lesefehler in der Eingabe nicht beachten"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "bei Fehlern BYTES am Stück überspringen"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "anhalten, nachdem --size Bytes übertragen wurden"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "schreibe den Cache nach jedem Schreibvorgang auf die Festplatte"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr "verwende direkte E/A, um den Cache zu umgehen"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr "ausgabelöcher anstelle von Nullbytes"
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "verwirf die Eingabe anstatt in die Ausgabe zu schreiben"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr "Ausgabe nach FILE schrieben bevor sie ausgegeben wird"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr "PID[:FD]|=NAME|@LISTENDATEI"
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "die vom Prozess PID geöffnete Datei FD beobachten"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr "PID"
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "Einstellungen der Prozess-PID updaten"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr "den Fortschritt des PID-Prozesses darstellen"
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
"Ein Programm ausführen und dessen Standardeingabe, -ausgabe oder beides "
"überwachen"
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "Prozess-ID in DATEI speichern"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "zeige diese Hilfe und beende"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "zeige Versionsinformationen und beende"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "schreibe Debug-Protokolle in DATEI"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Aufruf: %s [OPTION] [DATEI]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
"Verbindet DATEI(en) oder den Standard-Eingabe-Kanal mit dem Standard-Ausgabe-"
"Kanal und misst den Datenstrom."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr "unterstützte Formate:"
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Bitte senden Sie Fehlerberichte an %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(eingabe)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr "es muss ein auszuführendes Programm angegeben werden"
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "Fehler bei der Speicheranforderung"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr "Listendateien dürfen keine „@“-Zeilen enthalten"
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "Prozess-ID oder PID:FD-Paar erwartet"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "ungültige Prozess-ID"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr "numerischen Wert nicht verstanden"
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "Ganzzahliges Argument erwartet"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "numerisches Argument erwartet"
#: src/main/options.c:863
msgid "missing filename"
msgstr "fehlender Dateiname"
#: src/main/options.c:889
msgid "missing process name"
msgstr "fehlender Prozessname"
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr "ungültige Seitenspezifikation"
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "„%s --help“ zeigt weitere Informationen an."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "„%s -h“ zeigt weitere Informationen an."
#: src/main/options.c:1227
msgid ""
"cannot use line mode or transfer modifier options when watching file "
"descriptors"
msgstr ""
"Beim Beobachten von Dateideskriptoren können keine Optionen für den "
"Zeilenmodus oder den Übertragungsmodifikator verwendet werden"
#: src/main/options.c:1235
msgid "cannot use cursor positioning when watching file descriptors"
msgstr ""
"Beim Beobachten von Dateideskriptoren kann Cursor-Positionierung nicht "
"verwendet werden"
#: src/main/options.c:1243
msgid "cannot use remote control when watching file descriptors"
msgstr ""
"Beim Beobachten von Dateideskriptoren kann die Fernbedienung nicht verwenden "
"werden"
#: src/main/options.c:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
"Remote-Abfragen können beim Überwachen von Dateideskriptoren nicht verwendet "
"werden"
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr ""
"Beim Beobachten von Dateideskriptoren können Dateien nicht übertragen werden"
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "Nicht verfügbar auf Systemen ohne /proc/self/fdinfo"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr ""
"Fernsteuerung und Fernabfrage können nicht gleichzeitig verwendet werden"
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr "Der Monitormodus kann mit dieser Option nicht angegeben werden"
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
"Der Monitormodus kann nicht mit Speichern-und-Weiterleiten verwendet werden"
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr "mit dieser Option können keine Dateien angegeben werden"
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "Lizenz: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr "Dies ist freie Software: Sie dürfen sie verändern und weiterverteilen."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr "Es besteht KEINE GARANTIE, soweit dies gesetzlich zulässig ist."
#: src/main/version.c:32
msgid "Project web site"
msgstr "Projekt-Website"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "konnte Sperrdatei nicht öffnen"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "von einem Signal unterbrochen"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr "yzafpnµm kMGTPEZY"
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnµm KMGTPEZY"
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr "/dev/null ist nicht verwendbar"
#: src/pv/file.c:371
msgid "error closing file"
msgstr "Fehler beim Schließen der Datei"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "die Eingabedatei ist auch die Ausgabedatei"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(keine)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr "(stdin)"
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr "b/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr "/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "B/s"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr "b"
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr "B"
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr "ETA"
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr "Endzeit"
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr "Rate min/mittel/max/abweichung"
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "Übertragungsrate nicht gemessen"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr "pid"
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr "fd"
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "Nachricht nicht empfangen"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO wird auf diesem System nicht unterstützt"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "warnung: lesefehler erkannt"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr "über den Lesefehler hinaus verschoben"
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "Schreibfehler"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "ist weder eine normale Datei noch ein Blockgerät"
#~ msgid "state allocation failed"
#~ msgstr "Speicherzuweisung für `state' fehlgeschlagen"
#~ msgid "failed to stat file"
#~ msgstr "konnte Dateiinformationen nicht lesen"
#~ msgid "is a directory"
#~ msgstr "ist ein Verzeichnis"
#~ msgid "failed to generate sysfs filename"
#~ msgstr "konnte Sysfs-Dateinamen nicht erzeugen"
#~ msgid "failed to read sysfs size file"
#~ msgstr "konnte Größe der Sysfs-Datei nicht lesen"
#~ msgid "failed to open block device"
#~ msgstr "konnte Blockgerät nicht öffnen"
#~ msgid "failed to determine size of block device"
#~ msgstr "konnte Größe des Blockgeräts nicht ermitteln"
#~ msgid "option structure allocation failed"
#~ msgstr "Speicherzuweisung für `option' fehlgeschlagen"
#~ msgid "option structure argv allocation failed"
#~ msgstr "Speicherzuweisung für `argv' der Option fehlgeschlagen"
#~ msgid "failed to get terminal name"
#~ msgstr "konnte Terminalname nicht lesen"
#~ msgid "lock attempt failed"
#~ msgstr "Sperrversuch fehlgeschlagen"
#~ msgid "failed to open terminal"
#~ msgstr "konnte Terminal nicht öffnen"
#~ msgid "failed to seek to start of output"
#~ msgstr "Konnte nicht zum Anfang der Ausgabe springen"
#~ msgid "failed to read file"
#~ msgstr "konnte Datei nicht lesen"
#~ msgid "failed to stat output file"
#~ msgstr "konnte Dateiinformationen für Ausgabe-Datei nicht lesen"
#~ msgid "history structure allocation failed"
#~ msgstr "Speicherzuweisung für `history' fehlgeschlagen"
#~ msgid "file list allocation failed"
#~ msgstr "Speicherzuweisung für die Dateiliste fehlgeschlagen"
#~ msgid "read failed"
#~ msgstr "read-Aufruf fehlgeschlagen"
#~ msgid "file is not seekable"
#~ msgstr "Datei ist nicht durchsuchbar"
#~ msgid "failed to seek past error"
#~ msgstr "konnte den Fehler nicht überwinden"
#~ msgid "no transfer buffer allocated"
#~ msgstr "Speicherzuweisung für den Transferpuffer fehlgeschlagen"
#~ msgid "failed to set interval timer"
#~ msgstr "konnte Intervall-Timer nicht setzen"
#~ msgid "failed to clear interval timer"
#~ msgstr "konnte Intervall-Timer nicht löschen"
#~ msgid "line position buffer allocation failed"
#~ msgstr "Zuweisung des Zeilenpuffers fehlgeschlagen"
#~ msgid "select call failed"
#~ msgstr "select-Aufruf fehlgeschlagen"
#~ msgid "PID[:FD]"
#~ msgstr "PID[:FD]"
+611
View File
@@ -0,0 +1,611 @@
msgid ""
msgstr ""
"Project-Id-Version: pv 1.9.34\n"
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2026-03-24 23:25+0000\n"
"Last-Translator: Ricky-Tigg <ricky-tigg@noreply.codeberg.org>\n"
"Language-Team: Finnish <https://translate.codeberg.org/projects/pv/pv/fi/>\n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.16.2\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "näytä edistymispalkki"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "näytä kulunut aika"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "näytä arvioitu valmistumisaika"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "näytä absoluuttinen arvioitu valmistumisaika"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "näytä datan siirtonopeuden laskuri"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "näytä datan keskimääräisen siirtonopeuden laskuri"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "näytä siirrettyjen tavujen määrä"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "näytä käytössä olevan siirtopuskurin prosenttiosuus"
#: src/main/help.c:323
msgid "NUM"
msgstr "NUM"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "näytä NUM viimeksi kirjoitettua tavua"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "MUOTO"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "aseta tulostemuodoksi MUOTO"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "tulosta prosentit, ei visuaalista tietoa"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "älä tulosta minkäänlaista siirtotietoa"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "näytä siirrettyjen bittien määrä"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "käsittele päätteitä 1000:n kertoimina 1024:n sijaan"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "älä näytä mitään, ennen kuin ensimmäinen tavu on siirretty"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "SEK"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "älä näytä mitään, ennen kuin SEC sekuntia on kulunut"
#: src/main/help.c:348
msgid "SIZE"
msgstr "KOKO"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "aseta arvioiduksi datan kooksi KOKO tavua"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr "Jos kokoa ei tiedetä, näytä nopeus vs. maksiminopeus"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "laske rivit tavujen sijaan"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "rivit päättyvät nullilla"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "päivitä SEC sekunnin välein"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr "laske keskimääräinen siirtonopeus SEC sekunnin ajalta (oletus 30 s)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "LEVEYS"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "oleta, että päätteen LEVEYS on merkkiä leveä"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "KORKEUS"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "oleta, että päätteen KORKEUS on merkkiä korkea"
#: src/main/help.c:372
msgid "NAME"
msgstr "NIMI"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "lisää visuaalisiin tietoihin NIMI-etuliite"
#: src/main/help.c:375
msgid "STYLE"
msgstr "TYYLI"
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr "aseta oletuspalkkityyli TYYLI:lle"
#: src/main/help.c:378
msgid "SPEC"
msgstr ""
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr "lähetä edistyminen myös SPECille"
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "tulosta siirtotilastot lopussa"
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr "tuloste, vaikka vakiovirhe ei olisikaan päätelaite"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr "käytä kohdistimen sijoittelun esc-sekvenssiä"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "TIEDOSTO"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "kirjoita tuloste tiedostoon TIEDOSTO oletustulosteen (stdout) sijaan"
#: src/main/help.c:394
msgid "RATE"
msgstr "NOPEUS"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "rajoita siirron nopeudeksi NOPEUS tavua per sekunti"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "TAVUT"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "käytä puskuria, jonka koko on TAVUT"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "Älä koskaan käytä splice():tta, käytä aina luku-/kirjoitustoimintoa"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr ""
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "ohita lukuvirheet syötteessä"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "ohita virheet TAVUT:ssa lohkoissa kerrallaan"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "lopeta kun --size tavua on siirretty"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "tyhjennä välimuisti levylle jokaisen kirjoituksen jälkeen"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr "käytä suoraa syötettä/lähtöä välimuistin ohittamiseen"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr "yritä etsiä tyhjätavujen kirjoittamisen sijaan"
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "hylkää syöte tulosteeseen kirjoittamisen sijaan"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr ""
"kirjoita kaikki syöte tiedostoon TIEDOSTO ennen tulosteeseen kirjoittamista"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr "PID[:FD]|=NIMI|@LISTATIEDOSTO"
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "tarkkaile tiedostoa FD, jonka prosessi PID avasi"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr ""
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "päivitä prosessin PID-asetukset"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr "näytä prosessin PID:n edistyminen"
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "tallenna prosessitunnus TIEDOSTO:on"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "näytä tämä ohje ja lopeta"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "näytä versiotiedot ja lopeta"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "kirjoita vianjäljityslokit tiedostoon TIEDOSTO"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Käyttö: %s [VALINTA] [TIEDOSTO]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
"Putkita TIEDOSTO(t), tai vakiosyöte, vakiotulosteeseen, monitoroinnin kanssa."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr "Tuetut muotosekvenssit:"
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Ilmoita ongelmista: %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(syöte)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr ""
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "muistinvarausvirhe"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr "Listatiedostot eivät saa sisältää @-rivejä"
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "prosessitunnusta tai pid:fd-paria odotetaan"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "virheellinen prosessin ID"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr "numeerista arvoa ei ymmärretty"
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "kokonaislukuargumenttia odotetaan"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "numeerista argumenttia odotetaan"
#: src/main/options.c:863
msgid "missing filename"
msgstr "puuttuva tiedostonimi"
#: src/main/options.c:889
msgid "missing process name"
msgstr "puuttuva prosessinimi"
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr ""
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Suorita `%s --help' saadaksesi lisätietoja."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Suorita `%s -h' saadaksesi lisätietoja."
#: src/main/options.c:1227
msgid ""
"cannot use line mode or transfer modifier options when watching file "
"descriptors"
msgstr ""
"rivitilaa tai siirtomuokkausvaihtoehtoja ei voi käyttää tiedostokuvauksia "
"tarkasteltaessa"
#: src/main/options.c:1235
msgid "cannot use cursor positioning when watching file descriptors"
msgstr ""
"kohdistimen sijoittelua ei voi käyttää tiedostokuvauksia tarkasteltaessa"
#: src/main/options.c:1243
msgid "cannot use remote control when watching file descriptors"
msgstr "etäohjausta ei voi käyttää tiedostokuvauksia tarkasteltaessa"
#: src/main/options.c:1251
msgid "cannot use remote query when watching file descriptors"
msgstr "etäkyselyä ei voi käyttää tiedostokuvauksia tarkasteltaessa"
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr "tiedostoja ei voi siirtää tiedostokuvauksia tarkasteltaessa"
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "ei saatavilla järjestelmissä, joissa ei ole /proc/self/fdinfo"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr "etäohjausta ja etäkyselyä ei voi käyttää yhdessä"
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr ""
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr "tiedostoja ei voi määrittää tämän vaihtoehdon kanssa"
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "Lisenssi: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr ""
"Tämä on ilmaista ohjelmistoa: voit vapaasti muokata sitä ja levittää sitä "
"uudelleen."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr "TAKUUTA EI OLE, lain sallimissa rajoissa."
#: src/main/version.c:32
msgid "Project web site"
msgstr "Projektin verkkosivu"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "lukitustiedoston avaaminen epäonnistui"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "signaalin keskeyttämä"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr ""
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr ""
#: src/pv/file.c:371
msgid "error closing file"
msgstr "virhe tiedoston sulkemisessa"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "syötetiedosto on myös tuotostiedosto"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(ei mitään)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr ""
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr ""
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr ""
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "T/s"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr ""
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr "T"
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr ""
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr ""
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr ""
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "nopeutta ei mitattu"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr ""
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr ""
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "viestiä ei vastaanotettu"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO ei ole tuettu tässä järjestelmässä"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "varoitus: lukuvirheitä havaittu"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr "aiempi lukuvirhe ohitettu"
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "kirjoitusvirhe"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "ei tavallinen tiedosto tai lohkolaite"
#~ msgid "state allocation failed"
#~ msgstr "tilan allokointi epäonnistui"
#~ msgid "failed to stat file"
#~ msgstr "tiedoston tilastointi epäonnistui"
#~ msgid "is a directory"
#~ msgstr "on hakemisto"
#~ msgid "failed to generate sysfs filename"
#~ msgstr "sysfs-tiedostonimen luominen epäonnistui"
#~ msgid "failed to read sysfs size file"
#~ msgstr "sysfs-kokotiedoston lukeminen epäonnistui"
#~ msgid "failed to open block device"
#~ msgstr "lohkolaitteen avaaminen epäonnistui"
#~ msgid "failed to determine size of block device"
#~ msgstr "lohkolaitteen koon päättely epäonnistui"
#~ msgid "option structure allocation failed"
#~ msgstr "vaihtoehtorakenteen allokointi epäonnistui"
#~ msgid "option structure argv allocation failed"
#~ msgstr "vaihtoehtorakenteen argv:n allokointi epäonnistui"
#~ msgid "failed to get terminal name"
#~ msgstr "päätelaitteen nimen hakeminen epäonnistui"
#~ msgid "lock attempt failed"
#~ msgstr "lukitusyritys epäonnistui"
#~ msgid "failed to open terminal"
#~ msgstr "päätelaitteen avaaminen epäonnistui"
#~ msgid "failed to seek to start of output"
#~ msgstr "tulosteen käynnistyksen hakeminen epäonnistui"
#~ msgid "failed to read file"
#~ msgstr "tiedoston lukeminen epäonnistui"
#~ msgid "failed to stat output file"
#~ msgstr "tulostiedoston tilastointi epäonnistui"
#~ msgid "history structure allocation failed"
#~ msgstr "historiarakenteen allokointi epäonnistui"
#~ msgid "file list allocation failed"
#~ msgstr "tiedostolistan allokointi epäonnistui"
#~ msgid "read failed"
#~ msgstr "luku epäonnistui"
#~ msgid "file is not seekable"
#~ msgstr "tiedosto ei ole haettavissa"
#~ msgid "failed to seek past error"
#~ msgstr "menneen virheen hakeminen epäonnistui"
#~ msgid "no transfer buffer allocated"
#~ msgstr "siirtopuskuria ei ole allokoitu"
#~ msgid "failed to set interval timer"
#~ msgstr "aikaväliajastimen asettaminen epäonnistui"
#~ msgid "failed to clear interval timer"
#~ msgstr "aikaväliajastimen tyhjennys epäonnistui"
#~ msgid "line position buffer allocation failed"
#~ msgstr "rivin sijaintipuskurin allokointi epäonnistui"
#~ msgid "select call failed"
#~ msgstr "valintakutsu epäonnistui"
+647
View File
@@ -0,0 +1,647 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2026-05-18 20:38+0000\n"
"Last-Translator: a-j-wood <a-j-wood@noreply.codeberg.org>\n"
"Language-Team: French <https://translate.codeberg.org/projects/pv/pv/fr/>\n"
"Language: fr\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 2026.5\n"
"Date: 1999-06-01 15:18:29+0100\n"
"From: Andrew Wood <ivarch@ubik>\n"
"Xgettext-Options: --default-domain=pkgbuild --directory=./.pkgdir --add-"
"comments --keyword=_ --keyword=N_\n"
"Files: src/getopt/getopt.c src/getopt/getopt1.c src/version.c src/main/"
"init.c src/main/help.c src/main/xpmptr.c src/guts/load.c src/guts/stop.c src/"
"guts/configure.c src/guts/make.c src/guts/install.c src/guts/prefs.c src/ui/"
"generate.c src/ui/main.c src/ui/xpm.c src/ui/status.c src/ui/activate.c src/"
"ui/handlers/main.c src/ui/handlers/package.c src/ui/handlers/prefs.c src/ui/"
"handlers/dirsel.c src/ui/handlers/popup.c src/ui/handlers/help.c src/ui/"
"textout.c src/ui/report.c src/ui/callback.c src/nls/intl/bindtextdom.c src/"
"nls/intl/dcgettext.c src/nls/intl/dgettext.c src/nls/intl/finddomain.c src/"
"nls/intl/gettext.c src/nls/intl/loadmsgcat.c src/nls/intl/localealias.c src/"
"nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
"compat.c\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "afficher la barre de progression"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "afficher le temps écoulé"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "afficher l'heure approximative de l'achèvement de la tâche"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "afficher l'heure absolute de l'achèvement de la tâche"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "afficher le taux de tranfert des données"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "afficher le compteur de taux moyen de transfert de données"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "afficher le nombre d'octets transférés"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "afficher le pourcentage de tampon de transfert utilisé"
#: src/main/help.c:323
msgid "NUM"
msgstr "NUM"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "afficher les derniers NUM octets écrits"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "définir le format de sortie sur FORMAT"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "imprimer en pourcentage plutôt que des informations visuelles"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "n'afficher aucune information de transfert"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "afficher le nombre de bits transférés"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "traiter les suffixes comme des multiples de 1000 au lieu de 1024"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "ne rien afficher avant qu'au moins un octet soit tranféré"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "SEC"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "ne rien afficher jusqu'à ce que SEC secondes se soient écoulées"
#: src/main/help.c:348
msgid "SIZE"
msgstr "TAILLE"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "ajuster la taille estimée des données à TAILLE octets"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr ""
"si la taille est inconnue, afficher le taux de transfert par rapport au taux "
"de transfert max"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "compter les lignes au lieu des octets"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "les lignes sont terminées par un caractère nul"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "mettre à jour toutes les SEC secondes"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr ""
"calculer le taux moyen d'après les SEC dernières secondes (30s par défaut)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "LARGEUR"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "présumer la largeur du terminal à LARGEUR caractères"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "HAUTEUR"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "présumer la hauteur du terminal à HAUTEUR lignes"
#: src/main/help.c:372
msgid "NAME"
msgstr "NOM"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "préfixer les informations visuelles avec NOM"
#: src/main/help.c:375
msgid "STYLE"
msgstr "STYLE"
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr "définir le style de barre par défaut à STYLE"
#: src/main/help.c:378
msgid "SPEC"
msgstr "SPÉCIFICATION"
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr "aussi envoyer la progression à SPÉCIFICATION"
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "afficher les statistiques de transfert à la fin"
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr ""
"imprimer vers la sortie d'erreur standard même si ce n'est pas un terminal"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr "utiliser les séquences d'échappements de positionnement de curseur"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "FICHIER"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "écrire la sortie dans FICHIER au lieu de la sortie standard"
#: src/main/help.c:394
msgid "RATE"
msgstr "TAUX"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "limite le taux de transfert à TAUX octets par seconde"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "OCTETS"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "utiliser une mémoire tampon de OCTETS octets"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "ne jamais utiliser splice(), toujours utiliser read/write"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr "définir la taille du tampon de mémoire du tube à OCTETS octets"
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "ignorer les erreurs de lecture dans l'entrée"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "ignorer les erreurs dans OCTETS blocs à la fois"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "arrêter après le transfert de --size octets"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "vider le cache sur le disque après chaque écriture"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr "utiliser les E/S directes pour contourner le cache"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr "écrire des trous dans le fichier au lieu d'octets nuls"
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "rejeter l'entrée au lieu de l'écrire vers la sortie"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr "écrire toute l'entrée vers FICHIER avant de l'écrire vers la sortie"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr "PID[:FD]|=NOM|@FICHIER"
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "surveiller le fichier FD ouvert par le processus PID"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr "PID"
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "mettre à jour la configuration du processus PID"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr "afficher la progression du processus PID"
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
"exécuter une commande et surveiller son entrée standard, sa sortie ou les "
"deux"
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "enregistrer l'ID de processus dans FICHIER"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "afficher cette aide puis quitter"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "afficher la version puis quitter"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "écrire les journaux de déboggage vers FICHIER"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Utilisation : %s [OPTIONS] [FICHIER]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
"Concaténer FICHIER(s), ou l'entrée standard, sur la sortie standard avec "
"monitorage."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr "Séquences de formatage supportées :"
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "SVP rapporter tous bogues à %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(entrée)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr "une commande à exécuter doit être spécifiée"
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "échec d'allocation mémoire"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr "les fichiers de liste ne peuvent pas contenir de lignes « @ »"
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "ID de processus ou paire pid:fd attendue"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "ID de processus non valide"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr "valeur numérique non comprise"
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "valeur entière attendue"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "valeur numérique attendue"
#: src/main/options.c:863
msgid "missing filename"
msgstr "nom de fichier manquant"
#: src/main/options.c:889
msgid "missing process name"
msgstr "nom de processus manquant"
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr "côté inacceptable"
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Essayez `%s --help' pour plus d'informations."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Essayez `%s -h' pour plus d'informations."
#: src/main/options.c:1227
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:1235
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:1243
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:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
"impossible d'utiliser une requête distante lorsque vous regardez des "
"descripteurs de fichiers"
#: src/main/options.c:1259
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:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "non disponible sur les systèmes sans /proc/self/fdinfo"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr ""
"impossible d'utiliser simultanément le contrôle à distance et "
"l'interrogation à distance"
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr "impossible d'utiliser mode moniteur avec cette option"
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
"impossible d'utiliser mode moniteur avec le stockage et la retransmission"
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr "les fichiers ne peuvent pas être spécifiés avec cette option"
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "License : GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr ""
"Ceci est un logiciel libre : vous êtes libre de le modifier et de le "
"redistribuer."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr "Il n'y a AUCUNE GARANTIE, dans la mesure permise par la loi."
#: src/main/version.c:32
msgid "Project web site"
msgstr "Site web du projet"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "échec de l'ouverture du fichier de verrouillage"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "interrompu par un signal"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr "yzafpnum kMGTPEZY"
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnum KMGTPEZY"
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr "/dev/null n'est pas utilisable"
#: src/pv/file.c:371
msgid "error closing file"
msgstr "erreur à la fermeture du fichier"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "le fichier d'entrée est aussi le fichier de sortie"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(aucun)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr "(stdin)"
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr "b/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr "/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "O/s"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr "b"
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr "O"
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr "ETA"
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr "FIN"
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr "taux min/moy/max/écart-type"
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "taux non mesuré"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr "pid"
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr "fd"
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "message non reçu"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO non pris en charge sur ce système"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "avertissement : erreurs de lecture détectées"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr "erreur de lecture dépassée"
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "erreur d'écriture"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "pas un fichier ordinaire ou un périphérique de bloc"
#~ msgid "state allocation failed"
#~ msgstr "échec de l'allocation de mémoire de condition"
#~ msgid "failed to stat file"
#~ msgstr "échec à statuer sur le fichier"
#~ msgid "is a directory"
#~ msgstr "est un répertoire"
#~ msgid "failed to generate sysfs filename"
#~ msgstr "échec de génération du nom de fichier sysfs"
#~ msgid "failed to read sysfs size file"
#~ msgstr "échec de la lecture de la taille du fichier sysfs"
#~ msgid "failed to open block device"
#~ msgstr "échec de l'ouverture du périphérique de bloc"
#~ msgid "failed to determine size of block device"
#~ msgstr "échec de l'évaluation de la taille du périphérique de bloc"
#~ msgid "option structure allocation failed"
#~ msgstr "l'allocation pour la structure d'une option a échoué"
#~ msgid "option structure argv allocation failed"
#~ msgstr "l'allocation pour la structure de l'option argv a échoué"
#~ msgid "failed to get terminal name"
#~ msgstr "échec de lecture du nom du terminal"
#~ msgid "lock attempt failed"
#~ msgstr "échec de la tentative de verrouillage"
#~ msgid "failed to open terminal"
#~ msgstr "échec de l'ouverture du terminal"
#~ msgid "failed to seek to start of output"
#~ msgstr "ne peut pas passer au début de la sortie"
#~ msgid "failed to read file"
#~ msgstr "la lecture du fichier a échoué"
#~ msgid "failed to stat output file"
#~ msgstr "échec à statuer sur le fichier de sortie"
#~ msgid "history structure allocation failed"
#~ msgstr "l'allocation de la structure de l'historique a échoué"
#~ msgid "file list allocation failed"
#~ msgstr "échec de l'allocation de la liste de fichiers"
#~ msgid "read failed"
#~ msgstr "la lecture a échoué"
#~ msgid "file is not seekable"
#~ msgstr "ne peut pas se déplacer dans le fichier"
#~ msgid "failed to seek past error"
#~ msgstr "n'a pas réussi à dépasser l'erreur"
#~ msgid "no transfer buffer allocated"
#~ msgstr "aucun tampon de transfert alloué"
#~ msgid "failed to set interval timer"
#~ msgstr "La définition de l'intervalle du minuteur a échoué"
#~ msgid "failed to clear interval timer"
#~ msgstr "La réinitialisation des intervalles du minuteur a échoué"
#~ msgid "line position buffer allocation failed"
#~ msgstr ""
#~ "L'allocation de la position de la ligne de la mémoire tampon a échoué"
#~ msgid "select call failed"
#~ msgstr "l'appel de sélection a échoué"
#~ msgid "PID[:FD]"
#~ msgstr "PID[:FD]"
#~ msgid "failed to set alarm signal handler"
#~ msgstr "échec de la définition du gestionnaire de signal d'alarme"
+535
View File
@@ -0,0 +1,535 @@
msgid ""
msgstr ""
"Project-Id-Version: pv 1.9.34\n"
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2026-05-16 19:25+0000\n"
"Last-Translator: a-j-wood <a-j-wood@noreply.codeberg.org>\n"
"Language-Team: Georgian <https://translate.codeberg.org/projects/pv/pv/ka/>\n"
"Language: ka\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.17.1\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "პროგრესის ზოლის ჩვენება"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "გასული დროის ჩვენება"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "სავარაუდო დასრულების დროის ჩვენება"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "დასრულების აბსოლუტური სავარაუდო დროის ჩვენება"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "მონაცემთა გადაცემის სიჩქარის ჩვენება"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "საშუალო მონაცემთა გადაცემის სიჩქარის ჩვენება"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "გადატანილი ბაიტების რაოდენობის ჩვენება"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "გამოყენებული გადაცემის ბუფერის პროცენტული მაჩვენებლის ჩვენება"
#: src/main/help.c:323
msgid "NUM"
msgstr "ႬႭႫ"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "ბოლოს დაწერილი ႬႭႫ ბაიტის ჩვენება"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "ႴႭႰႫႠႲႨ"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "გამომავალი ფორმატის დაყენება ႴႭႰႫႠႲႨ"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "გამომავალი პროცენტები, არა ვიზუალური ინფორმაცია"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "პროგრესის ინფორმაცია არ აჩვენოთ"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "გადაცემული ბიტების რაოდენობის ჩვენება"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "სუფიქსების 1000-ის ჯერადად განხილვა 1024-ის ნაცვლად"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "არაფერი აჩვენოს პირველი ბაიტის გადატანამდე"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "ႼႠႫ"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "არაფერი აჩვენოს ႼႠႫ წამების გასვლამდე"
#: src/main/help.c:348
msgid "SIZE"
msgstr "ႦႭႫႠ"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "მონაცემთა სავარაუდო ზომის ႦႭႫႠ ბაიტებზე დაყენება"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr "თუ ზომა უცნობია, აჩვენეთ სიჩქარე მაქსიმალურ სიჩქარესთან შედარებით"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "ბაიტების ნაცვლად ხაზების დათვლა"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "ხაზები ნულით დასრულებულია"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "განახლება ყოველ ႼႠႫ წამში"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr ""
"გამოთვალეთ საშუალო მაჩვენებელი ბოლო ႼႠႫ წამების განმავლობაში (ნაგულისხმევი "
"30 წმ)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "ႱႨႢႠႬႤ"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "ვივარაუდოთ, რომ ტერმინალი ႱႨႢႠႬႤ სიმბოლოს სიგანისაა"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "ႱႨႫႠႶႪႤ"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "ვივარაუდოთ, რომ ტერმინალი ႱႨႫႠႶႪႤ რიგის სიმაღლისაა"
#: src/main/help.c:372
msgid "NAME"
msgstr "ႱႠႾႤႪႨ"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "გამომავალი ხაზის დასაწყისში ႱႠႾႤႪႨ-ის ჩვენება"
#: src/main/help.c:375
msgid "STYLE"
msgstr "ႱႲႨႪႨ"
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr "ნაგულისხმევი ზოლის სტილი ႱႲႨႪႨ-ზე დააყენეთ"
#: src/main/help.c:378
msgid "SPEC"
msgstr "ႱႮႤႺႨႴႨႩႠ"
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr "ასევე გაუგზავნეთ პროგრესი ႱႮႤႺႨႴႨႩႠ-ს"
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "სტატისტიკის ჩვენება ბოლოს"
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr "გამომავალი მაშინაც კი, თუ სტანდარტული შეცდომა ტერმინალი არ არის"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr "კურსორის პოზიციონირება ტერმინალის კოდებით"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "ႴႠႨႪႨ"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "ჩაწერეთ გამომავალი ႴႠႨႪႨ-ში სტანდარტული გამომავალის ნაცვლად"
#: src/main/help.c:394
msgid "RATE"
msgstr "ႱႨႹႵႠႰႤ"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "სიჩქარის შეზღუდვა წამში ႱႨႹႵႠႰႤ ბაიტამდე"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "ႡႠႨႲႤႡႨ"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "გამოიყენეთ ႡႠႨႲႤႡႨ ბუფერის ზომა"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "არასდროს გამოიყენოთ splice(), ყოველთვის გამოიყენეთ წაკითხვა/ჩაწერა"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr "მილის ბუფერის ზომა დააყენეთ ႡႠႨႲႤႡႨ ბაიტზე"
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "შეყვანის შეცდომების გამოტოვება"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "შეცდომების გამოტოვება ႡႠႨႲႤႡႨ ბაიტის ბლოკებში"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "შეჩერება --size ბაიტების გადატანის შემდეგ"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "დისკის ჩაწერის ქეშის გასუფთავება ყოველი ჩაწერის შემდეგ"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr "ქეშის გვერდის ავლით პირდაპირი შეყვანის/გამოყვანის გამოყენებით"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr "დატოვეთ ხვრელები გამომავალში ნულოვანი ბაიტების ჩაწერის ნაცვლად"
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "შეყვანის გაუქმება გამოსავალში ჩაწერის ნაცვლად"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr "ყველა შემავალი მონაცემი ႴႠႨႪႨ-ში ჩაწერეთ გამოსავალში ჩაწერამდე"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr "ႮႨႣ[:ႴႠ]|=ႱႠႾႤႪႨ|@ႴႠႨႪႨ"
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "ფაილის აღწერის ყურება ႴႠ გახსნილია ႮႨႣ პროცესის მიერ"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr "ႮႨႣ"
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "პროცესის ႮႨႣ-ის პარამეტრების განახლება"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr "პროცესის ႮႨႣ პროგრესის ჩვენება"
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
"ბრძანების გაშვება და მისი სტანდარტული შეყვანის, გამომავალი ან ორივეს "
"მონიტორინგი"
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "პროცესის იდენტიფიკატორის შენახვა ႴႠႨႪႨ-ში"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "აჩვენეთ ეს დახმარება და გადით"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "ვერსიის ინფორმაციის ჩვენება და გასვლა"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "გამართვის ჟურნალების ႴႠႨႪႨ-ში ჩაწერა"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "გამოყენება: %s [ႠႰႹႤႥႠ] [ႴႠႨႪႨ]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr "შეყვანის ფაილების გადატანა გამოსავალზე მონიტორინგით."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr "მხარდაჭერილი ფორმატის თანმიმდევრობები:"
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "ნებისმიერი შეცდომის შესახებ, გთხოვთ, შეატყობინოთ შემდეგ მისამართზე: %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(შეყვანა)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr "შესასრულებელი ბრძანება უნდა იყოს მითითებული"
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "მეხსიერების გამოყოფის შეცდომა"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr "სიის ფაილები არ შეიძლება შეიცავდეს \"@\" ხაზებს"
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr ""
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr ""
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr ""
#: src/main/options.c:842
msgid "integer argument expected"
msgstr ""
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr ""
#: src/main/options.c:863
msgid "missing filename"
msgstr "ფაილის სახელი აკლია"
#: src/main/options.c:889
msgid "missing process name"
msgstr ""
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr ""
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "დამატებითი ინფორმაციისთვის სცადეთ `%s --help'."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "დამატებითი ინფორმაციისთვის სცადეთ `%s -h'."
#: src/main/options.c:1227
msgid ""
"cannot use line mode or transfer modifier options when watching file "
"descriptors"
msgstr ""
#: src/main/options.c:1235
msgid "cannot use cursor positioning when watching file descriptors"
msgstr ""
#: src/main/options.c:1243
msgid "cannot use remote control when watching file descriptors"
msgstr ""
#: src/main/options.c:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr ""
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr ""
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr ""
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr ""
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr ""
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "ლიცენზია: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr ""
"ეს არის უფასო პროგრამული უზრუნველყოფა: თქვენ შეგიძლიათ შეცვალოთ და ხელახლა "
"გაავრცელოთ იგი."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr "კანონით დაშვებული ფარგლებში, გარანტია არ არსებობს."
#: src/main/version.c:32
msgid "Project web site"
msgstr "პროექტის ვებსაიტი"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "დაბლოკვის ფაილის გახსნა ვერ მოხერხდა"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "შეწყვეტილია სიგნალის მიერ"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr ""
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr "/dev/null არ არის გამოსაყენებელი"
#: src/pv/file.c:371
msgid "error closing file"
msgstr "ფაილის დახურვის შეცდომა"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "შეტანის ფაილი ასევე გამოსატანიცაა"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(არცერთი)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr "(stdin)"
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr ""
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr ""
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr ""
#: src/pv/format/bytes.c:35
msgid "b"
msgstr ""
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr ""
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr ""
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr ""
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr "სიჩქარე მინიმალური/საშუალო/მაქსიმალური/სტანდარტული გადახრა"
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "სიჩქარე არ იზომებოდა"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr ""
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr ""
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "შეტყობინება არ არის მიღებული"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr ""
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "გაფრთხილება: წაკითხვის შეცდომები აღმოჩენილია"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr ""
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "ჩაწერის შეცდომა"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr ""
+635
View File
@@ -0,0 +1,635 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2026-05-18 20:38+0000\n"
"Last-Translator: a-j-wood <a-j-wood@noreply.codeberg.org>\n"
"Language-Team: Polish <https://translate.codeberg.org/projects/pv/pv/pl/>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 2026.5\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "pokaż pasek postępu"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "pokaż upływający czas"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "pokaż szacowany czas ukończenia"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "pokaż bezwzględny szacowany czas ukończenia"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "pokaż licznik prędkości przesyłania"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "pokaż licznik uśrednionej prędkości przesyłania"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "pokaż ilość przesłanych bajtów"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "pokaż procentowe użycie bufora transferu"
#: src/main/help.c:323
msgid "NUM"
msgstr "LICZBA"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "pokaż ostatnie LICZBA przesłanych bajtów"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "ustaw FORMAT jako format wyjściowy"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "wyświetl wyjście procentowo, bez graficznej prezentacji"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "nie wyświetlaj żadnych informacji o przesyłaniu"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "pokaż ilość przesłanych bitów"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "traktuj przyrostki jako wielokrotności 1000 zamiast 1024"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "nie wyświetlaj nic aż do pierwszego przesłanego bajtu"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "SEKUNDY"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "nie wyświetlaj nic do momentu upłynięcia SEKUNDY sekund"
#: src/main/help.c:348
msgid "SIZE"
msgstr "ROZMIAR"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "ustaw oczekiwany rozmiar danych na ROZMIAR bajtów"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr ""
"jeśli rozmiar nie jest znany, wyświetl zestawienie prędkości do maksymalnej "
"prędkości"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "zliczaj linie zamiast bajty"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "linie są zakończone znakiem NUL"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "aktualizuj co każde SEKUNDY sekund"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr ""
"oblicz średnią prędkość transferu na podstawie poprzednich SEKUNDY sekund "
"(domyślnie 30 s)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "SZEROKOŚĆ"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "przyjmij, że terminal ma szerokość SZEROKOŚĆ znaków"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "WYSOKOŚĆ"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "przyjmij, że terminal ma wysokość WYSOKOŚĆ linii"
#: src/main/help.c:372
msgid "NAME"
msgstr "NAZWA"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "poprzedź informacje prefiksem NAZWA"
#: src/main/help.c:375
msgid "STYLE"
msgstr "STYL"
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr "ustaw domyślny styl paska postępu na STYL"
#: src/main/help.c:378
msgid "SPEC"
msgstr "SPEC"
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr "wysyłaj postęp również do SPEC"
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "wyświetl na końcu statystyki transferu"
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr "pokaż wyjście nawet standardowe wyjście błędu nie jest terminalem"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr "używaj znaków ucieczki do pozycjonowania kursora"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "PLIK"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "zapisz wyjście do PLIK zamiast do wyjścia standardowego"
#: src/main/help.c:394
msgid "RATE"
msgstr "PRĘDKOŚĆ"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "ogranicz przesyłane dane do PRĘDKOŚĆ bajtów na sekundę"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "BAJTY"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "użyj bufora o rozmiarze BAJTY"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "nigdy nie używaj splice(), zawsze używaj read/write"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr "użyj bufora potokowego o rozmiarze BAJTY"
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "pomijaj błędy odczytu wejścia"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "pomijaj błędy w blokach po BAJTY bajtów na raz"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "zakończ po przesłaniu --size bajtów"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "wymuś zapis pamięci podręcznej na dysk po każdym zapisie"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr ""
"użyj bezpośredniego wejścia/wyjścia celem pominięcia pamięci podręcznej"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr "próbuj przewinąć zamiast wypisywać zerowe bajty"
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "zignoruj dane wejściowe zamiast wyświetlić je na wyjściu standardowym"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr ""
"zapisz wszystkie dane wejściowe do PLIK przed wyświetleniem ich na wyjściu"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr "PID[:FD]|=NAZWA|@PLIKLISTY"
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "obserwuj plik FD otworzony przez proces PID"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr "PID"
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "zaktualizuj ustawienia procesu PID"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr "pokaż postęp procesu PID"
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr "uruchom polecenie i monitoruj jego wejście i/lub wyjście standardowe"
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "zapisz ID procesu do PLIK"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "wyświetl te informacje z pomocą i wyjdź"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "wyświetl informacje o wersji i wyjdź"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "zapisz logi debugujące do PLIK"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Sposób użycia: %s [OPCJA] [PLIK]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
"Łączenie PLIK(ów) lub wejścia standardowego, do wyjścia standardowego z "
"monitorowaniem."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr "Wspierane sekwencje formatowania:"
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Proszę przesyłać zgłoszenia błędów do %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(wejście)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr "polecenie do uruchomienia musi zostać określone"
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "błąd przydziału pamięci"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr "pliki list nie mogą zawierać linii wykorzystujących @"
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "oczekiwany proces ID lub para PID:FD"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "niepoprawne ID procesu"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr "wartość liczbowa niezrozumiana"
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "oczekiwany argument typu liczby całkowitej"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "oczekiwany argument liczbowy"
#: src/main/options.c:863
msgid "missing filename"
msgstr "brakująca nazwa pliku"
#: src/main/options.c:889
msgid "missing process name"
msgstr "brakująca nazwa procesu"
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr "niepoprawne określenie monitorowanych stron"
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Spróbuj `%s --help' by uzyskać więcej informacji."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Spróbuj `%s -h' by uzyskać więcej informacji."
#: src/main/options.c:1227
msgid ""
"cannot use line mode or transfer modifier options when watching file "
"descriptors"
msgstr ""
"nie można użyć trybu zliczania linii lub opcji modyfikujących przesył "
"łącznie z opcją obserwowania deskryptorów plików"
#: src/main/options.c:1235
msgid "cannot use cursor positioning when watching file descriptors"
msgstr ""
"nie można użyć pozycjonowania kursora łącznie z opcją obserwowania "
"deskryptorów plików"
#: src/main/options.c:1243
msgid "cannot use remote control when watching file descriptors"
msgstr ""
"nie można korzystać ze zdalnego sterowania łącznie z obserwowaniem "
"deskryptorów plików"
#: src/main/options.c:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
"nie można korzystać ze zdalnego odczytu łącznie z obserwowaniem deskryptorów "
"plików"
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr "nie można przesyłać plików z opcją obserwowania deskryptorów plików"
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "niedostępne na systemach bez /proc/self/fdinfo"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr "nie można użyć zdalnego sterowania i zdalnego odczytu jednocześnie"
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr "tryb monitorowania nie może być określony z tą opcją"
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr "tryb monitorowania nie może być użyty z store-and-forward"
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr "pliki nie mogą być określone przy użyciu tej opcji"
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "Licencja: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr "To jest wolne oprogramowanie: masz prawo do zmian i redystrybucji."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr "Nie udziela się GWARANCJI w zakresie dozwolonym przez prawo."
#: src/main/version.c:32
msgid "Project web site"
msgstr "Strona projektu"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "nie udało się otworzyć pliku blokowania zasobów"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "przerwany przez sygnał"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr "yzafpnum kMGTPEZY"
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnum KMGTPEZY"
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr "/dev/null nie nadaje się do użytku"
#: src/pv/file.c:371
msgid "error closing file"
msgstr "błąd zamknięcia pliku"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "plik wejściowy jest również plikiem wyjściowym"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(brak)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr "(stdin)"
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr "b/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr "/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "B/s"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr "b"
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr "B"
# "Przewidywany czas ukończenia" for ETA is too long
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr "ETA"
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr "FIN"
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr "prędkość min/śr/max/odch"
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "prędkość niezmierzona"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr "pid"
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr "fd"
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "wiadomość nieodebrana"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO nie jest wspierane na tym systemie"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "ostrzeżenie: błędy odczytu wykryte"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr "pominięto błąd odczytu"
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "błąd zapisu"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "plik nie jest plikiem regularnym lub urządzeniem blokowym"
#~ msgid "state allocation failed"
#~ msgstr "alokacja stanu programu nie powiodła się"
#~ msgid "failed to stat file"
#~ msgstr "nie udało się wykonać operacji stat na pliku"
#~ msgid "is a directory"
#~ msgstr "jest katalogiem"
#~ msgid "failed to generate sysfs filename"
#~ msgstr "nie udało się wygenerować nazwy pliku dla sysfs"
#~ msgid "failed to read sysfs size file"
#~ msgstr "nie udało się odczytać rozmiaru pliku sysfs"
#~ msgid "failed to open block device"
#~ msgstr "nie udało się otworzyć urządzenia blokowego"
#~ msgid "failed to determine size of block device"
#~ msgstr "nie udało się ustalić rozmiaru urządzenia blokowego"
#~ msgid "option structure allocation failed"
#~ msgstr "nie udało się zaalokować struktur opcji"
#~ msgid "option structure argv allocation failed"
#~ msgstr "nie udało się zaalokować struktur opcji argv"
#~ msgid "failed to get terminal name"
#~ msgstr "nie udało się uzyskać nazwy terminala"
#~ msgid "lock attempt failed"
#~ msgstr "blokada zasobów nie powiodła się"
#~ msgid "failed to open terminal"
#~ msgstr "nie udało się otworzyć terminala"
#~ msgid "failed to seek to start of output"
#~ msgstr "nie udało się przewinąć wyjścia do początku"
#~ msgid "failed to read file"
#~ msgstr "nie udało się odczytać pliku"
#~ msgid "failed to stat output file"
#~ msgstr "nie udało się wykonać operacji stat na pliku wyjściowym"
#~ msgid "history structure allocation failed"
#~ msgstr "nie udało się zaalokować struktury historii"
#~ msgid "file list allocation failed"
#~ msgstr "nie udało się zaalokować listy plików"
#~ msgid "read failed"
#~ msgstr "błąd odczytu"
#~ msgid "file is not seekable"
#~ msgstr "pliku nie da się przewijać"
#~ msgid "failed to seek past error"
#~ msgstr "nie udało się przewinąć za błąd"
#~ msgid "no transfer buffer allocated"
#~ msgstr "brak zaalokowanego bufora transferu"
#~ msgid "failed to set interval timer"
#~ msgstr "nie udało się ustawić interwału czasowego"
#~ msgid "failed to clear interval timer"
#~ msgstr "nie udało się wyczyścić interwału czasowego"
#~ msgid "line position buffer allocation failed"
#~ msgstr "alokacja buforu pozycji linii nie powiodła się"
#~ msgid "select call failed"
#~ msgstr "nie udało się wywołać funkcji select"
#~ msgid "process list allocation failed"
#~ msgstr "nie udało się zaalokować listy procesów"
#~ msgid "file descriptor list allocation failed"
#~ msgstr "nie udało się zaalokować listy deskryptorów plików"
#~ msgid "PID[:FD]"
#~ msgstr "PID[:FD]"
+579
View File
@@ -0,0 +1,579 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+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"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "exibe barra de progressão"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "exibe tempo passado"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "exibe o tempo estimado de término"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "exibe o tempo absoluto estimado de término"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "exibe a taxa de transferência"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "exibe o contador da taxa média de transferência de dados"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "exibe a quantidade de bytes transferidos"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "exibe a porcentagem de buffer de transferência em uso"
#: src/main/help.c:323
msgid "NUM"
msgstr ""
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "exibe NUM bytes gravados pela última vez"
#: src/main/help.c:326
msgid "FORMAT"
msgstr ""
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "definir o formato de saída para FORMAT"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "exibe apenas as porcentagens, sem informações visuais"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "executa programa sem exibir quaisquer informações"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr ""
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr ""
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "não exibe nada até iniciar o processamento"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr ""
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "não exibir nada até que os segundos SEC tenham passado"
#: src/main/help.c:348
msgid "SIZE"
msgstr ""
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "seta a quantidade estimada de dados em SIZE bytes"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr ""
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "contar linhas em vez de bytes"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "linhas são terminadas em nulo"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "atualiza informações a cada SEC segundos"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr ""
#: src/main/help.c:366
msgid "WIDTH"
msgstr ""
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "presuma que o terminal tem WIDTH caracteres de largura"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr ""
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "presuma que o terminal tem HEIGHT caracteres de altura"
#: src/main/help.c:372
msgid "NAME"
msgstr ""
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "exibe NAME antes das demais informações"
#: src/main/help.c:375
msgid "STYLE"
msgstr ""
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr ""
#: src/main/help.c:378
msgid "SPEC"
msgstr ""
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr ""
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr "gera dados mesmo que a saída de erro seja redirecionada"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr "utiliza caracteres de escape para posicionar o cursor"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr ""
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr ""
#: src/main/help.c:394
msgid "RATE"
msgstr ""
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "limita a transferência a RATE bytes por segundo"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr ""
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "use um tamanho de buffer de BYTES"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "nunca use splice(), sempre use read/write"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr ""
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "ignorar erros de leitura em entrada"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr ""
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "parar após --size bytes terem sido transferidos"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr ""
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr ""
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr ""
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr ""
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr ""
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr ""
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "assistir arquivo FD aberto pelo processo PID"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr ""
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "atualizar as configurações do processo PID"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr ""
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "salvar ID do processo em FILE"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "exibe esta tela de ajuda e termina"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "exibe a versão e termina"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr ""
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Uso: %s [OPÇÕES] [ARQUIVOS]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
"Concatena ARQUIVO(s) ou a entrada padrão e grava na saída padrão, com "
"monitoramento."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Por favor, reporte quaisquer defeitos para %s"
#: src/main/main.c:225
msgid "(input)"
msgstr ""
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr ""
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "falha de alocação de memória"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr ""
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "ID do processo ou par pid:fd esperado"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "ID de processo inválido"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr ""
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "argumento inteiro esperado"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "argumento numérico esperado"
#: src/main/options.c:863
msgid "missing filename"
msgstr ""
#: src/main/options.c:889
msgid "missing process name"
msgstr ""
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr ""
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Tente `%s --help' para maiores informações."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Tente `%s -h' para maiores informações."
#: src/main/options.c:1227
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:1235
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:1243
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:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr "não pode transferir arquivos ao assistir descritores de arquivo"
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "não disponível em sistemas sem /proc/self/fdinfo"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr ""
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr ""
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr ""
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr ""
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr ""
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr ""
#: src/main/version.c:32
msgid "Project web site"
msgstr ""
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "erro ao abrir arquivo de bloqueio"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "interrompido por um sinal"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr ""
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr ""
#: src/pv/file.c:371
msgid "error closing file"
msgstr "erro ao fechar o ficheiro"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "ficheiro de entrada também é a saída"
#: src/pv/file.c:596
msgid "(none)"
msgstr ""
#: src/pv/file.c:598
msgid "(stdin)"
msgstr ""
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr ""
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr ""
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "B/s"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr ""
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr ""
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr "ETA"
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr ""
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr ""
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr ""
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr ""
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr ""
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "mensagem não recebida"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO não suportado neste sistema"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "aviso: erros de leitura detectados"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr "ignorado erro de leitura"
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "erro de escrita"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "não é um arquivo regular ou dispositivo de bloqueio"
#~ msgid "state allocation failed"
#~ msgstr "alocação de memória de status falhou"
#~ msgid "failed to stat file"
#~ msgstr "erro obtendo informações do arquivo"
#~ msgid "option structure allocation failed"
#~ msgstr "erro na alocação da estrutura de opções"
#~ msgid "option structure argv allocation failed"
#~ msgstr "erro na alocação da estrutura de opções argv"
#~ msgid "failed to get terminal name"
#~ msgstr "erro ao ler o nome do terminal"
#~ msgid "lock attempt failed"
#~ msgstr "tentativa de bloqueio falhou"
#~ msgid "failed to open terminal"
#~ msgstr "erro abrindo o terminal"
#~ msgid "failed to seek to start of output"
#~ msgstr "não pode mover para o início da produção"
#~ msgid "failed to read file"
#~ msgstr "erro lendo o arquivo"
#~ msgid "failed to stat output file"
#~ msgstr "erro obtendo informações do arquivo de saída"
#~ msgid "read failed"
#~ msgstr "erro de leitura"
#~ msgid "file is not seekable"
#~ msgstr "não pode mover dentro do arquivo"
#~ msgid "failed to seek past error"
#~ msgstr "não pode ir além do erro"
#~ msgid "select call failed"
#~ msgstr "erro na chamada da função select"
+595
View File
@@ -0,0 +1,595 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2025-01-15 19:08+0000\n"
"Last-Translator: 0ko <0ko@users.noreply.translate.codeberg.org>\n"
"Language-Team: Russian <https://translate.codeberg.org/projects/pv/pv/ru/>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 5.9.2\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "показать полосу прогресса"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "показать прошедшее время"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "показать примерное время завершения"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "показать примерное абсолютное время завершения"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "показать скорость передачи данных"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "показать среднюю скорость передачи данных"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "показать объём переданных данных в байтах"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "показать использование буфера передачи в процентах"
#: src/main/help.c:323
msgid "NUM"
msgstr "КОЛ"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "показать КОЛ байт, переданных в последний раз"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "ФОРМАТ"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "указать формат вывода как ФОРМАТ"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "показать проценты вместо визуальной информации"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "не отображать никакую информацию о передаче"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "показать объём переданных данных в битах"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "считать суффиксы как умножители на 1000, а не на 1024"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "ничего не показывать, пока не будет передан первый байт"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "СЕК"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "ничего не показывать, пока не пройдёт СЕК секунд"
#: src/main/help.c:348
msgid "SIZE"
msgstr "РАЗМ"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "указать ожидаемый объём данных как РАЗМ байт"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr "если объём неизвестен, показать скорость и макс. скорость"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "считать линии вместо байт"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "строки прерываются нулями"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "обновлять каждые СЕК секунд"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr "вычислять среднюю скорость за последние СЕК секунд (по умолчанию 30)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "ШИРИНА"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "считать, что в одной строке помещается ШИРИНА символов"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "ВЫСОТА"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "считать, что на экране помещается ВЫСОТА строк"
#: src/main/help.c:372
msgid "NAME"
msgstr "ИМЯ"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "писать ИМЯ до визуальной информации"
#: src/main/help.c:375
msgid "STYLE"
msgstr "СТИЛЬ"
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr "задать стиль полоски по умолчанию как СТИЛЬ"
#: src/main/help.c:378
msgid "SPEC"
msgstr ""
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "после завершения показать статистику"
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr "вевести, даже если стд. ошибка не является терминалом"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr ""
"использовать символьные последовательности для позиционирования курсора"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "ФАЙЛ"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "направить вывод в ФАЙЛ вместо стд. вывода"
#: src/main/help.c:394
msgid "RATE"
msgstr "СКОР"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "ограничить скорость передачи до СКОР байт/сек"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "БАЙТ"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "использовать буфер размера БАЙТ"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "использовать чтение/запись вместо splice()"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr ""
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "пропустить ошибки чтения во вводе"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "пропускать ошибки в <БАЙТ> блоках за раз"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "остановить после передачи --size байт"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "сбрасывать кеш на диск каждый раз"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr "использовать прямой ввод/вывод для обхода кеша"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr ""
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "отбрасывать ввод вместо записи в вывод"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr "записывать весь ввод в ФАЙЛ прежде, чем отправлять на вывод"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr ""
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "следить за FD файла, открытого процессом ИДпр"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr "ИДпр"
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "обновить настройки ИДпр процесса"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr ""
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "сохранить ИД процесса в ФАЙЛ"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "показать справку и завершить работу"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "показать версию программы и завершить работу"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "вести запись отладочного журнала в ФАЙЛ"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Использование: %s [ОПЦИИ] [ФАЙЛ]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr "Поддерживаемые последовательности:"
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Сообщайте о проблемах на: %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(ввод)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr ""
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "ошибка выделения памяти"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr ""
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "ожидался ИД процесса или пара ИДпр:ДФ"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "неправильный ИД процесса"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr "число не распознано"
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "ожидалось целое число"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "ожидалось число"
#: src/main/options.c:863
msgid "missing filename"
msgstr ""
#: src/main/options.c:889
msgid "missing process name"
msgstr ""
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr ""
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Выполните `%s --help' для получения подробностей."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Выполните `%s -h' для получения подробностей."
#: src/main/options.c:1227
msgid ""
"cannot use line mode or transfer modifier options when watching file "
"descriptors"
msgstr ""
#: src/main/options.c:1235
msgid "cannot use cursor positioning when watching file descriptors"
msgstr ""
#: src/main/options.c:1243
msgid "cannot use remote control when watching file descriptors"
msgstr "удалённое управление невозможно при отслеживании дескрипторов файлов"
#: src/main/options.c:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr "передача файлов невозможна при отслеживании дескрипторов файлов"
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "невозможно на системах без /proc/self/fdinfo"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr ""
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr ""
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr ""
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "Лицензия: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr "Это свободная программа. Вы можете изменять и распространять её."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr ""
"Разработчики не дают никаких гарантий, связанных с работой этой программы, "
"насколько это юридически возможно."
#: src/main/version.c:32
msgid "Project web site"
msgstr "Веб-сайт проекта"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "не удалось открыть блокирующий файл"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "прервано по сигналу"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr ""
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr ""
#: src/pv/file.c:371
msgid "error closing file"
msgstr "ошибка закрытия файла"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "файл ввода также используется и для вывода"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(нет)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr "(стд. ввод)"
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr "бит/с"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr "/с"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "байт/с"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr "бит"
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr "байт"
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr "ОЖИД"
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr "ЗАВЕРШ"
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr "скор. мин/сред/макс/дев"
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "скорость не изменяется"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr "ИДпр"
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr "дф"
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "сообщение не получено"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "Этой системой не поддерживается SA_SIGINFO"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "внимание: замечены ошибки чтения"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr ""
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "ошибка записи"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "не является обычным файлом или блочным устройством"
#~ msgid "failed to stat file"
#~ msgstr "не удалось получить информацию о файле"
#~ msgid "is a directory"
#~ msgstr "является каталогом"
#~ msgid "failed to generate sysfs filename"
#~ msgstr "не удалось создать имя файла sysfs"
#~ msgid "failed to read sysfs size file"
#~ msgstr "не удалось узнать размер файла sysfs"
#~ msgid "failed to open block device"
#~ msgstr "не удалось открыть блочное устройство"
#~ msgid "failed to determine size of block device"
#~ msgstr "не удалось определить размер блочного устройства"
#~ msgid "option structure allocation failed"
#~ msgstr "не удалось выделить память для структуры опций"
#~ msgid "option structure argv allocation failed"
#~ msgstr "не удалось выделить память для структуры опций argv"
#~ msgid "failed to get terminal name"
#~ msgstr "не удалось получить имя терминала"
#~ msgid "lock attempt failed"
#~ msgstr "попытка блокировки не удалась"
#~ msgid "failed to open terminal"
#~ msgstr "не удалось открыть терминал"
#~ msgid "failed to read file"
#~ msgstr "не удалось прочесть файл"
#~ msgid "failed to stat output file"
#~ msgstr "не удалось получить информацию о выходном файле"
#~ msgid "history structure allocation failed"
#~ msgstr "не удалось выделить память для структуры истории"
#~ msgid "file list allocation failed"
#~ msgstr "не удалось выделить память для списка файлов"
#~ msgid "read failed"
#~ msgstr "чтение не удалось"
#~ msgid "no transfer buffer allocated"
#~ msgstr "не выделена память для буфера передачи"
#~ msgid "failed to set interval timer"
#~ msgstr "не удалось задать измеритель временного промежутка"
#~ msgid "failed to clear interval timer"
#~ msgstr "не удалось очистить измеритель временного промежутка"
#~ msgid "select call failed"
#~ msgstr "запрос выборки не удался"
#~ msgid "PID[:FD]"
#~ msgstr "ИДпр[:FD]"
+617
View File
@@ -0,0 +1,617 @@
msgid ""
msgstr ""
"Project-Id-Version: pv 1.8.14\n"
"Report-Msgid-Bugs-To: https://codeberg.org/ivarch/pv/issues\n"
"POT-Creation-Date: 2026-06-05 23:29+0100\n"
"PO-Revision-Date: 2025-10-05 20:09+0000\n"
"Last-Translator: Oğuz Ersen <ersen@noreply.codeberg.org>\n"
"Language-Team: Turkish <https://translate.codeberg.org/projects/pv/pv/tr/>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.13.2\n"
#: src/main/help.c:300
msgid "show progress bar"
msgstr "ilerleme çubuğunu göster"
#: src/main/help.c:303
msgid "show elapsed time"
msgstr "geçen süreyi göster"
#: src/main/help.c:306
msgid "show estimated time of arrival (completion)"
msgstr "tahmini varış (tamamlanma) zamanını göster"
#: src/main/help.c:309
msgid "show absolute estimated time of arrival (completion)"
msgstr "mutlak tahmini varış (tamamlanma) zamanını göster"
#: src/main/help.c:312
msgid "show data transfer rate counter"
msgstr "veri aktarım oranı sayacını göster"
#: src/main/help.c:315
msgid "show data transfer average rate counter"
msgstr "veri aktarımı ortalama hız sayacını göster"
#: src/main/help.c:318
msgid "show number of bytes transferred"
msgstr "aktarılan bayt sayısını göster"
#: src/main/help.c:321
msgid "show percentage of transfer buffer in use"
msgstr "aktarım tamponunun kullanım yüzdesini göster"
#: src/main/help.c:323
msgid "NUM"
msgstr "NUM"
#: src/main/help.c:324
msgid "show NUM bytes last written"
msgstr "son yazılan NUM baytlarını göster"
#: src/main/help.c:326
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:327
msgid "set output format to FORMAT"
msgstr "çıktı formatını FORMAT olarak ayarlayın"
#: src/main/help.c:330
msgid "output percentages, not visual information"
msgstr "görsel bilgileri değil, yüzdeleri çıktı olarak yazdır"
#: src/main/help.c:333
msgid "do not output any transfer information at all"
msgstr "hiçbir transfer bilgisini yazdırma"
#: src/main/help.c:337
msgid "show number of bits transferred"
msgstr "aktarılan bit sayısını göster"
#: src/main/help.c:340
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "ekleri 1024 yerine 1000'in katları olarak değerlendir"
#: src/main/help.c:343
msgid "display nothing until first byte transferred"
msgstr "ilk bayt aktarılana kadar hiçbir şey gösterme"
#: src/main/help.c:345 src/main/help.c:360 src/main/help.c:363
msgid "SEC"
msgstr "SEC"
#: src/main/help.c:346
msgid "display nothing until SEC seconds have passed"
msgstr "SEC saniye geçene kadar hiçbir şey gösterme"
#: src/main/help.c:348
msgid "SIZE"
msgstr "BOYUT"
#: src/main/help.c:349
msgid "set estimated data size to SIZE bytes"
msgstr "tahmini veri boyutunu BOYUT bayt olarak ayarlayın"
#: src/main/help.c:352
msgid "if size unknown, show rate vs max rate"
msgstr "boyut bilinmiyorsa, oranı maksimum oranla göster"
#: src/main/help.c:355
msgid "count lines instead of bytes"
msgstr "bayt yerine satır say"
#: src/main/help.c:358
msgid "lines are null-terminated"
msgstr "satırlar boş sonlandırılır"
#: src/main/help.c:361
msgid "update every SEC seconds"
msgstr "her SEC saniyede bir güncelleme"
#: src/main/help.c:364
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr "geçmiş SEC saniyeleri üzerinden ortalama hızı hesapla (varsayılan 30s)"
#: src/main/help.c:366
msgid "WIDTH"
msgstr "GENİŞLİK"
#: src/main/help.c:367
msgid "assume terminal is WIDTH characters wide"
msgstr "terminalin GENİŞLİK karakter genişliğinde olduğunu varsayalım"
#: src/main/help.c:369
msgid "HEIGHT"
msgstr "YÜKSEKLİK"
#: src/main/help.c:370
msgid "assume terminal is HEIGHT rows high"
msgstr "terminalin YÜKSEKLİK sıraları yüksekliğinde olduğunu varsayalım"
#: src/main/help.c:372
msgid "NAME"
msgstr "İSİM"
#: src/main/help.c:373
msgid "prefix visual information with NAME"
msgstr "görsel bilgiyi İSİM ile öne ekle"
#: src/main/help.c:375
msgid "STYLE"
msgstr "BİÇİM"
#: src/main/help.c:376
msgid "set default bar style to STYLE"
msgstr "öntanımlı çubuk biçimini BİÇİM olarak ayarla"
#: src/main/help.c:378
msgid "SPEC"
msgstr "BELİRT"
#: src/main/help.c:379
msgid "also send progress to SPEC"
msgstr "ilerlemeyi BELİRT ögesine de gönder"
#: src/main/help.c:382
msgid "output transfer statistics at the end"
msgstr "transfer istatistiklerini sonda göster"
#: src/main/help.c:385
msgid "output even if standard error is not a terminal"
msgstr "standart hata bir terminal olmasa bile çıktı yazdır"
#: src/main/help.c:388
msgid "use cursor positioning escape sequences"
msgstr "imleç konumlandırma kaçış dizilerini kullan"
#: src/main/help.c:391 src/main/help.c:427 src/main/help.c:446
#: src/main/help.c:456
msgid "FILE"
msgstr "DOSYA"
#: src/main/help.c:392
msgid "write output to FILE instead of stdout"
msgstr "çıktıyı stdout yerine DOSYA'ya yaz"
#: src/main/help.c:394
msgid "RATE"
msgstr "ORAN"
#: src/main/help.c:395
msgid "limit transfer to RATE bytes per second"
msgstr "aktarımı saniye başına ORAN bayt ile sınırlandırın"
#: src/main/help.c:397 src/main/help.c:403 src/main/help.c:409
msgid "BYTES"
msgstr "BAYTLAR"
#: src/main/help.c:398
msgid "use a buffer size of BYTES"
msgstr "BAYTLAR tampon boyutu kullanın"
#: src/main/help.c:401
msgid "never use splice(), always use read/write"
msgstr "splice() kullanma, her zaman read/write kullan"
#: src/main/help.c:404
msgid "set the pipe buffer size to BYTES"
msgstr ""
#: src/main/help.c:407
msgid "skip read errors in input"
msgstr "girdideki okuma hatalarını atla"
#: src/main/help.c:410
msgid "skip errors in BYTES blocks at a time"
msgstr "BAYTLAR blokları halinde hataları atla"
#: src/main/help.c:413
msgid "stop after --size bytes have been transferred"
msgstr "--size bayt transfer edildikten sonra dur"
#: src/main/help.c:416
msgid "flush cache to disk after every write"
msgstr "her yazmadan sonra önbelleği diske boşalt"
#: src/main/help.c:419
msgid "use direct I/O to bypass cache"
msgstr "Önbelleği atlamak için doğrudan I/O kullan"
#: src/main/help.c:422
msgid "try to seek instead of writing null bytes"
msgstr ""
#: src/main/help.c:425
msgid "discard input instead of writing to output"
msgstr "Girdiyi çıktıya yazmak yerine yok say"
#: src/main/help.c:428
msgid "write all input to FILE before writing to output"
msgstr "çıktıya yazmadan önce tüm girdiyi DOSYA'ya yaz"
#: src/main/help.c:431
msgid "PID[:FD]|=NAME|@LISTFILE"
msgstr ""
#: src/main/help.c:432
msgid "watch file FD opened by process PID"
msgstr "FD izleme dosyası PID işlemi tarafından açıldı"
#: src/main/help.c:435 src/main/help.c:438
msgid "PID"
msgstr "PID"
#: src/main/help.c:436
msgid "update settings of process PID"
msgstr "süreç PID ayarlarını güncelle"
#: src/main/help.c:439
msgid "show progress of process PID"
msgstr ""
#: src/main/help.c:443
msgid "run a command and monitor its standard input, output, or both"
msgstr ""
#: src/main/help.c:447
msgid "save process ID in FILE"
msgstr "FILE'da işlem kimliğini (ID) kaydet"
#: src/main/help.c:450
msgid "show this help and exit"
msgstr "bu yardımı göster ve çık"
#: src/main/help.c:453
msgid "show version information and exit"
msgstr "sürüm bilgilerini göster ve çık"
#: src/main/help.c:457
msgid "write debug logs to FILE"
msgstr "Hata ayıklama kayıtlarını DOSYA'ya yaz"
#: src/main/help.c:483
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Kullanım şekli: %s [AYAR] [DOSYA]..."
#: src/main/help.c:494
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
"İzleme ile DOSYA(lar)ı veya standart girdiyi standart çıktı ile birleştirin."
#: src/main/help.c:636
msgid "Supported format sequences:"
msgstr "Desteklenen biçim dizileri:"
#: src/main/help.c:650
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Lütfen hataları şu adrese bildirin: %s"
#: src/main/main.c:225
msgid "(input)"
msgstr "(giriş)"
#: src/main/main.c:381 src/main/options.c:1355
msgid "a command to run must be specified"
msgstr ""
#: src/main/main.c:704 src/main/options.c:756 src/main/options.c:776
#: src/pv/display.c:1082 src/pv/state.c:45 src/pv/state.c:897
#: src/pv/state.c:909 src/pv/state.c:945 src/pv/transfer.c:1335
#: src/pv/transfer.c:1451 src/pv/transfer.c:1778
msgid "memory allocation failure"
msgstr "bellek ayırma başarısız"
#: src/main/options.c:418
msgid "list files may not contain @ lines"
msgstr ""
#: src/main/options.c:438 src/main/options.c:440 src/main/options.c:900
msgid "process ID or pid:fd pair expected"
msgstr "süreç kimliği (ID) veya pid:fd çifti bekleniyor"
#: src/main/options.c:449 src/main/options.c:451 src/main/options.c:907
msgid "invalid process ID"
msgstr "geçersiz süreç kimliği (ID)"
#: src/main/options.c:828
msgid "numeric value not understood"
msgstr "sayısal değer anlaşılmadı"
#: src/main/options.c:842
msgid "integer argument expected"
msgstr "tamsayı bağımsız değişkeni bekleniyor"
#: src/main/options.c:852
msgid "numeric argument expected"
msgstr "sayısal bağımsız değişken bekleniyor"
#: src/main/options.c:863
msgid "missing filename"
msgstr ""
#: src/main/options.c:889
msgid "missing process name"
msgstr ""
#: src/main/options.c:1178
msgid "invalid side specification"
msgstr ""
#: src/main/options.c:1193
#, c-format
msgid "Try `%s --help' for more information."
msgstr "Daha fazla bilgi için `%s --help' seçeneğini deneyin."
#: src/main/options.c:1195
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Daha fazla bilgi için `%s -h' seçeneğini deneyin."
#: src/main/options.c:1227
msgid ""
"cannot use line mode or transfer modifier options when watching file "
"descriptors"
msgstr ""
"dosya tanımlayıcılarını izlerken satır modu veya aktarım değiştirici "
"seçeneklerini kullanamaz"
#: src/main/options.c:1235
msgid "cannot use cursor positioning when watching file descriptors"
msgstr "dosya tanımlayıcılarını izlerken imleç konumlandırmayı kullanamaz"
#: src/main/options.c:1243
msgid "cannot use remote control when watching file descriptors"
msgstr "dosya tanımlayıcılarını izlerken uzaktan kumandayı kullanamaz"
#: src/main/options.c:1251
msgid "cannot use remote query when watching file descriptors"
msgstr ""
#: src/main/options.c:1259
msgid "cannot transfer files when watching file descriptors"
msgstr "dosya tanımlayıcıları izlenirken dosya aktarılamıyor"
#: src/main/options.c:1283
msgid "not available on systems without /proc/self/fdinfo"
msgstr "/proc/self/fdinfo olmayan sistemlerde kullanılamaz"
#: src/main/options.c:1294
msgid "cannot use remote control and remote query together"
msgstr ""
#: src/main/options.c:1321
msgid "monitor mode cannot be specified with this option"
msgstr ""
#: src/main/options.c:1333
msgid "monitor mode cannot be used with store-and-forward"
msgstr ""
#: src/main/options.c:1344
msgid "files cannot be specified with this option"
msgstr ""
#: src/main/version.c:28
msgid "License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
msgstr "Lisans: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"
#: src/main/version.c:29
msgid "This is free software: you are free to change and redistribute it."
msgstr ""
"Bu özgür bir yazılımdır: değiştirmekte ve yeniden dağıtmakta özgürsünüz."
#: src/main/version.c:30
msgid "There is NO WARRANTY, to the extent permitted by law."
msgstr "Yasaların izin verdiği ölçüde GARANTİ YOKTUR."
#: src/main/version.c:32
msgid "Project web site"
msgstr "Proje web sitesi"
#: src/pv/cursor.c:108 src/pv/cursor.c:135
msgid "failed to open lock file"
msgstr "lock dosyası açılamadı"
#: src/pv/cursor.c:790 src/pv/cursor.c:792
msgid "interrupted by a signal"
msgstr "bir işaret tarafından kesildi"
#: src/pv/display.c:311
msgid "yzafpnum kMGTPEZY"
msgstr "yzafpnum kMGTPEZY"
#: src/pv/display.c:329
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnum KMGTPEZY"
#: src/pv/file.c:81
msgid "/dev/null is not usable"
msgstr ""
#: src/pv/file.c:371
msgid "error closing file"
msgstr "dosya kapatılırken hata"
#: src/pv/file.c:438
msgid "input file is also the output"
msgstr "girdi dosyası aynı zamanda çıkış"
#: src/pv/file.c:596
msgid "(none)"
msgstr "(yok)"
#: src/pv/file.c:598
msgid "(stdin)"
msgstr "(stdin)"
#: src/pv/format/averagerate.c:34 src/pv/format/progressbar.c:92
#: src/pv/format/rate.c:36 src/pv/loop.c:172
msgid "b/s"
msgstr "b/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40
msgid "/s"
msgstr "/s"
#: src/pv/format/averagerate.c:38 src/pv/format/progressbar.c:96
#: src/pv/format/rate.c:40 src/pv/loop.c:172
msgid "B/s"
msgstr "B/s"
#: src/pv/format/bytes.c:35
msgid "b"
msgstr "b"
#: src/pv/format/bytes.c:39 src/pv/transfer.c:1284
msgid "B"
msgstr "B"
#: src/pv/format/eta.c:63 src/pv/format/eta.c:67
msgid "ETA"
msgstr "ETA"
#: src/pv/format/fineta.c:93
msgid "FIN"
msgstr "FIN"
#: src/pv/loop.c:171
msgid "rate min/avg/max/mdev"
msgstr "oran min/ortalama/maks/standart sapma"
#: src/pv/loop.c:183
msgid "rate not measured"
msgstr "oran ölçülmedi"
#: src/pv/loop.c:1082 src/pv/loop.c:1098 src/pv/loop.c:1116 src/pv/remote.c:93
#: src/pv/remote.c:188 src/pv/remote.c:536 src/pv/remote.c:582
#: src/pv/watchpid.c:123 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:158 src/pv/watchpid.c:194
#: src/pv/watchpid.c:206 src/pv/watchpid.c:218 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:286 src/pv/watchpid.c:401
#: src/pv/watchpid.c:409 src/pv/watchpid.c:556 src/pv/watchpid.c:565
#: src/pv/watchpid.c:586
msgid "pid"
msgstr "pid"
#: src/pv/loop.c:1116 src/pv/watchpid.c:132 src/pv/watchpid.c:142
#: src/pv/watchpid.c:151 src/pv/watchpid.c:160 src/pv/watchpid.c:268
#: src/pv/watchpid.c:277 src/pv/watchpid.c:288
msgid "fd"
msgstr "fd"
#: src/pv/remote.c:242 src/pv/remote.c:636
msgid "message not received"
msgstr "mesaj alınamadı"
#: src/pv/remote.c:659 src/pv/remote.c:677
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO bu sistemde desteklenmiyor"
#: src/pv/transfer.c:1173
msgid "warning: read errors detected"
msgstr "uyarı: okuma hataları tespit edildi"
#: src/pv/transfer.c:1283
msgid "skipped past read error"
msgstr "geçmiş okuma hatası atlandı"
#: src/pv/transfer.c:1642
msgid "write error"
msgstr "yazma hatası"
#: src/pv/watchpid.c:160 src/pv/watchpid.c:288
msgid "not a regular file or block device"
msgstr "normal bir dosya veya blok aygıtı değil"
#~ msgid "state allocation failed"
#~ msgstr "durum tahsisi başarısız oldu"
#~ msgid "failed to stat file"
#~ msgstr "dosya statüsünde başarısız oldu"
#~ msgid "is a directory"
#~ msgstr "bir dizindir"
#~ msgid "failed to generate sysfs filename"
#~ msgstr "sysfs dosya adı oluşturulamadı"
#~ msgid "failed to read sysfs size file"
#~ msgstr "sysfs boyut dosyası okunamadı"
#~ msgid "failed to open block device"
#~ msgstr "blok aygıtı açılamadı"
#~ msgid "failed to determine size of block device"
#~ msgstr "blok aygıtının boyutu belirlenemedi"
#~ msgid "option structure allocation failed"
#~ msgstr "seçenek yapısı tahsisi başarısız oldu"
#~ msgid "option structure argv allocation failed"
#~ msgstr "seçenek yapısı argv tahsisi başarısız oldu"
#~ msgid "failed to get terminal name"
#~ msgstr "terminal adı alınamadı"
#~ msgid "lock attempt failed"
#~ msgstr "kilit denemesi başarısız oldu"
#~ msgid "failed to open terminal"
#~ msgstr "terminal açılamadı"
#~ msgid "failed to seek to start of output"
#~ msgstr "çıktının başlangıcına ulaşılamadı"
#~ msgid "failed to read file"
#~ msgstr "dosya okunamadı"
#~ msgid "failed to stat output file"
#~ msgstr "çıktı dosyası stat edilemedi"
#~ msgid "history structure allocation failed"
#~ msgstr "geçmiş yapısı tahsisi başarısız oldu"
#~ msgid "file list allocation failed"
#~ msgstr "dosya listesi tahsisi başarısız oldu"
#~ msgid "read failed"
#~ msgstr "okuma başarısız"
#~ msgid "file is not seekable"
#~ msgstr "dosya aranabilir değil"
#~ msgid "failed to seek past error"
#~ msgstr "geçmiş hatayı aramakta başarısız oldu"
#~ msgid "no transfer buffer allocated"
#~ msgstr "aktarım arabelleği ayrılmamış"
#~ msgid "failed to set interval timer"
#~ msgstr "aralık zamanlayıcısı ayarlanamadı"
#~ msgid "failed to clear interval timer"
#~ msgstr "aralık zamanlayıcısı temizlenemedi"
#~ msgid "line position buffer allocation failed"
#~ msgstr "satır konumu arabellek tahsisi başarısız oldu"
#~ msgid "select call failed"
#~ msgstr "seçme çağrısı başarısız oldu"
#~ msgid "process list allocation failed"
#~ msgstr "işlem listesi tahsisi başarısız oldu"
#~ msgid "file descriptor list allocation failed"
#~ msgstr "dosya tanımlayıcı listesi tahsisi başarısız oldu"
#~ msgid "PID[:FD]"
#~ msgstr "PID[:FD]"
+1
View File
@@ -0,0 +1 @@
config.h.in
+68
View File
@@ -0,0 +1,68 @@
/*
* Standard definitions to make use of the config.h values set by the
* `configure' script. Include this after config.h and before anything
* else.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#if ENABLE_NLS
# ifdef HAVE_LIBINTL_H
# include <libintl.h>
# endif
# ifdef HAVE_LOCALE_H
# include <locale.h>
# endif
# define _(String) gettext (String)
# define N_(String) (String)
#else
# define _(String) (String)
# define N_(String) (String)
#endif
#undef CURSOR_ANSWERBACK_BYTE_BY_BYTE
#ifndef _AIX
#define CURSOR_ANSWERBACK_BYTE_BY_BYTE 1
#endif
/* Boolean type support */
#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
/* Whether "--remote" and "--query" should be available. */
#undef PV_REMOTE_CONTROL
#if HAVE_DECL_SA_SIGINFO
# if SIGINFO_PROVIDES_PID
#define PV_REMOTE_CONTROL 1
# endif
#endif
#ifndef SPLINT
/* Remove __attribute__(()) if not using GCC. */
#ifndef __GNUC__
#define __attribute__(x) /* GCC-only feature */
#endif
#endif
/* Support for the fallthrough attribute is not universal. */
/* From https://stackoverflow.com/questions/45349079/how-to-use-attribute-fallthrough-correctly-in-gcc */
#if defined(__GNUC__) && __GNUC__ >= 7
#define FALL_THROUGH __attribute__ ((fallthrough))
#else
#define FALL_THROUGH /*@-noeffect@*/ ((void)0) /*@+noeffect@*/
#endif /* __GNUC__ >= 7 */
-36
View File
@@ -1,36 +0,0 @@
/*
* Replacement getopt function's header file. Include this AFTER config.h.
*/
#ifndef _LIBRARY_GETOPT_H
#define _LIBRARY_GETOPT_H 1
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#ifdef __cplusplus
extern "C" {
#endif
#ifndef HAVE_GETOPT
int minigetopt(int, char **, char *);
extern char *minioptarg;
extern int minioptind, miniopterr, minioptopt;
#define getopt minigetopt /* Flawfinder: ignore */
#define optarg minioptarg
#define optind minioptind
#define opterr miniopterr
#define optopt minioptopt
#endif /* !HAVE_GETOPT */
#ifdef __cplusplus
}
#endif
#endif /* _LIBRARY_GETOPT_H */
/* EOF */
-52
View File
@@ -1,52 +0,0 @@
/*
* Replacement gettext library header file. Include this within config.h,
* like this:
*
* #ifdef ENABLE_NLS
* # include "library/gettext.h"
* #else
* # define _(String) (String)
* # define N_(String) (String)
* #endif
*
*/
#ifndef _LIBRARY_GETTEXT_H
#define _LIBRARY_GETTEXT_H 1
#ifdef HAVE_GETTEXT
# ifdef HAVE_LIBINTL_H
# include <libintl.h>
# endif
# ifdef HAVE_LOCALE_H
# include <locale.h>
# endif
# define _(String) gettext (String)
# define N_(String) (String)
#else
# define _(String) minigettext (String)
# define N_(String) (String)
# define setlocale minisetlocale
# define bindtextdomain minibindtextdomain
# define textdomain minitextdomain
# ifndef LC_ALL
# define LC_ALL ""
# endif
#endif
#ifdef __cplusplus
extern "C" {
#endif
char *minisetlocale(char *, char *);
char *minibindtextdomain(char *, char *);
char *minitextdomain(char *);
char *minigettext(char *);
#ifdef __cplusplus
}
#endif
#endif /* _LIBRARY_GETTEXT_H */
/* EOF */
+93 -27
View File
@@ -1,10 +1,21 @@
/*
* Global program option structure and the parsing function prototype.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#ifndef _OPTIONS_H
#define _OPTIONS_H 1
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <sys/types.h>
#ifdef __cplusplus
extern "C" {
#endif
@@ -12,9 +23,70 @@ extern "C" {
struct opts_s;
typedef struct opts_s *opts_t;
struct opts_s { /* structure describing run-time options */
char *program_name; /* name the program is running as */
bool do_nothing; /* exit-without-doing-anything flag */
/*
* Overall program actions to select.
*/
typedef enum {
PV_ACTION_NOTHING, /* do nothing, and exit */
PV_ACTION_TRANSFER, /* transfer data */
PV_ACTION_STORE_AND_FORWARD, /* store to file, then output from it */
PV_ACTION_WATCHFD, /* watch process file descriptors */
PV_ACTION_REMOTE_CONTROL, /* remotely control another pv */
PV_ACTION_QUERY, /* watch the state of another pv */
PV_ACTION_MONITOR /* run a process, watch its stdin/out */
} pvaction_t;
/*
* Sides of a monitored command to monitor with PV_ACTION_MONITOR.
*/
typedef enum {
PV_SIDE_NONE, /* don't monitor a command */
PV_SIDE_IN, /* monitor only the input side */
PV_SIDE_OUT, /* monitor only the output side */
PV_SIDE_BOTH /* monitor both sides */
} pvside_t;
typedef /*@null@*/ const char * argv_string;
/*
* Structure describing run-time options.
*
* Members are ordered by size to minimise padding.
*/
struct opts_s {
double interval; /* interval between updates */
double delay_start; /* delay before first display */
/*@keep@*/ const char *program_name; /* name the program is running as */
/*@keep@*/ /*@null@*/ char *output; /* fd to write output to */
/*@keep@*/ /*@null@*/ char *name; /* display name, if any */
/*@keep@*/ /*@null@*/ char *name1; /* first name, if two were given */
/*@keep@*/ /*@null@*/ char *default_bar_style; /* default bar style */
/*@keep@*/ /*@null@*/ char *format; /* output format, if any */
/*@keep@*/ /*@null@*/ char *format1; /* first format, if two were given */
/*@keep@*/ /*@null@*/ char *pidfile; /* PID file, if any */
/*@keep@*/ /*@null@*/ char *store_and_forward_file; /* store and forward file, if any */
/*@keep@*/ /*@null@*/ char *extra_display; /* extra display specifier, if any */
/*@keep@*/ /*@null@*/ pid_t *watchfd_pid; /* array of processes to watch fds of */
/*@keep@*/ /*@null@*/ int *watchfd_fd; /* array of fds to watch in each one (0=all) */
/*@keep@*/ /*@null@*/ argv_string *argv; /* array of non-option arguments */
size_t lastwritten; /* show N bytes last written */
long double rate_limit; /* rate limit, in bytes per second */
size_t buffer_size; /* buffer size, in bytes (0=default) */
size_t pipe_buffer_size; /* pipe buffer size, in bytes (0=default) */
off_t size; /* total size of data */
off_t error_skip_block; /* skip block size, 0 for adaptive */
pid_t remote; /* PID of pv to update settings of */
pid_t query; /* PID of pv to query progress of */
unsigned int skip_errors; /* skip read errors counter */
unsigned int average_rate_window; /* time window in seconds for average rate calculations */
unsigned int width; /* screen width */
unsigned int height; /* screen height */
unsigned int argc; /* number of non-option arguments */
unsigned int argv_length; /* allocated array size for non-option arguments */
unsigned int watchfd_count; /* number of watchfd items */
unsigned int watchfd_length; /* allocated watchfd item array size */
pvaction_t action; /* the program action to perform */
pvside_t side; /* which side of the monitored command to monitor */
bool progress; /* progress bar flag */
bool timer; /* timer flag */
bool eta; /* ETA flag */
@@ -23,44 +95,38 @@ struct opts_s { /* structure describing run-time options */
bool average_rate; /* average rate counter flag */
bool bytes; /* bytes transferred flag */
bool bits; /* report transfer size in bits */
bool decimal_units; /* decimal prefix flag */
bool bufpercent; /* transfer buffer percentage flag */
unsigned int lastwritten; /* show N bytes last written */
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 rate_gauge; /* if size unknown, show rate vs max rate */
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 */
bool null_terminated_lines; /* lines are null-terminated */
bool no_display; /* do nothing other than pipe data */
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 */
char *format; /* output format, if any */
char *pidfile; /* PID file, if any */
int argc; /* number of non-option arguments */
char **argv; /* array of non-option arguments */
bool sync_after_write; /* set if we sync after every write */
bool direct_io; /* set if O_DIRECT is to be used */
bool sparse_output; /* set if we leave holes in the output */
bool discard_input; /* set to write nothing to output */
bool show_stats; /* set to write statistics at the end */
bool width_set_manually; /* width was set manually, not detected */
bool height_set_manually; /* height was set manually, not detected */
bool rate_limit_specified; /* whether a rate limit value was given */
bool rate_limit_active; /* whether rate limiting is in effect (>0) */
};
extern opts_t opts_parse(int, char **);
extern void opts_free(opts_t);
/*@-exportlocal@*/
/* splint thinks opts_free is exported but not used - it is used. */
extern /*@null@*/ /*@only@*/ opts_t opts_parse(unsigned int, char **);
extern void opts_free(/*@only@*/ opts_t);
extern bool opts_add_file(opts_t, const char *);
#ifdef __cplusplus
}
#endif
#endif /* _OPTIONS_H */
/* EOF */
+601 -202
View File
@@ -1,186 +1,414 @@
/*
* Functions internal to the PV library.
* Functions internal to the PV library. Include "config.h" first.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#ifndef _PV_INTERNAL_H
#define _PV_INTERNAL_H 1
#ifdef HAVE_CONFIG_H
#include "config.h"
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
#ifndef _PV_H
#include "pv.h"
#endif /* _PV_H */
#include <stdlib.h>
#include <signal.h>
#include <time.h>
#include <sys/types.h>
#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
#define PV_DISPLAY_PROGRESS 1
#define PV_DISPLAY_TIMER 2
#define PV_DISPLAY_ETA 4
#define PV_DISPLAY_RATE 8
#define PV_DISPLAY_AVERAGERATE 16
#define PV_DISPLAY_BYTES 32
#define PV_DISPLAY_NAME 64
#define PV_DISPLAY_BUFPERCENT 128
#define PV_DISPLAY_OUTPUTBUF 256
#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 */
#define MAX_READ_AT_ONCE 524288 /* max to read() in one go */
#define MAX_WRITE_AT_ONCE 524288 /* max to write() in one go */
#define TRANSFER_READ_TIMEOUT 90000 /* usec to time reads out at */
#define TRANSFER_WRITE_TIMEOUT 900000 /* usec to time writes out at */
#define RATE_GRANULARITY 100000000 /* nsec between -L rate chunks */
#define RATE_BURST_WINDOW 5.0 /* rate burst window (multiples of rate) */
#define REMOTE_INTERVAL 100000000 /* nsec between checks for -R and -Q */
#define MONITOR_EXCHANGE_INTERVAL 100000000 /* nsec between "-M both" data exchanges */
#define BUFFER_SIZE (size_t) 409600 /* default transfer buffer size */
#define BUFFER_SIZE_MAX (size_t) 524288 /* max auto transfer buffer size */
#define MAX_READ_AT_ONCE (size_t) 524288 /* max to read() in one go */
#define MAX_WRITE_AT_ONCE (size_t) 524288 /* max to write() in one go */
#define MAX_SPLICE_AT_ONCE 1048576 /* max to splice() in one go */
#define MAX_CFR_AT_ONCE 1073741824 /* max to copy_file_range() in one go */
#define TRANSFER_READ_TIMEOUT 0.09L /* seconds to time reads out at */
#define TRANSFER_WRITE_TIMEOUT 0.9L /* seconds to time writes out at */
#define MAX_LINE_POSITIONS 100000 /* number of lines to remember positions of */
/*
* Whether to always try to use the whole transfer buffer, reducing the
* number of reads and writes at the expense of moving bytes around.
*/
#define MAXIMISE_BUFFER_FILL 1
/* Sizes for various statically sized buffers. */
typedef struct pvhistory {
long long total_bytes;
long double elapsed_sec;
} pvhistory_t;
#define PV_SIZEOF_DEFAULT_FORMAT 512
#define PV_SIZEOF_LASTWRITTEN_BUFFER 256
#define PV_SIZEOF_PREVLINE_BUFFER 1024
#define PV_FORMAT_ARRAY_MAX 100
#define PV_SIZEOF_FORMAT_SEGMENTS_BUF 4096
#define PV_SIZEOF_DISPLAY_NAME 512
#define PV_BARSTYLE_MAX 4 /* number of different styles allowed in a format */
#define PV_BARSTYLE_SIZEOF_STRING 10 /* max length of a bar constituent component in bytes */
#define PV_BARSTYLE_MAX_FILLERS 10 /* max number of bar filler strings */
/* Bit values for the extra displays bitmap. */
#define PV_DISPLAY_WINDOWTITLE 1
#define PV_DISPLAY_PROCESSTITLE 2
/*
* Structure for data shared between multiple "pv -c" instances.
*/
struct pvipccursorstate_s {
int y_topmost; /* terminal row of topmost "pv" instance */
bool tty_tostop_added; /* whether any instance had to set TOSTOP on the terminal */
bool tty_echoctl_cleared; /* whether any instance had to clear ECHOCTL on the terminal */
};
/*
* Types of transfer count - bytes, decimal bytes or lines.
*/
typedef enum {
PV_TRANSFERCOUNT_BYTES,
PV_TRANSFERCOUNT_DECBYTES,
PV_TRANSFERCOUNT_LINES
} pvtransfercount_t;
/* Methods used to transfer bytes from input to output. */
typedef enum {
PV_TRANSFERMETHOD_READWRITE, /* read() + write() */
PV_TRANSFERMETHOD_SPLICE, /* splice() */
PV_TRANSFERMETHOD_SPLICE_INTERMEDIATE, /* splice() through an intermediate input pipe */
PV_TRANSFERMETHOD_COPY_FILE_RANGE, /* copy_file_range() */
PV_TRANSFERMETHOD__UNSET
} pvtransfermethod_t;
/*
* Structure describing a short string used as part of a progress bar, whose
* width in display characters may not be the same as its length in bytes.
*/
struct pvbarstring_spec_s {
char string[PV_BARSTYLE_SIZEOF_STRING];
uint8_t width;
uint8_t bytes;
};
/*
* Structure describing a style of progress bar.
*
* The part that moves back and forth when the size isn't known, such as
* "<=>", is "indicator".
*
* The string used to populate the rest of the bar is one of "filler", which
* contains "filler_entries" array items. The first item "filler[0]" is
* used for an empty part such as " ". The last item
* "filler[filler_entries-1]" is used for a 100% full part, such as "=".
*
* If there are more than the minimum of 2 entries, then the intervening
* entries are used for partial fills.
*
* When there are only 2 entries and the bar isn't completely empty or full,
* the last filled portion of the bar is filled with "tip" instead of the
* last filler item to indicate the tip of the bar, such as ">".
*
* Note that only the indicator is expected to ever be wider than 1 display
* character. All other items are expected to have a width of 0 or 1.
*
* The "style_id" is an opaque identifier that should only be used to
* determine whether two styles are the same. It is always nonzero.
*/
struct pvbarstyle_s {
uint8_t style_id;
uint8_t filler_entries;
struct pvbarstring_spec_s indicator;
struct pvbarstring_spec_s tip;
struct pvbarstring_spec_s filler[PV_BARSTYLE_MAX_FILLERS];
};
typedef struct pvbarstyle_s *pvbarstyle_t;
/* Display format component type, -1 for static string. */
typedef int8_t pvdisplay_component_t;
#define PVDISPLAY_COMPONENT_MAX (127) /* INT8_MAX */
/* Byte count of a part of the display. */
typedef uint16_t pvdisplay_bytecount_t;
#define PVDISPLAY_BYTECOUNT_MAX (65535) /* UINT16_MAX */
/* Width of a part of the display. */
typedef uint16_t pvdisplay_width_t;
#define PVDISPLAY_WIDTH_MAX (65535) /* UINT16_MAX */
/*
* Structure defining the current state of a single watched file descriptor.
*/
struct pvwatchfd_s;
typedef /*@null@*/ struct pvwatchfd_s *pvwatchfd_t;
/* String pointer, that is the only pointer to this resource, that can be null. */
typedef /*@only@*/ /*@null@*/ char * nullable_only_string_t;
/*
* Structure for holding PV internal state. Opaque outside the PV library.
*
* In general, members are ordered by size, to minimise padding.
*/
struct pvstate_s {
/******************
* Program status *
******************/
struct pvprogramstatus_s {
nullable_only_string_t cwd; /* for relative paths in --watchfd */
int current_input_file; /* index of current file being read */
int exit_status; /* exit status to give (0=OK) */
bool terminal_supports_utf8; /* whether the terminal supports UTF-8 */
bool terminal_supports_colour; /* whether the terminal supports colour */
bool checked_colour_support; /* whether we have checked colour support yet */
bool current_input_is_pipe; /* whether the current input file is a pipe */
bool current_input_is_file; /* whether the current input is a regular file */
bool output_is_pipe; /* whether the output is a pipe */
bool output_is_file; /* whether the output is a regular file */
} status;
/***************
* Input files *
***************/
int input_file_count; /* number of input files */
const char **input_files; /* input files (0=first) */
struct pvinputfiles_s {
/*@only@*/ /*@null@*/ nullable_only_string_t *filename; /* input filenames */
unsigned int file_count; /* number of input files */
} files;
/*********************************
* Items to watch with --watchfd *
*********************************/
struct {
/*@only@*/ /*@null@*/
struct pvwatcheditem_s { /* array of PID or PID:FD items */
pid_t pid; /* watched PID */
int fd; /* watched fd, or -1 for all */
pvwatchfd_t info_array; /* watch information for each fd */
int array_length; /* length of watch info array */
bool finished; /* "PID:FD": fd closed; or PID gone */
} *watching;
unsigned int count; /* number of items in these arrays */
bool multiple_pids; /* true if more than one distinct PID */
} watchfd;
/*******************
* Program control *
*******************/
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 */
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 width; /* screen width */
unsigned int height; /* screen height */
const char *name; /* display name */
char default_format[512]; /* default format string */
const char *format_string; /* output format string */
/******************
* 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) */
struct pvcontrol_s {
char default_format[PV_SIZEOF_DEFAULT_FORMAT]; /* default format string */
double interval; /* interval between updates */
double delay_start; /* delay before first display */
/*@only@*/ /*@null@*/ char *name; /* display name */
/*@only@*/ /*@null@*/ char *format_string; /* output format string */
/*@only@*/ /*@null@*/ char *extra_display_spec; /* full spec for extra displays */
/*@only@*/ /*@null@*/ char *extra_format_string; /* extra format string alone */
/*@null@*/ char *output_name; /* name of the output, for diagnostics */
/*@null@*/ char *default_bar_style; /* which bar style to use by default */
off_t error_skip_block; /* skip block size, 0 for adaptive */
long double rate_limit; /* rate limit, in bytes per second */
size_t target_buffer_size; /* transfer buffer size (0=default) */
size_t pipe_buffer_size; /* pipe buffer size (0=default) */
off_t size; /* total size of data */
unsigned int skip_errors; /* skip read errors counter */
int output_fd; /* fd to write output to */
pid_t othermonitor_pid; /* pid of the other monitor, in "-M both" mode */
int othermonitor_read_fd; /* fd to read transfer counts from other monitor */
int othermonitor_write_fd; /* fd to write transfer counts to other monitor */
unsigned int average_rate_window; /* time window in seconds for average rate calculations */
unsigned int history_interval; /* seconds between each average rate calc history entry */
pvdisplay_width_t width; /* screen width */
unsigned int height; /* screen height */
unsigned int extra_displays; /* bitmask of extra display destinations */
pvformatoptions_s format_option; /* non "--format" format options (used by -R) */
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 rate_gauge; /* if size unknown, show rate vs max rate */
bool linemode; /* count lines instead of bytes */
bool bits; /* report bits instead of bytes */
bool decimal_units; /* use decimal prefixes */
bool null_terminated_lines; /* lines are null-terminated */
bool no_display; /* do nothing other than pipe data */
bool no_splice; /* never use splice() */
bool stop_at_size; /* transfer is to stop at "size" bytes */
bool sync_after_write; /* sync after every write */
bool direct_io; /* use O_DIRECT */
bool direct_io_changed; /* set when direct_io is changed mid-transfer */
bool sparse_output; /* convert runs of null bytes into holes */
bool discard_input; /* write nothing to stdout */
bool show_stats; /* show statistics on exit */
bool width_set_manually; /* width was set manually, not detected */
bool height_set_manually; /* height was set manually, not detected */
bool rate_limit_specified; /* whether a rate limit value was given */
bool rate_limit_active; /* whether a rate limit is in effect (>0) */
} control;
/*******************
* Signal handling *
*******************/
int pv_sig_old_stderr; /* see pv_sig_ttou() */
struct timeval pv_sig_tstp_time; /* see pv_sig_tstp() / __cont() */
struct timeval pv_sig_toffset; /* total time spent stopped */
volatile sig_atomic_t pv_sig_newsize; /* whether we need to get term size again */
volatile sig_atomic_t pv_sig_abort; /* whether we need to abort right now */
volatile sig_atomic_t reparse_display; /* whether to re-check format string */
struct sigaction pv_sig_old_sigpipe;
struct sigaction pv_sig_old_sigttou;
struct sigaction pv_sig_old_sigtstp;
struct sigaction pv_sig_old_sigcont;
struct sigaction pv_sig_old_sigwinch;
struct sigaction pv_sig_old_sigint;
struct sigaction pv_sig_old_sighup;
struct sigaction pv_sig_old_sigterm;
struct pvsignal_s {
/* old signal handlers to restore in pv_sig_fini(). */
struct sigaction old_sigpipe;
struct sigaction old_sigttou;
struct sigaction old_sigtstp;
struct sigaction old_sigcont;
struct sigaction old_sigwinch;
struct sigaction old_sigint;
struct sigaction old_sighup;
struct sigaction old_sigterm;
#ifdef PV_REMOTE_CONTROL
struct sigaction old_sigusr2;
struct sigaction old_sigusr1;
#endif
struct sigaction old_sigalrm;
struct timespec when_tstp_arrived; /* see pv_sig_tstp() / __cont() */
struct timespec total_stoppage_time; /* total time spent stopped */
#ifdef PV_REMOTE_CONTROL
volatile sig_atomic_t rxusr2; /* whether SIGUSR2 was received */
volatile pid_t sender_usr2; /* PID of sending process for SIGUSR2 */
volatile sig_atomic_t rxusr1; /* whether SIGUSR1 was received */
volatile pid_t sender_usr1; /* PID of sending process for SIGUSR1 */
#endif
} signal;
/*******************
* Transient flags *
*******************/
struct pvtransientflags_s {
volatile sig_atomic_t reparse_display; /* whether to re-check format string */
volatile sig_atomic_t terminal_resized; /* whether terminal size needs re-reading */
volatile sig_atomic_t trigger_exit; /* whether an immediate abort is required */
volatile sig_atomic_t terminating_signal; /* signal number that triggered an exit */
volatile sig_atomic_t clear_tty_tostop_on_exit; /* whether to clear tty TOSTOP on exit */
volatile sig_atomic_t set_tty_echoctl_on_exit; /* whether to set tty ECHOCTL on exit */
volatile sig_atomic_t suspend_stderr; /* whether writing to stderr is suspended */
volatile sig_atomic_t skip_next_sigcont; /* whether to ignore the next SIGCONT */
volatile sig_atomic_t pipe_closed; /* whether the output pipe was closed */
} flags;
/*****************
* Display state *
*****************/
long percentage;
long double prev_elapsed_sec;
long double prev_rate;
long double prev_trans;
struct pvdisplay_s {
/* 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;
int lastoutput_length; /* number of last-output bytes to show */
unsigned char lastoutput_buffer[256];
int prev_width; /* screen width last time we were called */
int prev_length; /* length of last string we output */
char str_name[512];
char str_transferred[128];
char str_bufpercent[128];
char str_timer[128];
char str_rate[128];
char str_average_rate[128];
char str_progress[1024];
char str_lastoutput[512];
char str_eta[128];
char str_fineta[128];
unsigned long components_used; /* bitmask of components used */
struct {
const char *string;
int length;
} format[100];
bool display_visible; /* set once anything written to terminal */
struct pvdisplay_segment_s { /* format string broken into segments */
/* See pv__format_init() for more details. */
/*@dependent@*/ /*@null@*/ const char *string_parameter; /* parameter after colon in %{x:} */
pvdisplay_bytecount_t string_parameter_bytes; /* number of bytes in string_parameter */
pvdisplay_component_t type; /* component type, -1 for static string */
int8_t parameter; /* component parameter, such as bar style index */
pvdisplay_width_t chosen_size; /* "n" from %<n>A, or 0 */
pvdisplay_bytecount_t offset; /* start offset of this segment in the build buffer */
pvdisplay_bytecount_t bytes; /* length of segment in bytes in the build buffer */
pvdisplay_width_t width; /* displayed width of segment */
} format[PV_FORMAT_ARRAY_MAX];
struct pvbarstyle_s barstyle[PV_BARSTYLE_MAX];
/* The last-written "n" bytes. */
char lastwritten_buffer[PV_SIZEOF_LASTWRITTEN_BUFFER];
/* The most recently output complete line. */
char previous_line[PV_SIZEOF_PREVLINE_BUFFER];
/* The line being received now. */
char next_line[PV_SIZEOF_PREVLINE_BUFFER];
/*@only@*/ /*@null@*/ char *display_buffer; /* buffer for display string */
off_t initial_offset; /* offset when first opened (when watching fds) */
size_t next_line_len; /* length of currently receiving line so far */
size_t format_segment_count; /* number of format string segments */
pvtransfercount_t count_type; /* type of count for transfer, rate, etc */
pvdisplay_width_t prev_screen_width; /* screen width last time pv_display() was called */
pvdisplay_bytecount_t display_buffer_size; /* size allocated to display buffer */
pvdisplay_bytecount_t display_string_bytes; /* byte length of string in display buffer */
pvdisplay_width_t display_string_width; /* displayed width of string in display buffer */
pvdisplay_bytecount_t lastwritten_bytes; /* largest number of last-written bytes to show */
bool showing_timer; /* set if showing timer */
bool showing_bytes; /* set if showing byte/line count */
bool showing_ratio; /* set if showing monitoring in:out ratio */
bool showing_rate; /* set if showing transfer rate */
bool showing_last_written; /* set if displaying the last few bytes written */
bool showing_previous_line; /* set if displaying the previously output line */
bool format_uses_colour; /* set if the format string uses colours */
bool colour_permitted; /* whether colour is permitted for this display */
bool sgr_code_active; /* set while SGR code is active in a display line */
bool final_update; /* set internally on the final update */
bool output_produced; /* set once anything written to terminal */
} display;
/* Extra display for alternate outputs like a window title. */
struct pvdisplay_s extra_display;
/************************************
* Calculated state of the transfer *
************************************/
struct pvtransfercalc_s {
long double transfer_rate; /* calculated transfer rate */
long double average_rate; /* calculated average transfer rate */
long double prev_elapsed_sec; /* elapsed sec at which rate last calculated */
long double prev_rate; /* last calculated instantaneous transfer rate */
long double prev_trans; /* amount transferred since last rate calculation */
long double current_avg_rate; /* current average rate over last history intervals */
long double rate_min; /* minimum measured transfer rate */
long double rate_max; /* maximum measured transfer rate */
long double rate_sum; /* sum of all measured transfer rates */
long double ratesquared_sum; /* sum of the squares of each transfer rate */
unsigned long measurements_taken; /* how many times the rate was measured */
/* Keep track of progress over last intervals to compute current average rate. */
/*@null@*/ struct { /* state at previous intervals (circular buffer) */
long double elapsed_sec; /* time since start of transfer */
off_t transferred; /* amount transferred by that time */
} *history;
size_t history_len; /* total size of history array */
size_t history_first; /* index of oldest entry */
size_t history_last; /* index of newest entry */
off_t prev_transferred; /* total amount transferred when called last time */
double percentage; /* transfer percentage completion */
} calc;
/********************
* Cursor/IPC state *
********************/
struct pvcursorstate_s {
/*@only@*/ /*@null@*/ char *lock_file; /* terminal lock filename */
#ifdef HAVE_IPC
int crs_shmid; /* ID of our shared memory segment */
int crs_pvcount; /* number of `pv' processes in total */
int crs_pvmax; /* highest number of `pv's seen */
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; /* counter if we need to reinit cursor pos */
bool crs_noipc; /* set if we can't use IPC */
/*@keep@*/ /*@null@*/ struct pvipccursorstate_s *shared; /* data shared between instances */
int shmid; /* ID of the shared memory segment */
int pvcount; /* number of `pv' processes in total */
int pvmax; /* highest number of `pv's seen */
int y_lastread; /* last value of _y_top seen */
int y_offset; /* our Y offset from this top position */
int needreinit; /* counter for reinitialising cursor position */
#endif /* HAVE_IPC */
int crs_lock_fd; /* fd of lockfile, -1 if none open */
char crs_lock_file[1024];
int crs_y_start; /* our initial Y coordinate */
int lock_fd; /* fd of lockfile, -1 if none open */
int y_start; /* our initial Y coordinate */
#ifdef HAVE_IPC
bool noipc; /* set if IPC can't be used */
#endif /* HAVE_IPC */
bool disable; /* set if cursor positioning can't be used */
} cursor;
/*******************
* Transfer state *
@@ -189,100 +417,273 @@ struct pvstate_s {
* The transfer buffer is used for moving data from the input files
* to the output when splice() is not available.
*
* If buffer_size is smaller than pv__target_bufsize, then
* pv_transfer will try to reallocate transfer_buffer to make
* buffer_size equal to pv__target_bufsize.
* If buffer_size is smaller than control.target_buffer_size, then
* pv_transfer() will try to reallocate transfer_buffer to make
* buffer_size equal to control.target_buffer_size.
*
* Data from the input files is read into the buffer; read_position
* is the offset in the buffer that we've read data up to.
* is the offset in the buffer that data has been read up to.
*
* Data is written to the output from the buffer, and write_position
* is the offset in the buffer that we've written data up to. It
* is the offset in the buffer that data has been written up to. It
* will always be less than or equal to read_position.
*/
unsigned char *transfer_buffer; /* data transfer buffer */
unsigned long long buffer_size; /* size of buffer */
unsigned long read_position; /* amount of data in buffer */
unsigned long write_position; /* buffered data written */
struct pvtransferstate_s {
long double elapsed_seconds; /* how long the transfer has been running for */
/*@only@*/ /*@null@*/ char *transfer_buffer; /* data transfer buffer */
size_t buffer_size; /* size of buffer */
size_t read_position; /* amount of data in buffer */
size_t write_position; /* buffered data written */
/*
* While reading from a file descriptor we keep track of how many
* times in a row we've seen errors (read_errors_in_a_row), and
* whether or not we have put a warning on stderr about read errors
* on this fd (read_error_warning_shown).
*
* Whenever the active file descriptor changes from
* last_read_skip_fd, we reset read_errors_in_a_row and
* read_error_warning_shown to 0 for the new file descriptor and set
* last_read_skip_fd to the new fd number.
*
* This way, we're treating each input file separately.
*/
int last_read_skip_fd;
unsigned long read_errors_in_a_row;
int read_error_warning_shown;
ssize_t to_write; /* max to write this time around */
ssize_t written; /* bytes sent to stdout this time */
size_t written_but_not_consumed; /* bytes in the output pipe, unread */
off_t total_bytes_read; /* total bytes read */
off_t total_written; /* total bytes or lines written */
off_t transferred; /* amount transferred (written - unconsumed) */
off_t otherside_transferred; /* amount transferred by the other side ("-M both") */
/* Keep track of line positions to backtrack written_but_not_consumed. */
/*@only@*/ /*@null@*/ off_t *line_positions; /* line separator write positions (circular buffer) */
size_t line_positions_capacity; /* total size of line position array */
size_t line_positions_length; /* number of positions stored in array */
size_t line_positions_head; /* index to use for next position */
off_t last_output_position; /* write position last sent to output */
/*
* While reading from a file descriptor, a count is kept of
* how many times in a row there have been errors
* (read_errors_in_a_row), and whether or not a warning has
* been written to stderr about read errors on this fd
* (read_error_warning_shown).
*
* Whenever the active file descriptor changes from
* last_read_skip_fd, the read_errors_in_a_row is reset to 0
* and read_error_warning_shown is set to false for the new
* file descriptor, and last_read_skip_fd is set to the new
* fd number.
*
* This allows each input file to be treated separately.
*/
off_t read_errors_in_a_row;
int last_read_skip_fd;
/* read_error_warning_shown is defined below. */
#ifdef HAVE_SPLICE
/*
* These variables are used to keep track of whether splice() was
* used; splice_failed_fd is the file descriptor that splice() last
* failed on, so that we don't keep trying to use it on an fd that
* doesn't support it, and splice_used is set to 1 if splice() was
* used this time within pv_transfer().
*/
int splice_failed_fd;
int splice_used;
/*
* File descriptors for an intermediate pipe, used when
* neither input nor output are pipes; the size of the pipe
* buffer; and how much input data is in the intermediate
* pipe waiting to be passed to the output.
*/
int intermediate_pipe[2];
int intermediate_pipe_buffer_size;
int intermediate_pipe_buffer_used;
/* File descriptor to /dev/null for splicing with -X. */
int discard_fd;
/*
* splice_failed_fd is the input file descriptor that
* splice() last failed on, to avoid continuing to try using
* it on a file descriptor that doesn't support it.
*/
int splice_failed_fd;
#endif
long to_write; /* max to write this time around */
long written; /* bytes sent to stdout this time */
#ifdef HAVE_COPY_FILE_RANGE
/*
* copy_file_range_failed_fd is the input file descriptor
* that copy_file_range() last failed on, to avoid
* continuing to try using it on a file descriptor that
* doesn't support it.
*/
int copy_file_range_failed_fd;
#endif
pvtransfermethod_t method; /* method used for most recent transfer */
bool read_error_warning_shown;
bool output_not_seekable; /* set if lseek() fails on output */
} transfer;
};
typedef struct pvprogramstatus_s *pvprogramstatus_t;
typedef struct pvinputfiles_s *pvinputfiles_t;
typedef struct pvcontrol_s *pvcontrol_t;
typedef struct pvsignal_s *pvsignal_t;
typedef struct pvtransientflags_s *pvtransientflags_t;
typedef struct pvdisplay_s *pvdisplay_t;
typedef struct pvdisplay_segment_s *pvdisplay_segment_t;
typedef struct pvtransfercalc_s *pvtransfercalc_t;
typedef struct pvcursorstate_s *pvcursorstate_t;
typedef struct pvtransferstate_s *pvtransferstate_t;
/*
* Structure defining the current state of a single watched file descriptor.
* The full definition needs to go here as it refers to sub-structures of
* the main state, defined above.
*/
struct pvwatchfd_s {
unsigned int watch_pid; /* PID to watch */
int watch_fd; /* fd to watch, -1 = not displayed */
struct pvtransientflags_s flags; /* transient flags */
struct pvtransferstate_s transfer; /* transfer state */
struct pvtransfercalc_s calc; /* calculated transfer state */
struct pvdisplay_s display; /* display data */
#ifdef __APPLE__
#else
char file_fdinfo[4096]; /* path to /proc fdinfo file */
char file_fd[4096]; /* path to /proc fd symlink */
nullable_string_ptr file_fdinfo; /* path to /proc fdinfo file */
nullable_string_ptr file_fdsymlink; /* 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 */
struct stat64 sb_fd_link; /* lstat of fd symlink */
unsigned long long size; /* size of whole file, 0 if unknown */
long long position; /* position last seen at */
struct timeval start_time; /* time we started watching the fd */
nullable_string_ptr file_fdpath; /* path to file that was opened */
/*@keep@ */ char display_name[PV_SIZEOF_DISPLAY_NAME]; /* name to show on progress bar */
struct stat sb_fd; /* stat of fd symlink */
struct stat sb_fd_link; /* lstat of fd symlink */
off_t size; /* size of whole file, 0 if unknown */
off_t position; /* position last seen at */
struct timespec start_time; /* time the watch of this fd began */
struct timespec end_time; /* time the fd was marked as closed */
struct timespec total_stoppage_time; /* total time spent stopped */
pid_t watch_pid; /* PID the fd belongs to */
int watch_fd; /* fd to watch */
bool closed; /* true once the fd is closed */
bool displayable; /* false if not displayable */
bool unused; /* true if free for re-use */
};
typedef struct pvwatchfd_s *pvwatchfd_t;
void pv_error(pvstate_t, char *, ...);
/*
* Read-only counterparts to the above structure pointers, to be used in
* function declarations where the function definitely shouldn't be altering
* the contents of the structure.
*/
typedef const struct pvprogramstatus_s * readonly_pvprogramstatus_t;
typedef const struct pvinputfiles_s * readonly_pvinputfiles_t;
typedef const struct pvcontrol_s * readonly_pvcontrol_t;
typedef const struct pvsignal_s * readonly_pvsignal_t;
typedef const struct pvtransientflags_s * readonly_pvtransientflags_t;
typedef const struct pvdisplay_s * readonly_pvdisplay_t;
typedef const struct pvdisplay_segment_s * readonly_pvdisplay_segment_t;
typedef const struct pvtransfercalc_s * readonly_pvtransfercalc_t;
typedef const struct pvcursorstate_s * readonly_pvcursorstate_t;
typedef const struct pvtransferstate_s * readonly_pvtransferstate_t;
/*
* Structure containing the parameters used by formatters.
*/
struct pvformatter_args_s {
/*@dependent@*/ pvdisplay_t display; /* the display being updated */
/*@dependent@*/ pvdisplay_segment_t segment; /* the segment of the display */
/*@dependent@*/ readonly_pvprogramstatus_t status; /* program status */
/*@dependent@*/ readonly_pvcontrol_t control; /* control settings */
/*@dependent@*/ readonly_pvtransferstate_t transfer; /* transfer state */
/*@dependent@*/ readonly_pvtransfercalc_t calc; /* calculated transfer state */
/*@dependent@*/ char *buffer; /* buffer to write formatted segments into */
pvdisplay_bytecount_t buffer_size; /* size of the buffer */
pvdisplay_bytecount_t offset; /* current write position in the buffer */
};
typedef struct pvformatter_args_s *pvformatter_args_t;
/* Pointer to a formatter function. */
typedef pvdisplay_bytecount_t (*pvdisplay_formatter_t)(pvformatter_args_t);
/*
* Structure defining a format string sequence following a %.
*/
struct pvdisplay_component_s {
/*@null@ */ const char *match; /* string to match */
/*@null@ */ pvdisplay_formatter_t function; /* function to call */
bool dynamic; /* whether it can scale with screen size */
};
int pv_main_loop(pvstate_t);
void pv_display(pvstate_t, long double, long long, long long);
long pv_transfer(pvstate_t, int, int *, int *, unsigned long long, long *);
void pv_set_buffer_size(unsigned long long, int);
int pv_next_file(pvstate_t, int, int);
void pv_calculate_transfer_rate(pvtransfercalc_t, readonly_pvtransferstate_t, readonly_pvcontrol_t, readonly_pvdisplay_t, bool);
void pv_crs_fini(pvstate_t);
void pv_crs_init(pvstate_t);
void pv_crs_update(pvstate_t, char *);
long pv_seconds_remaining(const off_t, const off_t, const long double);
void pv_si_prefix(long double *, char *, const long double, pvtransfercount_t);
void pv_describe_amount(char *, size_t, const char *, long double, char *, char *, pvtransfercount_t);
int8_t pv_display_barstyle_index(pvformatter_args_t, const char *);
pvdisplay_bytecount_t pv_formatter_segmentcontent(char *, pvformatter_args_t);
/*
* Formatting functions.
*
* Each formatting function takes a state, the current display, and the
* segment it's for; it also takes a buffer, with a particular size, and an
* offset at which to start writing to the buffer.
*
* If the component is dynamically sized (such as a progress bar with no
* chosen_size constraint), the segment's "width" is expected to have
* already been populated by the caller, with the target width.
*
* The function writes the appropriate string to the buffer at the offset,
* and updates the segment's "offset" and "bytes". The number of bytes
* written ("bytes") is also returned; it will be 0 if the string would not
* fit into the buffer.
*
* The caller is expected to update the segment's "width".
*
* If called with a buffer size of 0, only the side effects occur (such as
* setting flags like display->showing_timer).
*/
pvdisplay_bytecount_t pv_formatter_progress(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_progress_bar_only(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_progress_amount_only(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_bar_default(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_bar_plain(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_bar_block(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_bar_granular(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_bar_shaded(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_timer(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_eta(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_fineta(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_rate(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_average_rate(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_bytes(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_ratio(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_buffer_percent(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_last_written(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_previous_line(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_name(pvformatter_args_t);
pvdisplay_bytecount_t pv_formatter_sgr(pvformatter_args_t);
void pv_display (pvprogramstatus_t, readonly_pvcontrol_t, pvtransientflags_t,
readonly_pvtransferstate_t, pvtransfercalc_t,
pvcursorstate_t, pvdisplay_t, /*@null@ */ pvdisplay_t, bool);
ssize_t pv_transfer(pvstate_t, int, bool *, bool *, off_t, long *);
int pv_next_file(pvstate_t, unsigned int, int);
/*@keep@*/ const char *pv_current_file_name(pvstate_t);
unsigned int pv_update_calc_average_rate_window(pvtransfercalc_t, unsigned int);
void pv_reset_calc(pvtransfercalc_t);
void pv_reset_transfer(pvtransferstate_t);
void pv_reset_flags(pvtransientflags_t);
void pv_reset_display(pvdisplay_t);
void pv_freecontents_display(pvdisplay_t);
void pv_freecontents_transfer(pvtransferstate_t);
void pv_freecontents_calc(pvtransfercalc_t);
void pv_freecontents_watchfd(pvwatchfd_t);
void pv_freecontents_watchfd_items(struct pvwatcheditem_s *, unsigned int);
void pv_write_retry(int, const char *, size_t);
void pv_tty_write(readonly_pvtransientflags_t, const char *, size_t);
void pv_crs_fini(pvcursorstate_t, readonly_pvcontrol_t, pvtransientflags_t);
void pv_crs_init(pvcursorstate_t, readonly_pvcontrol_t, pvtransientflags_t);
void pv_crs_update(pvcursorstate_t, readonly_pvcontrol_t, pvtransientflags_t, const char *);
#ifdef HAVE_IPC
void pv_crs_needreinit(pvstate_t);
void pv_crs_needreinit(pvcursorstate_t);
#endif
void pv_sig_allowpause(void);
void pv_sig_checkbg(void);
void pv_sig_nopause(void);
void pv_remote_init(pvstate_t);
void pv_remote_check(pvstate_t);
void pv_remote_fini(pvstate_t);
int pv_remote_set(pvstate_t);
bool pv_remote_check(pvstate_t);
int pv_watchfd_info(pvstate_t, pvwatchfd_t, int);
int pv_watchfd_changed(pvwatchfd_t);
long long pv_watchfd_position(pvwatchfd_t);
int pv_watchpid_scanfds(pvstate_t, pvstate_t, unsigned int, int *, pvwatchfd_t *, pvstate_t *, int *);
bool pv_watchfd_changed(pvwatchfd_t);
off_t pv_watchfd_position(pvwatchfd_t);
int pv_watchpid_scanfds(pvstate_t, pid_t, int, int *, pvwatchfd_t *);
void pv_watchpid_setname(pvstate_t, pvwatchfd_t);
#ifdef __cplusplus
@@ -290,5 +691,3 @@ void pv_watchpid_setname(pvstate_t, pvwatchfd_t);
#endif
#endif /* _PV_INTERNAL_H */
/* EOF */
+282 -46
View File
@@ -1,14 +1,42 @@
/*
* Functions used across the program.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#ifndef _PV_H
#define _PV_H 1
#if HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <signal.h>
#include <time.h>
#include <sys/types.h>
#ifdef __cplusplus
extern "C" {
#endif
/*
* Exit status bitmask values.
*/
#define PV_ERROREXIT_REMOTE_OR_PID 1
#define PV_ERROREXIT_SAF 1 /* store and forward error */
#define PV_ERROREXIT_MONITOR 1 /* monitor mode error */
#define PV_ERROREXIT_ACCESS 2
#define PV_ERROREXIT_OUROBOROS 4
#define PV_ERROREXIT_TRANSITION 8
#define PV_ERROREXIT_TRANSFER 16
#define PV_ERROREXIT_SIGNAL 32
#define PV_ERROREXIT_MEMORY 64
/*
* Opaque structure for PV internal state.
*/
@@ -19,9 +47,10 @@ typedef struct pvstate_s *pvstate_t;
* Valid number types for pv_getnum_check().
*/
typedef enum {
PV_NUMTYPE_INTEGER,
PV_NUMTYPE_DOUBLE
} pv_numtype_t;
PV_NUMTYPE_ANY_WITH_SUFFIX,
PV_NUMTYPE_BARE_INTEGER,
PV_NUMTYPE_BARE_DOUBLE
} pv_numtype;
/*
@@ -29,109 +58,304 @@ typedef enum {
*/
/*
* Return the given string converted to a double.
* Return true if the character is an ASCII digit.
*/
extern double pv_getnum_d(const char *);
extern bool pv_isdigit(char);
/*
* Return the given string converted to an unsigned integer.
* Return the numeric value of a string representing a positive decimal time
* interval.
*/
extern unsigned int pv_getnum_ui(const char *);
extern double pv_getnum_interval(const char *);
/*
* Return the given string converted to an unsigned long long.
* Return the numeric value of a string representing a size, interpreting
* suffixes in decimal units (multiples of 1000) instead of multiples of
* 1024 if the second argument is true.
*
* Optionally also places the result in a long double.
*/
extern unsigned long long pv_getnum_ull(const char *);
extern off_t pv_getnum_size(const char *, bool, /*@null@ */ long double *);
/*
* Return zero if the given string is a number of the given type. NB an
* integer is both a valid integer and a valid double.
* Return the numeric value of a string representing a count such as screen
* width, interpreting it the same way as pv_getnum_size().
*/
extern int pv_getnum_check(const char *, pv_numtype_t);
extern unsigned int pv_getnum_count(const char *, bool);
/*
* Return true if the given string is a number of the given type. Note that
* an integer is both a valid integer and a valid double.
*/
extern bool pv_getnum_check(const char *, pv_numtype);
/*
* Return a value representing the first amount as a percentage of the
* second total, i.e. 100*amount/total. If the second value, the total, is
* zero or less, return 0.
*/
extern double pv_percentage(off_t, const off_t);
/*
* String handling wrappers.
*/
/* String pointer that can be null. */
typedef /*@null@*/ char * nullable_string_ptr;
/*
* Wrapper for snprintf(), falling back to sprintf() on systems without that
* function.
*/
extern int pv_snprintf(char *, size_t, const char *, ...);
/*
* Wrapper for asprintf(), providing an equivalent on systems without that
* function.
*/
extern int pv_asprintf(nullable_string_ptr *, const char *, ...);
/*
* Implementation of strlcat() where it is unavailable: append a string to a
* buffer, constraining the buffer to a particular size and ensuring
* termination with '\0'.
*/
extern size_t pv_strlcat(char *, const char *, size_t);
/*
* Allocate and return a duplicate of a \0-terminated string, ensuring that
* the duplicate is also \0-terminated. Returns NULL on error.
*/
/*@null@ */ /*@only@ */ extern char *pv_strdup(const /*@null@ */ char *);
/*
* Return a pointer to the last matching character in the buffer, or NULL if
* not found.
*/
/*@null@ */ /*@temp@ */ extern void *pv_memrchr(const void *, int, size_t);
/*
* Return the displayed width of a string.
*/
extern size_t pv_strwidth(const char *, size_t);
/*
* Return true if the character is printable 7-bit ASCII.
*/
extern bool pv_isprint(char);
/*
* Functions relating to elapsed time.
*/
/*
* Read the current elapsed time, relative to an unspecified point in the
* past, and store it in the given timespec buffer. The time is guaranteed
* to not go backwards and does not count time when the system was
* suspended. See clock_gettime(2) with CLOCK_MONOTONIC.
*/
void pv_elapsedtime_read(struct timespec *);
/* Set the time in the timespec to zero. */
void pv_elapsedtime_zero(struct timespec *);
/* Copy the second timespec into the first. Analogous to strcpy(3). */
void pv_elapsedtime_copy(struct timespec *, const struct timespec *);
/*
* Return -1, 0, or 1 depending on whether the first time is earlier than,
* equal to, or later than the second time. Analogous to strcmp(3).
*/
int pv_elapsedtime_compare(const struct timespec *, const struct timespec *);
/* Add the latter two timespecs and store them in the first timespec. */
void pv_elapsedtime_add(struct timespec *, const struct timespec *, const struct timespec *);
/* Add a number of nanoseconds to a timespec. */
void pv_elapsedtime_add_nsec(struct timespec *, long long);
/* Set the first timespec to the second minus the third. */
void pv_elapsedtime_subtract(struct timespec *, const struct timespec *, const struct timespec *);
/* Convert a timespec to seconds. */
long double pv_elapsedtime_seconds(const struct timespec *);
/* Sleep for a number of nanoseconds. */
void pv_nanosleep(long long);
/*
* Main PV functions.
*/
/*
* Create a new state structure, and return it, or 0 (NULL) on error.
* Set the error message prefix. If the new prefix is NULL, the current
* prefix is cleared.
*/
extern pvstate_t pv_state_alloc(const char *);
extern void pv_set_error_prefix(/*@null@ */ const char *);
/*
* Set the formatting string, given a set of old-style formatting options.
* Output an error message. If anything has been sent to the terminal
* already, then put a newline before the message, to avoid writing over
* what was sent earlier.
*/
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);
extern void pv_error(char *, ...);
/*
* Output an error message, like pv_error(), but following the message with
* a colon, a space, and the result of strerror(errno).
*/
extern void pv_perror(char *, ...);
/*
* Check that a file descriptor is open on /dev/null, returning true if so.
* Otherwise return false; if the second argument is true, reports the
* problem with pv_error() before returning.
*/
extern bool pv_fd_is_dev_null(int, bool);
/*
* Create a new state structure, and return it, or 0 (NULL) on error.
*/
extern /*@null@*/ /*@only@*/ pvstate_t pv_state_alloc(void);
/*
* Clear the calculated parts of a state structure.
*/
extern void pv_state_reset(pvstate_t state);
/*
* Set the format options and use them to build a default formatting string.
* The default string is used if no format string is explicitly set.
*/
typedef struct {
size_t lastwritten; /* --last-written (amount) */
bool progress; /* --progress */
bool timer; /* --timer */
bool eta; /* --eta */
bool fineta; /* --fineta */
bool rate; /* --rate */
bool average_rate; /* --average-rate */
bool bytes; /* --bytes */
bool bufpercent; /* --buffer-percent */
} pvformatoptions_s;
extern void pv_state_set_format_options(pvstate_t, pvformatoptions_s);
/* Append a string to the default format, and trigger a format reparse. */
void pv_state_append_to_default_format(pvstate_t, /*@null@ */ const char *);
/*
* Set the various options.
*/
extern void pv_state_force_set(pvstate_t, bool);
extern void pv_state_cursor_set(pvstate_t, bool);
extern void pv_state_show_stats_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_rate_gauge_set(pvstate_t, bool);
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_decimal_units_set(pvstate_t, bool);
extern void pv_state_null_terminated_lines_set(pvstate_t, bool);
extern void pv_state_no_display_set(pvstate_t, bool);
extern void pv_state_skip_errors_set(pvstate_t, unsigned int);
extern void pv_state_error_skip_block_set(pvstate_t, off_t);
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_sync_after_write_set(pvstate_t, bool);
extern void pv_state_direct_io_set(pvstate_t, bool);
extern void pv_state_sparse_output_set(pvstate_t, bool);
extern void pv_state_rate_limit_set(pvstate_t, long double, bool, bool);
extern void pv_state_target_buffer_size_set(pvstate_t, size_t);
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_pipe_buffer_size_set(pvstate_t, size_t);
extern void pv_state_discard_input_set(pvstate_t, bool);
extern void pv_state_size_set(pvstate_t, off_t);
extern void pv_state_interval_set(pvstate_t, double);
extern void pv_state_width_set(pvstate_t, unsigned int);
extern void pv_state_height_set(pvstate_t, unsigned int);
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_width_set(pvstate_t, unsigned int, bool);
extern void pv_state_height_set(pvstate_t, unsigned int, bool);
extern void pv_state_name_set(pvstate_t, /*@null@*/ const char *);
extern void pv_state_default_bar_style_set(pvstate_t, /*@null@ */ const char *);
extern void pv_state_format_string_set(pvstate_t, /*@null@*/ const char *);
extern void pv_state_extra_display_set(pvstate_t, /*@null@*/ const char *);
extern void pv_state_output_set(pvstate_t, int, const char *);
extern void pv_state_average_rate_window_set(pvstate_t, unsigned int);
extern void pv_state_set_terminal_supports_utf8(pvstate_t, bool);
extern void pv_state_othermonitor_set(pvstate_t, pid_t, int, int);
extern void pv_state_cancel_output_if_empty_format_string(pvstate_t);
extern void pv_state_inputfiles(pvstate_t, int, const char **);
extern void pv_state_inputfiles(pvstate_t, unsigned int, const char **);
extern void pv_state_watchfds(pvstate_t, unsigned int, const pid_t *, const int *);
/*
* Work out whether we are in the foreground.
* Return true if either this is the foreground process on the terminal, or
* if the output is not a terminal; false otherwise.
*/
extern bool pv_in_foreground(void);
/*
* Work out the terminal size.
* Populate *width and *height with the current terminal size.
*/
extern void pv_screensize(unsigned int *width, unsigned int *height);
/*
* Calculate the total size of all input files.
*/
extern unsigned long long pv_calc_total_size(pvstate_t);
extern off_t pv_calc_total_size(pvstate_t);
/*
* Set up signal handlers ready for running the main loop.
*/
extern void pv_sig_init(pvstate_t);
#ifdef PV_REMOTE_CONTROL
/*
* Return true if SIGUSR2 has been received, and indicate the sender.
*/
extern bool pv_sigusr2_received(pvstate_t, pid_t *);
/*
* Return true if SIGUSR1 has been received, and indicate the sender.
*/
extern bool pv_sigusr1_received(pvstate_t, pid_t *);
#endif
/*
* Return a stream pointer for a control file associated with a particular
* process ID and signal.
*/
/*@null@ */
/*@dependent@ */
extern FILE *pv_open_controlfile(char *, size_t, pid_t, int, bool);
/*
* Enter the main transfer loop, transferring all input files to the output.
*/
extern int pv_main_loop(pvstate_t);
/*
* Watch the selected file descriptor of the selected process.
* Watch the selected file descriptors of the selected processes.
*/
extern int pv_watchfd_loop(pvstate_t);
/*
* Watch the selected process.
* Watch the progress of another pv process.
*/
extern int pv_watchpid_loop(pvstate_t);
extern int pv_query_loop(pvstate_t, pid_t);
/*
* Set the options of another pv process.
*/
int pv_remote_set(pvstate_t, pid_t);
/*
* Query another pv process for its elapsed transfer time, amount
* transferred, and total size, and update the local state with those
* values. Optionally also return the total size separately. Reports
* errors unless "silent" is true.
*/
int pv_remote_transferstate_fetch(pvstate_t state, pid_t query, /*@null@ */ off_t *sizeptr, bool silent);
/*
* Shut down signal handlers after running the main loop.
@@ -141,11 +365,20 @@ extern void pv_sig_fini(pvstate_t);
/*
* Free a state structure, after which it can no longer be used.
*/
extern void pv_state_free(pvstate_t);
extern void pv_state_free(/*@only@*/ pvstate_t);
/*
* Return a string listing all supported format sequences.
*/
/*@null@*/ char *pv_format_sequences(void);
#if ! HAVE_SETPROCTITLE
void initproctitle(int, char **);
void setproctitle(const char *, ...);
#endif
#ifdef ENABLE_DEBUGGING
# if __STDC_VERSION__ < 199901L
# if __STDC_VERSION__ < 199901L && !defined(__func__)
# if __GNUC__ >= 2
# define __func__ __FUNCTION__
# else
@@ -154,9 +387,14 @@ extern void pv_state_free(pvstate_t);
# endif
# define debug(x,...) debugging_output(__func__, __FILE__, __LINE__, x, __VA_ARGS__)
#else
# define debug(x,...) do { } while (0)
# define debug(x,...) /*@-noeffect@*/ do { } while (0) /*@+noeffect@*/
#endif
/*
* Set the debugging destination file, if debugging is enabled.
*/
void debugging_output_destination(const char *);
/*
* Output debugging information, if debugging is enabled.
*/
@@ -168,5 +406,3 @@ void debugging_output(const char *, const char *, int, const char *, ...);
#endif
#endif /* _PV_H */
/* EOF */
-113
View File
@@ -1,113 +0,0 @@
/*
* Small reimplementation of getopt().
*/
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifndef HAVE_GETOPT
char *minioptarg = NULL;
int minioptind = 0;
int miniopterr = 1;
int minioptopt = 0;
/*
* Minimalist getopt() clone, which handles short options only and doesn't
* permute argv[].
*/
int minigetopt(int argc, char **argv, char *optstring)
{
static int nextchar = 0;
int optchar;
int i;
if ((0 == minioptind) && (argc > 0))
minioptind++;
if ((nextchar > 0) && (0 == argv[minioptind][nextchar])) {
minioptind++;
nextchar = 0;
}
if (minioptind >= argc)
return -1;
/*
* End of options if arg doesn't start with "-"
*/
if (argv[minioptind][0] != '-')
return -1;
/*
* End of options if arg is just "-"
*/
if (0 == argv[minioptind][1])
return -1;
/*
* End of options if arg is "--", but don't include the "--" in the
* non-option arguments
*/
if (('-' == argv[minioptind][1]) && (0 == argv[minioptind][2])) {
minioptind++;
return -1;
}
if (0 == nextchar)
nextchar = 1;
optchar = argv[minioptind][nextchar++];
for (i = 0; optstring[i] != 0 && optstring[i] != optchar; i++) {
}
if (0 == optstring[i]) {
minioptopt = optchar;
if (miniopterr)
fprintf(stderr, "%s: invalid option -- %c\n",
argv[0], optchar);
return '?';
}
if (optstring[i + 1] != ':') {
minioptarg = NULL;
return optchar;
}
/*
* At this point we've got an option that takes an argument.
*/
/*
* Next character isn't 0, so the argument is within this array
* element (i.e. "-dFOO").
*/
if (argv[minioptind][nextchar] != 0) {
minioptarg = &(argv[minioptind][nextchar]);
nextchar = 0;
minioptind++;
return optchar;
}
/*
* Argument is in the next array element (i.e. "-d FOO").
*/
nextchar = 0;
minioptind++;
if (minioptind >= argc) {
fprintf(stderr, "%s: option `-%c' requires an argument\n",
argv[0], optchar);
return ':';
}
minioptarg = argv[minioptind++];
return optchar;
}
#endif /* HAVE_GETOPT */
/* EOF */
-109
View File
@@ -1,109 +0,0 @@
/*
* Very minimal (and stupid) implementation of gettext, with a fixed lookup
* table.
*
* This library ONLY handles gettext(), and that only for the basic form (it
* translates strings to other strings with no other modification, so %2$d
* style constructs are not dealt with). The setlocale(), bindtextdomain(),
* and textdomain() functions are ignored.
*
* To use this library, create a function that, given a language string,
* returns a struct msg_table_s[] of msgid and msgstr pairs, with the end
* of the table being marked by a NULL msgid. The po2table.sh script will do
* this.
*/
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifndef HAVE_GETTEXT
struct msgtable_s {
char *msgid;
char *msgstr;
};
#if ENABLE_NLS
struct msgtable_s *minigettext__gettable(char *);
#else /* ENABLE_NLS */
struct msgtable_s *minigettext__gettable(char *a)
{
return NULL;
}
#endif /* ENABLE_NLS */
char *minisetlocale(char *a, char *b)
{
return NULL;
}
char *minibindtextdomain(char *a, char *b)
{
return NULL;
}
char *minitextdomain(char *a)
{
return NULL;
}
char *minigettext(char *msgid)
{
static struct msgtable_s *table = NULL;
static int tried_lang = 0;
char *lang;
int i;
if (NULL == msgid)
return msgid;
if (0 == tried_lang) {
lang = getenv("LANGUAGE");
if (lang)
table = minigettext__gettable(lang);
if (NULL == table) {
lang = getenv("LANG");
if (lang)
table = minigettext__gettable(lang);
}
if (NULL == table) {
lang = getenv("LC_ALL");
if (lang)
table = minigettext__gettable(lang);
}
if (NULL == table) {
lang = getenv("LC_MESSAGES");
if (lang)
table = minigettext__gettable(lang);
}
tried_lang = 1;
}
if (NULL == table)
return msgid;
for (i = 0; table[i].msgid; i++) {
if (0 == strcmp(table[i].msgid, msgid)) {
if (0 == table[i].msgstr)
return msgid;
if (0 == table[i].msgstr[0])
return msgid;
return table[i].msgstr;
}
}
return msgid;
}
#endif /* HAVE_GETTEXT */
/* EOF */
+67 -24
View File
@@ -1,10 +1,12 @@
/*
* Output debugging information.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "pv.h"
#include <stdio.h>
@@ -16,61 +18,102 @@
#ifdef ENABLE_DEBUGGING
/*@null@*/ static const char *debug_filename = NULL;
/*
* Output debugging information to the file given in the DEBUG environment
* variable, if it is defined.
* Set the destination for debugging information.
*/
void debugging_output(const char *function, const char *file, int line,
const char *format, ...)
void debugging_output_destination(const char *filename)
{
debug_filename = filename;
}
/*
* Output debugging information to the file specified earlier by a call to
* debugging_output_destination(), if any.
*/
void debugging_output(const char *function, const char *file, int line, const char *format, ...)
{
static bool tried_open = false;
static FILE *debugfptr = NULL;
char *debugfile;
va_list ap;
time_t t;
struct tm *tm;
char tbuf[128];
const struct tm *tm;
char tbuf[128]; /* flawfinder: ignore */
/*
* flawfinder note: tbuf is only written to by strftime() which
* takes its size, and string termination is enforced.
*/
if (false == tried_open) {
debugfile = getenv("DEBUG");
if (NULL != debugfile)
debugfptr = fopen(debugfile, "a");
if (NULL != debug_filename) {
debugfptr = fopen(debug_filename, "a"); /* flawfinder: ignore */
/*
* flawfinder note: the caller directly controls the
* filename, so using append mode is the safest
* option.
*/
}
tried_open = true;
}
if (NULL == debugfptr)
if (NULL == debugfptr) {
return;
}
/*
* Note gmtime() is used rather than localtime(). Testing with
* "strace" showed many cases where "pv </dev/zero | cat >/dev/null"
* being paused and backgrounded would cause pv to be stuck in
* futex_wait() inside a pv_sig_alrm() inside a pv_sig_cont(). The
* backtrace mentioned many time zone conversion steps, and all of
* that goes away with gmtime().
*/
(void) time(&t);
tm = localtime(&t);
tm = gmtime(&t);
tbuf[0] = '\0';
if (0 == strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", tm))
if (0 == strftime(tbuf, sizeof(tbuf), "%Y-%m-%d %H:%M:%S", tm)) {
tbuf[0] = '\0';
}
tbuf[sizeof(tbuf) - 1] = '\0'; /* enforce termination. */
(void) 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);
(void) vfprintf(debugfptr, format, ap);
(void) vfprintf(debugfptr, format, ap); /* flawfinder: ignore */
va_end(ap);
/*
* flawfinder note: vfprintf format is explicitly controlled by the
* caller of this function - no mitigation is possible or desirable.
*/
(void) fprintf(debugfptr, "\n");
(void) fflush(debugfptr);
}
#else /* ! ENABLE_DEBUGGING */
/*
* Stub debugging destination function.
*/
void debugging_output_destination( /*@unused@ */ __attribute__((unused))
const char *filename)
{
}
/*
* Stub debugging output function.
*/
void debugging_output( __attribute__ ((unused))
const char *function, __attribute__ ((unused))
const char *file, __attribute__ ((unused))
int line, __attribute__ ((unused))
void debugging_output( /*@unused@ */ __attribute__((unused))
const char *function, /*@unused@ */ __attribute__((unused))
const char *file, /*@unused@ */ __attribute__((unused))
int line, /*@unused@ */ __attribute__((unused))
const char *format, ...)
{
}
#endif /* ENABLE_DEBUGGING */
/* EOF */
+637 -195
View File
@@ -1,23 +1,292 @@
/*
* Output command-line help to stdout.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "pv.h"
#include <stdio.h>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#if defined(ENABLE_NLS) && defined(HAVE_WCHAR_H)
#include <wchar.h>
#if defined(HAVE_WCTYPE_H)
#include <wctype.h>
#endif
#endif
#define N_(String) (String)
struct optdesc_s {
char *optshort;
char *optlong;
char *param;
char *description;
/*
* Return the number of display columns needed to show the given
* null-terminated string.
*
* If NLS is disabled, or the string cannot be converted, this is just the
* same as "strlen()".
*/
static size_t display_width(const char *string)
{
size_t bytes;
if (NULL == string)
return 0;
bytes = strlen(string); /* flawfinder: ignore */
/*
* flawfinder rationale: it is explicitly required of the caller to
* provide a null-terminated string.
*/
return pv_strwidth(string, bytes);
}
/*
* The 7-bit ASCII version of display_word_wrap() below - does not
* understand multi-byte characters.
*/
static void display_word_wrap_7bit(const char *string, size_t display_width, size_t first_line_start,
size_t left_margin)
{
const char *start;
const char *end;
size_t wrap_at_width;
if (NULL == string)
return;
start = string;
wrap_at_width = display_width;
if (wrap_at_width > first_line_start)
wrap_at_width -= first_line_start;
/* Wrap lines that are too long. */
while (strlen(start) > wrap_at_width) { /* flawfinder: ignore */
/* flawfinder rationale: see above. */
/*
* Find the last space before the end of the display line,
* or if there isn't one, behave as if there was one at the
* end of the display line.
*/
end = start + wrap_at_width;
while ((end > start) && (end[0] != ' '))
end--;
if (end == start) {
end = start + wrap_at_width;
} else {
end++;
}
/* Display the string up to that space. */
printf("%.*s", (int) (end - start), start);
if (end == start)
end++;
start = end;
/*
* If there's more text left, start a new display line and
* pad it with spaces to the left margin, and change the
* wrap width to the display width minus the left margin.
*/
if (start[0] != '\0') {
printf("\n%*s", (int) left_margin, "");
if (display_width > left_margin) {
wrap_at_width = display_width - left_margin;
} else {
wrap_at_width = 1;
}
}
}
/* Display the remainder of the string. */
printf("%s", start);
}
/*
* Output a null-terminated string to standard output, word wrapping to
* "display_width" display character positions, assuming that the first line
* starts with the cursor already at "first_line_start" display character
* positions from the left, and left-padding any new lines after the first
* one with "left_margin" spaces.
*
* Wide characters are handled if NLS is enabled, but if they can't be, this
* falls back to a version which just counts bytes as characters.
*/
static void display_word_wrap(const char *string, size_t display_width, size_t first_line_start, size_t left_margin)
{
#if defined(ENABLE_NLS) && defined(HAVE_WCHAR_H)
size_t wrap_at_width;
size_t wide_char_count;
size_t wide_string_buffer_size;
wchar_t *wide_string;
size_t start_idx, chars_remaining;
debug("[%s], display_width=%d, first_line_start=%d, left_margin=%d", string, (int) display_width,
(int) first_line_start, (int) left_margin);
if (NULL == string)
return;
/* Calculate how many wide characters are in the multibyte string. */
/*@-nullpass@ */
/* splint note: see mbstowcs() call in pv_strwidth(). */
wide_char_count = mbstowcs(NULL, string, 0);
/*@+nullpass@ */
if (wide_char_count == (size_t) -1) {
debug("%s: %s: %s", "mbstowcs", string, strerror(errno));
display_word_wrap_7bit(string, display_width, first_line_start, left_margin);
return;
}
/*
* Allocate a buffer in which to convert the multibyte string to a
* wide-character string, plus one character for zero padding.
*/
wide_string_buffer_size = sizeof(*wide_string) * (1 + wide_char_count);
wide_string = malloc(wide_string_buffer_size);
if (NULL == wide_string) {
perror("malloc");
display_word_wrap_7bit(string, display_width, first_line_start, left_margin);
return;
}
memset(wide_string, 0, wide_string_buffer_size);
/* Convert the multibyte string to a wide-character string. */
if (mbstowcs(wide_string, string, 1 + wide_char_count) == (size_t) -1) {
debug("%s: %s: %s", "mbstowcs", string, strerror(errno));
free(wide_string);
display_word_wrap_7bit(string, display_width, first_line_start, left_margin);
return;
}
start_idx = 0;
wrap_at_width = display_width;
if (wrap_at_width > first_line_start)
wrap_at_width -= first_line_start;
chars_remaining = wide_char_count;
/* Wrap lines that are too long. */
/*@-unrecog@ *//* splint doesn't see the prototype for wcswidth(). */
while (chars_remaining > 0 && wcswidth(&(wide_string[start_idx]), chars_remaining) > (int) wrap_at_width) {
/*@+unrecog@ */
size_t next_idx, end_idx;
/*
* Find the last space before the end of the display line,
* or if there isn't one, behave as if there was one at the
* end of the display line.
*/
end_idx = start_idx + wrap_at_width;
while ((end_idx > start_idx) && (!iswspace(wide_string[end_idx])))
end_idx--;
if (end_idx == start_idx) {
end_idx = start_idx + wrap_at_width;
} else {
end_idx++;
}
next_idx = end_idx;
if (end_idx == start_idx)
next_idx++;
/* Display the string up to that space, a character at a time. */
while (start_idx < end_idx && start_idx < wide_char_count) {
char multi_byte_string[MB_CUR_MAX + 1]; /* flawfinder: ignore */
/*
* flawfinder rationale: the array is explicitly
* cleared, large enough according to the wctomb()
* manual, and the string is explicitly terminated.
*/
memset(multi_byte_string, 0, MB_CUR_MAX + 1);
if (wctomb(multi_byte_string, wide_string[start_idx]) >= 0) {
multi_byte_string[MB_CUR_MAX] = '\0';
printf("%s", multi_byte_string);
}
start_idx++;
}
start_idx = next_idx;
/*
* If there's more text left, start a new display line and
* pad it with spaces to the left margin, and change the
* wrap width to the display width minus the left margin.
*/
if (start_idx < wide_char_count) {
printf("\n%*s", (int) left_margin, "");
if (display_width > left_margin) {
wrap_at_width = display_width - left_margin;
} else {
wrap_at_width = 1;
}
chars_remaining = wide_char_count - start_idx;
} else {
/* Explicitly set to 0 to avoid underflow. */
chars_remaining = 0;
}
}
/* Display the remainder of the string, a character at a time. */
while (start_idx < wide_char_count) {
char multi_byte_string[MB_CUR_MAX + 1]; /* flawfinder: ignore */
/* flawfinder rationale as above. */
memset(multi_byte_string, 0, MB_CUR_MAX + 1);
if (wctomb(multi_byte_string, wide_string[start_idx]) >= 0) {
multi_byte_string[MB_CUR_MAX] = '\0';
printf("%s", multi_byte_string);
}
start_idx++;
}
free(wide_string);
#else /* ! defined(ENABLE_NLS) && defined(HAVE_WCHAR_H) */
display_word_wrap_7bit(string, display_width, first_line_start, left_margin);
#endif /* defined(ENABLE_NLS) && defined(HAVE_WCHAR_H) */
}
/*
* Structure holding the displayed descriptions of each option - the short
* option such as "-s", its long counterpart such as "--size", the name of
* its argument such as "SIZE", and the description of what the option does.
* Any of them may be NULL.
*
* In the initialiser for this structure, translatable strings are wrapped
* with N_() to indicate that they are to be translated into the operator's
* language by this function at run-time.
*
* Note that "opt_short" and "opt_long" should never be marked as
* translatable, as they must remain consistent across all locales.
*
* The list is terminated with a NULL opt_short value - to leave a gap, set
* opt_short to an empty string instead.
*/
struct option_definition_s {
/*@null@ */ const char *opt_short;
/*@null@ */ const char *opt_long;
/*@null@ *//*@observer@ */ const char *opt_argument;
/*@null@ *//*@observer@ */ const char *opt_description;
struct {
/*
* Structure holding the width, in display character
* positions, of the individual parts of the description of
* each option - calculated after initialisation, so that
* translation can be performed.
*/
size_t opt_short;
size_t opt_long;
size_t opt_argument;
size_t opt_description;
} width;
};
@@ -26,195 +295,368 @@ struct optdesc_s {
*/
void display_help(void)
{
struct optdesc_s optlist[] = {
{"-p", "--progress", 0,
N_("show progress bar")},
{"-t", "--timer", 0,
N_("show elapsed time")},
{"-e", "--eta", 0,
N_("show estimated time of arrival (completion)")},
{"-I", "--fineta", 0,
N_
("show absolute estimated time of arrival (completion)")},
{"-r", "--rate", 0,
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"),
N_("show NUM bytes last written")},
{"-F", "--format", N_("FORMAT"),
N_("set output format to FORMAT")},
{"-n", "--numeric", 0,
N_("output percentages, not visual information")},
{"-q", "--quiet", 0,
N_("do not output any transfer information at all")},
{"", 0, 0, 0},
{"-W", "--wait", 0,
N_("display nothing until first byte transferred")},
{"-D", "--delay-start", N_("SEC"),
N_("display nothing until SEC seconds have passed")},
{"-s", "--size", N_("SIZE"),
N_("set estimated data size to SIZE bytes")},
{"-l", "--line-mode", 0,
N_("count lines instead of bytes")},
{"-0", "--null", 0,
N_("lines are null-terminated")},
{"-i", "--interval", N_("SEC"),
N_("update every SEC seconds")},
{"-w", "--width", N_("WIDTH"),
N_("assume terminal is WIDTH characters wide")},
{"-H", "--height", N_("HEIGHT"),
N_("assume terminal is HEIGHT rows high")},
{"-N", "--name", N_("NAME"),
N_("prefix visual information with NAME")},
{"-f", "--force", 0,
N_("output even if standard error is not a terminal")},
{"-c", "--cursor", 0,
N_("use cursor positioning escape sequences")},
{"", 0, 0, 0},
{"-L", "--rate-limit", N_("RATE"),
N_("limit transfer to RATE bytes per second")},
{"-B", "--buffer-size", N_("BYTES"),
N_("use a buffer size of BYTES")},
{"-C", "--no-splice", 0,
N_("never use splice(), always use read/write")},
{"-E", "--skip-errors", 0,
N_("skip read errors in input")},
{"-S", "--stop-at-size", 0,
N_("stop after --size bytes have been transferred")},
#ifdef HAVE_IPC
{"-R", "--remote", N_("PID"),
N_("update settings of process PID")},
#endif /* HAVE_IPC */
{"", 0, 0, 0},
{"-P", "--pidfile", N_("FILE"),
N_("save process ID in FILE")},
{"", 0, 0, 0},
{"-d", "--watchfd", N_("PID[:FD]"),
N_("watch file FD opened by process PID")},
{"", 0, 0, 0},
{"-h", "--help", 0,
N_("show this help and exit")},
{"-V", "--version", 0,
N_("show version information and exit")},
{0, 0, 0, 0}
};
unsigned int i, col1max = 0, tw = 77;
char *optbuf;
printf(_("Usage: %s [OPTION] [FILE]..."), PROGRAM_NAME);
printf("\n%s\n\n",
_
("Concatenate FILE(s), or standard input, to standard output,\n"
"with monitoring."));
for (i = 0; optlist[i].optshort; i++) {
unsigned int width = 0;
char *param;
width = 2 + (unsigned int) strlen(optlist[i].optshort);
#ifdef HAVE_GETOPT_LONG
if (optlist[i].optlong)
width +=
2 + (unsigned int) strlen(optlist[i].optlong);
#endif
param = optlist[i].param;
if (param)
param = _(param);
if (param)
width += 1 + strlen(param);
if (width > col1max)
col1max = width;
}
col1max++;
optbuf = malloc((size_t) (col1max + 16));
if (NULL == optbuf) {
fprintf(stderr, "%s: %s\n", PROGRAM_NAME, strerror(errno));
exit(EXIT_FAILURE);
}
for (i = 0; optlist[i].optshort; i++) {
char *param;
char *description;
char *start;
char *end;
if ('\0' == optlist[i].optshort[0]) {
printf("\n");
continue;
}
param = optlist[i].param;
if (param)
param = _(param);
description = optlist[i].description;
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 : "",
#else
"", "",
#endif
param ? " " : "", param ? param : "");
printf(" %-*s ", (int) (col1max - 2), optbuf);
if (NULL == description) {
printf("\n");
continue;
}
start = description;
while ((unsigned int) strlen(start) > tw - col1max) {
end = start + tw - col1max;
while ((end > start) && (end[0] != ' '))
end--;
if (end == start) {
end = start + tw - col1max;
} else {
end++;
}
printf("%.*s\n%*s ", (int) (end - start), start,
(int) col1max, "");
if (end == start)
end++;
start = end;
}
printf("%s\n", start);
}
struct option_definition_s option_definitions[] = {
{ "-p", "--progress", NULL,
N_("show progress bar"),
{ 0, 0, 0, 0} },
{ "-t", "--timer", NULL,
N_("show elapsed time"),
{ 0, 0, 0, 0} },
{ "-e", "--eta", NULL,
N_("show estimated time of arrival (completion)"),
{ 0, 0, 0, 0} },
{ "-I", "--fineta", NULL,
N_("show absolute estimated time of arrival (completion)"),
{ 0, 0, 0, 0} },
{ "-r", "--rate", NULL,
N_("show data transfer rate counter"),
{ 0, 0, 0, 0} },
{ "-a", "--average-rate", NULL,
N_("show data transfer average rate counter"),
{ 0, 0, 0, 0} },
{ "-b", "--bytes", NULL,
N_("show number of bytes transferred"),
{ 0, 0, 0, 0} },
{ "-T", "--buffer-percent", NULL,
N_("show percentage of transfer buffer in use"),
{ 0, 0, 0, 0} },
{ "-A", "--last-written", _("NUM"),
N_("show NUM bytes last written"),
{ 0, 0, 0, 0} },
{ "-F", "--format", N_("FORMAT"),
N_("set output format to FORMAT"),
{ 0, 0, 0, 0} },
{ "-n", "--numeric", NULL,
N_("output percentages, not visual information"),
{ 0, 0, 0, 0} },
{ "-q", "--quiet", NULL,
N_("do not output any transfer information at all"),
{ 0, 0, 0, 0} },
{ "", NULL, NULL, NULL, { 0, 0, 0, 0} },
{ "-8", "--bits", NULL,
N_("show number of bits transferred"),
{ 0, 0, 0, 0} },
{ "-k", "--si", NULL,
N_("treat suffixes as multiples of 1000 rather than 1024"),
{ 0, 0, 0, 0} },
{ "-W", "--wait", NULL,
N_("display nothing until first byte transferred"),
{ 0, 0, 0, 0} },
{ "-D", "--delay-start", N_("SEC"),
N_("display nothing until SEC seconds have passed"),
{ 0, 0, 0, 0} },
{ "-s", "--size", N_("SIZE"),
N_("set estimated data size to SIZE bytes"),
{ 0, 0, 0, 0} },
{ "-g", "--gauge", NULL,
N_("if size unknown, show rate vs max rate"),
{ 0, 0, 0, 0} },
{ "-l", "--line-mode", NULL,
N_("count lines instead of bytes"),
{ 0, 0, 0, 0} },
{ "-0", "--null", NULL,
N_("lines are null-terminated"),
{ 0, 0, 0, 0} },
{ "-i", "--interval", N_("SEC"),
N_("update every SEC seconds"),
{ 0, 0, 0, 0} },
{ "-m", "--average-rate-window", N_("SEC"),
N_("compute average rate over past SEC seconds (default 30s)"),
{ 0, 0, 0, 0} },
{ "-w", "--width", N_("WIDTH"),
N_("assume terminal is WIDTH characters wide"),
{ 0, 0, 0, 0} },
{ "-H", "--height", N_("HEIGHT"),
N_("assume terminal is HEIGHT rows high"),
{ 0, 0, 0, 0} },
{ "-N", "--name", N_("NAME"),
N_("prefix visual information with NAME"),
{ 0, 0, 0, 0} },
{ "-u", "--bar-style", N_("STYLE"),
N_("set default bar style to STYLE"),
{ 0, 0, 0, 0} },
{ "-x", "--extra-display", N_("SPEC"),
N_("also send progress to SPEC"),
{ 0, 0, 0, 0} },
{ "-v", "--stats", NULL,
N_("output transfer statistics at the end"),
{ 0, 0, 0, 0} },
{ "-f", "--force", NULL,
N_("output even if standard error is not a terminal"),
{ 0, 0, 0, 0} },
{ "-c", "--cursor", NULL,
N_("use cursor positioning escape sequences"),
{ 0, 0, 0, 0} },
{ "", NULL, NULL, NULL, { 0, 0, 0, 0} },
{ "-o", "--output", N_("FILE"),
N_("write output to FILE instead of stdout"),
{ 0, 0, 0, 0} },
{ "-L", "--rate-limit", N_("RATE"),
N_("limit transfer to RATE bytes per second"),
{ 0, 0, 0, 0} },
{ "-B", "--buffer-size", N_("BYTES"),
N_("use a buffer size of BYTES"),
{ 0, 0, 0, 0} },
{ "-C", "--no-splice", NULL,
N_("never use splice(), always use read/write"),
{ 0, 0, 0, 0} },
{ "-J", "--pipe-buffer-size", N_("BYTES"),
N_("set the pipe buffer size to BYTES"),
{ 0, 0, 0, 0} },
{ "-E", "--skip-errors", NULL,
N_("skip read errors in input"),
{ 0, 0, 0, 0} },
{ "-Z", "--error-skip-block", N_("BYTES"),
N_("skip errors in BYTES blocks at a time"),
{ 0, 0, 0, 0} },
{ "-S", "--stop-at-size", NULL,
N_("stop after --size bytes have been transferred"),
{ 0, 0, 0, 0} },
{ "-Y", "--sync", NULL,
N_("flush cache to disk after every write"),
{ 0, 0, 0, 0} },
{ "-K", "--direct-io", NULL,
N_("use direct I/O to bypass cache"),
{ 0, 0, 0, 0} },
{ "-O", "--sparse", NULL,
N_("try to seek instead of writing null bytes"),
{ 0, 0, 0, 0} },
{ "-X", "--discard", NULL,
N_("discard input instead of writing to output"),
{ 0, 0, 0, 0} },
{ "-U", "--store-and-forward", N_("FILE"),
N_("write all input to FILE before writing to output"),
{ 0, 0, 0, 0} },
{ "", NULL, NULL, NULL, { 0, 0, 0, 0} },
{ "-d", "--watchfd", N_("PID[:FD]|=NAME|@LISTFILE"),
N_("watch file FD opened by process PID"),
{ 0, 0, 0, 0} },
#ifdef PV_REMOTE_CONTROL
{ "-R", "--remote", N_("PID"),
N_("update settings of process PID"),
{ 0, 0, 0, 0} },
{ "-Q", "--query", N_("PID"),
N_("show progress of process PID"),
{ 0, 0, 0, 0} },
#endif /* PV_REMOTE_CONTROL */
{ "-M", "--monitor", "in|0|out|1|both|2",
N_("run a command and monitor its standard input, output, or both"),
{ 0, 0, 0, 0} },
{ "", NULL, NULL, NULL, { 0, 0, 0, 0} },
{ "-P", "--pidfile", N_("FILE"),
N_("save process ID in FILE"),
{ 0, 0, 0, 0} },
{ "-h", "--help", NULL,
N_("show this help and exit"),
{ 0, 0, 0, 0} },
{ "-V", "--version", NULL,
N_("show version information and exit"),
{ 0, 0, 0, 0} },
#ifdef ENABLE_DEBUGGING
printf("\n");
printf("%s",
_
("Debugging is enabled; export the DEBUG environment variable to define the\noutput filename.\n"));
{ "-!", "--debug", N_("FILE"),
N_("write debug logs to FILE"),
{ 0, 0, 0, 0} },
#endif
{ NULL, NULL, NULL, NULL, { 0, 0, 0, 0} }
};
unsigned int option_index;
size_t widest_option_width = 0;
size_t description_left_margin = 0;
size_t min_description_width = 50;
size_t right_margin = 77;
const char *program_description;
const char *bug_report_note;
char *format_sequences = NULL;
unsigned int terminal_width = 0, terminal_height = 0;
pv_screensize(&terminal_width, &terminal_height);
if (terminal_width > 5) {
right_margin = (size_t) (terminal_width - 3);
}
/*@-formatconst@ */
/*
* splint note: unavoidable use of %s in translated string. Should
* be hard to exploit - the message catalogue would have to be
* replaced or forced to load from another location.
*/
printf(_("Usage: %s [OPTION] [FILE]..."), PACKAGE_NAME);
/*@+formatconst@ */
printf("\n");
printf(_("Please report any bugs to %s."), BUG_REPORTS_TO);
/*@-mustfreefresh@ */
/*
* splint note: the gettext calls made by _() cause memory leak
* warnings, but in this case it's unavoidable, and mitigated by the
* fact that each string is only translated once.
*/
program_description = _("Concatenate FILE(s), or standard input, to standard output, with monitoring.");
if (NULL != program_description) {
display_word_wrap(program_description, right_margin, 0, 0);
printf("\n");
}
printf("\n");
/*
* Translate the help text, and calculate the displayed width of
* each part of each option definition. The total display width of
* the short option, long option, and option argument together form
* the "option" width. The widest one is used to calculate the left
* margin for all of the descriptions to start at.
*/
for (option_index = 0; NULL != option_definitions[option_index].opt_short; option_index++) {
struct option_definition_s *definition;
size_t option_width;
definition = &(option_definitions[option_index]);
option_width = 0;
definition->width.opt_short = display_width(definition->opt_short);
definition->width.opt_long = 0;
definition->width.opt_argument = 0;
definition->width.opt_description = 0;
if (NULL != definition->opt_long) {
definition->width.opt_long = display_width(definition->opt_long);
}
if (NULL != definition->opt_argument) {
/*@observer@ */ const char *translated;
translated = _(definition->opt_argument);
if (NULL != translated) {
definition->opt_argument = translated;
}
definition->width.opt_argument = display_width(definition->opt_argument);
}
if (NULL != definition->opt_description) {
/*@observer@ */ const char *translated;
translated = _(definition->opt_description);
if (NULL != translated) {
definition->opt_description = translated;
}
definition->width.opt_description = display_width(definition->opt_description);
}
/*
* The option_width is padded with a left margin of 2
* spaces, a ", " between the short and long options, a
* space between the long option and the argument, and two
* spaces after the argument:
*
* " <short>, <long> <arg> <description>"
*
* If getopt_long() is unavailable then ", <long>" is
* omitted.
*/
option_width += 2 + definition->width.opt_short; /* " short" */
#ifdef HAVE_GETOPT_LONG
option_width += 2 + definition->width.opt_long; /* ", <long>" */
#endif
option_width += 1 + definition->width.opt_argument; /* " ARG" */
option_width += 2; /* final 2 spaces */
if (option_width > widest_option_width) {
widest_option_width = option_width;
}
}
/*
* Set the left margin for the option descriptions, based on the
* widest option width, or (right margin - min_description_width),
* whichever is less, so that there is always room for
* "min_description_width" characters of description. If there's
* not even room for that, set the left margin to 2.
*/
description_left_margin = 2;
if (right_margin > (min_description_width + 2))
description_left_margin = right_margin - min_description_width;
if (widest_option_width < description_left_margin) {
description_left_margin = widest_option_width;
}
debug("%s: description_left_margin=%d, widest_option_width=%d, right_margin=%d", "help display",
(int) description_left_margin, (int) widest_option_width, (int) right_margin);
/*
* Display each of the option definitions, word wrapping the
* descriptions.
*/
for (option_index = 0; NULL != option_definitions[option_index].opt_short; option_index++) {
struct option_definition_s *definition;
size_t option_width;
definition = &(option_definitions[option_index]);
option_width = 0;
if (definition->width.opt_short > 0 && NULL != definition->opt_short) {
printf(" %s", definition->opt_short);
option_width += 2 + definition->width.opt_short;
}
#ifdef HAVE_GETOPT_LONG
if (definition->width.opt_long > 0 && NULL != definition->opt_long) {
printf(", %s", definition->opt_long);
option_width += 2 + definition->width.opt_long;
}
#endif
if (definition->width.opt_argument > 0 && NULL != definition->opt_argument) {
printf(" %s", definition->opt_argument);
option_width += 1 + definition->width.opt_argument;
}
/* Just start a new line if there's no description. */
if ((0 == definition->width.opt_description) || (NULL == definition->opt_description)) {
printf("\n");
continue;
}
/*
* If the option (with 2 trailing spaces) is too wide, start
* a new line for the description. Either way, pad with
* spaces up to the description left margin.
*/
if ((option_width + 2) > description_left_margin) {
printf("\n%*s", (int) description_left_margin, "");
} else if (option_width < description_left_margin) {
printf("%*s", (int) (description_left_margin - option_width), "");
}
/* Output the description, word wrapped. */
display_word_wrap(definition->opt_description, right_margin, description_left_margin,
description_left_margin);
printf("\n");
}
format_sequences = pv_format_sequences();
if (NULL != format_sequences) {
const char *format_sequence_header;
format_sequence_header = _("Supported format sequences:");
if (NULL != format_sequence_header) {
printf("\n");
display_word_wrap(format_sequence_header, right_margin, 0, 0);
printf("\n");
}
printf("\n ");
display_word_wrap(format_sequences, right_margin, 2, 2);
free(format_sequences);
printf("\n");
}
printf("\n");
bug_report_note = _("Please report any bugs to: %s");
if (NULL != bug_report_note) {
/*@-formatconst@ */
/*
* splint note: see earlier "formatconst" note.
* flawfinder: same reason.
*/
printf(bug_report_note, PACKAGE_BUGREPORT); /* flawfinder: ignore */
/*@+formatconst@ */
}
printf("\n");
}
/* EOF */
+843 -178
View File
File diff suppressed because it is too large Load Diff
+1093 -156
View File
File diff suppressed because it is too large Load Diff
-334
View File
@@ -1,334 +0,0 @@
/*
* Remote-control functions.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "options.h"
#include "pv.h"
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <signal.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/time.h>
#ifdef HAVE_IPC
#include <sys/ipc.h>
#include <sys/msg.h>
#endif /* HAVE_IPC */
#ifdef HAVE_IPC
struct remote_msg {
long mtype;
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) */
unsigned long long size; /* total size of data */
double interval; /* interval between updates */
unsigned int width; /* screen width */
unsigned int height; /* screen height */
char name[256];
char format[256];
};
static int remote__msgid = -1;
/*
* Return a key for use with msgget() which will be unique to the current
* user.
*
* We can't just use ftok() because the queue needs to be user-specific
* so that a user cannot send messages to another user's process, and we
* can't easily find out the terminal a given process is connected to in a
* cross-platform way.
*/
static key_t remote__genkey(void)
{
uid_t uid;
key_t key;
uid = geteuid();
key = ftok("/tmp", (int) 'P') | uid;
return key;
}
/*
* Return a message queue ID that is unique to the current user and the
* given process ID, or -1 on error.
*/
static int remote__msgget(void)
{
/* Catch SIGSYS in case msgget() raises it, so we get ENOSYS */
(void) signal(SIGSYS, SIG_IGN);
return msgget(remote__genkey(), IPC_CREAT | 0600);
}
/*
* Set the options of a remote process by setting up an IPC message queue,
* sending a message containing the new options, and then waiting for the
* message to be consumed by the remote process.
*
* Returns nonzero on error.
*/
int pv_remote_set(opts_t opts)
{
struct remote_msg msgbuf;
struct msqid_ds qbuf;
long timeout;
int msgid;
unsigned long initial_qnum;
/*
* Check that the remote process exists.
*/
if (kill((pid_t) (opts->remote), 0) != 0) {
fprintf(stderr, "%s: %u: %s\n", opts->program_name,
opts->remote, strerror(errno));
return 1;
}
/*
* Make sure parameters are within sensible bounds.
*/
if (opts->width < 1)
opts->width = 80;
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))
opts->interval = 0.1;
if (opts->interval > 600)
opts->interval = 600;
/*
* Copy parameters into message buffer.
*/
memset(&msgbuf, 0, sizeof(msgbuf));
msgbuf.mtype = (long) (opts->remote);
msgbuf.progress = opts->progress;
msgbuf.timer = opts->timer;
msgbuf.eta = opts->eta;
msgbuf.fineta = opts->fineta;
msgbuf.rate = opts->rate;
msgbuf.average_rate = opts->average_rate;
msgbuf.bytes = opts->bytes;
msgbuf.bufpercent = opts->bufpercent;
msgbuf.lastwritten = opts->lastwritten;
msgbuf.rate_limit = opts->rate_limit;
msgbuf.buffer_size = opts->buffer_size;
msgbuf.size = opts->size;
msgbuf.interval = opts->interval;
msgbuf.width = opts->width;
msgbuf.height = opts->height;
if (opts->name != NULL) {
strncpy(msgbuf.name, opts->name, sizeof(msgbuf.name) - 1);
}
if (opts->format != NULL) {
strncpy(msgbuf.format, opts->format,
sizeof(msgbuf.format) - 1);
}
msgid = remote__msgget();
if (msgid < 0) {
fprintf(stderr, "%s: %s\n", opts->program_name,
strerror(errno));
return 1;
}
memset(&qbuf, 0, sizeof(qbuf));
if (msgctl(msgid, IPC_STAT, &qbuf) < 0) {
fprintf(stderr, "%s: %s\n", opts->program_name,
strerror(errno));
return 1;
}
initial_qnum = qbuf.msg_qnum;
if (msgsnd(msgid, &msgbuf, sizeof(msgbuf) - sizeof(long), 0) != 0) {
fprintf(stderr, "%s: %s\n", opts->program_name,
strerror(errno));
return 1;
}
timeout = 1100000;
while (timeout > 10000) {
struct timeval tv;
memset(&tv, 0, sizeof(tv));
tv.tv_sec = 0;
tv.tv_usec = 10000;
(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;
/*
* If the message count is at or below the message count
* before we sent our message, assume it was received.
*/
if (qbuf.msg_qnum <= initial_qnum) {
return 0;
}
}
/*
* Message not received - delete it.
*/
memset(&qbuf, 0, sizeof(qbuf));
if (msgctl(msgid, IPC_STAT, &qbuf) >= 0) {
(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)
(void) msgctl(msgid, IPC_RMID, &qbuf);
}
}
fprintf(stderr, "%s: %u: %s\n", opts->program_name, opts->remote,
_("message not received"));
return 1;
}
/*
* Check for an IPC remote handling message and, if there is one, replace
* the current process's options with those being passed in.
*
* NB relies on pv_state_set_format() causing the output format to be
* reparsed.
*/
void pv_remote_check(pvstate_t state)
{
struct remote_msg msgbuf;
ssize_t got;
if (remote__msgid < 0)
return;
memset(&msgbuf, 0, sizeof(msgbuf));
got =
msgrcv(remote__msgid, &msgbuf, sizeof(msgbuf) - sizeof(long),
getpid(), IPC_NOWAIT);
if (got < 0) {
/*
* If our queue had been deleted, re-create it.
*/
if (errno != EAGAIN && errno != ENOMSG) {
remote__msgid = remote__msgget();
}
}
if (got < 1)
return;
debug("%s", "received remote message");
pv_state_format_string_set(state, NULL);
pv_state_name_set(state, NULL);
pv_state_set_format(state, msgbuf.progress, msgbuf.timer,
msgbuf.eta, msgbuf.fineta, msgbuf.rate,
msgbuf.average_rate,
msgbuf.bytes, msgbuf.bufpercent,
msgbuf.lastwritten,
'\0' ==
msgbuf.name[0] ? NULL : strdup(msgbuf.name));
if (msgbuf.rate_limit > 0)
pv_state_rate_limit_set(state, msgbuf.rate_limit);
if (msgbuf.buffer_size > 0) {
pv_state_target_buffer_size_set(state, msgbuf.buffer_size);
}
if (msgbuf.size > 0)
pv_state_size_set(state, msgbuf.size);
if (msgbuf.interval > 0)
pv_state_interval_set(state, msgbuf.interval);
if (msgbuf.width > 0)
pv_state_width_set(state, msgbuf.width);
if (msgbuf.height > 0)
pv_state_height_set(state, msgbuf.height);
if (msgbuf.format[0] != '\0')
pv_state_format_string_set(state, strdup(msgbuf.format));
}
/*
* Initialise remote message reception handling.
*/
void pv_remote_init(void)
{
remote__msgid = remote__msgget();
}
/*
* Clean up after remote message reception handling.
*/
void pv_remote_fini(void)
{
if (remote__msgid >= 0) {
struct msqid_ds qbuf;
memset(&qbuf, 0, sizeof(qbuf));
(void) msgctl(remote__msgid, IPC_RMID, &qbuf);
}
}
#else /* !HAVE_IPC */
/*
* Dummy stubs for remote control when we don't have IPC.
*/
void pv_remote_init(void)
{
}
void pv_remote_check(pvstate_t state)
{
}
void pv_remote_fini(void)
{
}
int pv_remote_set(pvstate_t state)
{
fprintf(stderr, "%s\n", _("IPC not supported on this system"));
return 1;
}
#endif /* HAVE_IPC */
/* EOF */
+21 -22
View File
@@ -1,34 +1,33 @@
/*
* Output version information to stdout.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
/*
* Display current package version.
* Display current package version as per GNU standards.
*/
void display_version(void)
{
printf(_("%s %s - Copyright %s %s"),
PROGRAM_NAME, VERSION, COPYRIGHT_YEAR, COPYRIGHT_HOLDER);
printf("\n\n");
printf(_("Web site: %s"), PROJECT_HOMEPAGE);
printf("\n\n");
printf("%s",
_("This program is free software, and is being distributed "
"under the\nterms of the Artistic License 2.0."));
printf("\n\n");
printf("%s",
_
("This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."));
printf("\n\n");
/*@-mustfreefresh@ */
/*
* splint note: the gettext calls made by _() cause memory leak
* warnings, but in this case it's unavoidable, and mitigated by the
* fact that each string is only translated once.
*/
/* GNU standard first line format: program and version only. */
printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
/* GNU standard second line format - "Copyright" always in English. */
printf("Copyright %s %s\n", "2026", "Andrew Wood");
/* GNU standard license line and free software notice. */
printf("%s\n", _("License: GPLv3+ <https://www.gnu.org/licenses/gpl-3.0.html>"));
printf("%s\n", _("This is free software: you are free to change and redistribute it."));
printf("%s\n", _("There is NO WARRANTY, to the extent permitted by law."));
/* Project web site link. */
printf("\n%s: <%s>\n", _("Project web site"), PACKAGE_URL);
}
/* EOF */
-471
View File
@@ -1,471 +0,0 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \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-"
"comments --keyword=_ --keyword=N_\n"
"Files: src/getopt/getopt.c src/getopt/getopt1.c src/version.c src/main/init."
"c src/main/help.c src/main/xpmptr.c src/guts/load.c src/guts/stop.c src/guts/"
"configure.c src/guts/make.c src/guts/install.c src/guts/prefs.c src/ui/"
"generate.c src/ui/main.c src/ui/xpm.c src/ui/status.c src/ui/activate.c src/"
"ui/handlers/main.c src/ui/handlers/package.c src/ui/handlers/prefs.c src/ui/"
"handlers/dirsel.c src/ui/handlers/popup.c src/ui/handlers/help.c src/ui/"
"textout.c src/ui/report.c src/ui/callback.c src/nls/intl/bindtextdom.c src/"
"nls/intl/dcgettext.c src/nls/intl/dgettext.c src/nls/intl/finddomain.c src/"
"nls/intl/gettext.c src/nls/intl/loadmsgcat.c src/nls/intl/localealias.c src/"
"nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
"compat.c\n"
#: src/pv/cursor.c:80
msgid "failed to get terminal name"
msgstr "Terminalname konnte nicht gelesen werden"
#: src/pv/cursor.c:125
msgid "failed to open lock file"
msgstr "Sperrdatei konnte nicht geöffnet werden"
#: src/pv/cursor.c:159
msgid "lock attempt failed"
msgstr "Sperrversuch fehlgeschlagen"
#: src/pv/cursor.c:409
msgid "failed to open terminal"
msgstr "Terminal konnte nicht geöffnet werden"
#: src/pv/file.c:119
msgid "failed to seek to start of output"
msgstr "Konnte nicht versuchen, die Ausgabe zu starten"
#: src/pv/file.c:215
msgid "failed to close file"
msgstr "Datei konnte nicht geschlossen werden"
#: src/pv/file.c:238
msgid "failed to read file"
msgstr "Datei konnte nicht gelesen werden"
#: 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:257
msgid "failed to stat output file"
msgstr "Dateiinformationen für Ausgabe-Datei konnten nicht gelesen werden"
#: src/pv/file.c:280
msgid "input file is output file"
msgstr "Eingabe-Datei ist Ausgabe-Datei"
#: 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
msgid "read failed"
msgstr "read-Aufruf fehlgeschlagen"
#: src/pv/transfer.c:359
msgid "warning: read errors detected"
msgstr "warnung: lesefehler erkannt"
#: src/pv/transfer.c:374
msgid "file is not seekable"
msgstr "datei ist nicht durchsuchbar"
#: src/pv/transfer.c:437
msgid "failed to seek past error"
msgstr "konnte den Fehler nicht überwinden"
#: src/pv/transfer.c:456
msgid "skipped past read error"
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: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
#, c-format
msgid "%s %s - Copyright %s %s"
msgstr "%s %s - Copyright(C) %s %s"
#: src/main/version.c:20
#, c-format
msgid "Web site: %s"
msgstr "Web-Site: %s"
#: src/main/version.c:23
msgid ""
"This program is free software, and is being distributed under the\n"
"terms of the Artistic License 2.0."
msgstr ""
"Dieses Programm ist freie Software und wird unter den Bedingungen\n"
"der Artistic License verbreitet."
#: src/main/version.c:28
msgid ""
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
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"
msgstr "Fortschritts-Anzeige"
#: src/main/help.c:33
msgid "show elapsed time"
msgstr "zeige die verstrichene Zeit an"
#: src/main/help.c:35
msgid "show estimated time of arrival (completion)"
msgstr "zeige die erwartete Zeit bis zum Ende an"
#: src/main/help.c:38
msgid "show absolute estimated time of arrival (completion)"
msgstr "zeige die absolute geschätzte Zeit bis zur Fertigstellung"
#: src/main/help.c:40
msgid "show data transfer rate counter"
msgstr "zeige die Datentransferrate an"
#: src/main/help.c:42
msgid "show data transfer average rate counter"
msgstr ""
#: 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 "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:66
msgid "set estimated data size to SIZE bytes"
msgstr "setze erwartete Datenlänge auf SIZE Byte"
#: src/main/help.c:68
msgid "count lines instead of bytes"
msgstr "zähle Zeilen anstelle von Bytes"
#: src/main/help.c:70
msgid "lines are null-terminated"
msgstr "Zeilen sind nullterminiert"
#: src/main/help.c:72
msgid "update every SEC seconds"
msgstr "aktualisiere Ausgabe nach SEC Sekunden Intervall"
#: src/main/help.c:73
msgid "WIDTH"
msgstr ""
#: src/main/help.c:74
msgid "assume terminal is WIDTH characters wide"
msgstr "setze Terminal-Breite auf WIDTH Zeichen"
#: src/main/help.c:75
msgid "HEIGHT"
msgstr ""
#: src/main/help.c:76
msgid "assume terminal is HEIGHT rows high"
msgstr "setze Terminal-Höhe auf HEIGHT Zeichen"
#: src/main/help.c:77
msgid "NAME"
msgstr ""
#: src/main/help.c:78
msgid "prefix visual information with NAME"
msgstr "setze den NAMEn für visuelle Darstellung"
#: 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:82
msgid "use cursor positioning escape sequences"
msgstr "benutze Escape-Sequenzen zur Cursor-Positionierung"
#: src/main/help.c:84
msgid "RATE"
msgstr ""
#: src/main/help.c:85
msgid "limit transfer to RATE bytes per second"
msgstr "beschränke die Transferrate auf RATE Byte pro Sekunde"
#: src/main/help.c:86
msgid "BYTES"
msgstr ""
#: src/main/help.c:87
msgid "use a buffer size of BYTES"
msgstr "BYTES benutze einen Puffer in der Größe von BYTES"
#: src/main/help.c:89
msgid "never use splice(), always use read/write"
msgstr "anstelle von splice() immer read/write benutzen"
#: src/main/help.c:91
msgid "skip read errors in input"
msgstr "Lesefehler in der Eingabe nicht beachten"
#: src/main/help.c:93
msgid "stop after --size bytes have been transferred"
msgstr "anhalten, nachdem --size Bytes übertragen wurden"
#: src/main/help.c:95
msgid "PID"
msgstr ""
#: src/main/help.c:96
msgid "update settings of process PID"
msgstr "Einstellungen der Prozess-PID updaten"
#: src/main/help.c:99
msgid "FILE"
msgstr ""
#: src/main/help.c:100
msgid "save process ID in FILE"
msgstr "Prozess-ID in FILE speichern"
#: src/main/help.c:102
msgid "PID[:FD]"
msgstr ""
#: src/main/help.c:103
msgid "watch file FD opened by process PID"
msgstr "die vom Prozess PID geöffnete Datei FD beobachten"
#: src/main/help.c:106
msgid "show this help and exit"
msgstr "zeige diese Hilfe und beende"
#: src/main/help.c:108
msgid "show version information and exit"
msgstr "zeige Versionsinformationen und beende"
#: src/main/help.c:114
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Syntax: %s [OPTION] [DATEI]..."
#: src/main/help.c:117
msgid ""
"Concatenate FILE(s), or standard input, to standard output,\n"
"with monitoring."
msgstr ""
"Verbindet DATEI(en) oder den Standard-Eingabe-Kanal mit dem\n"
"Standard-Ausgabe-Kanal und misst den Datenstrom."
#: 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:216
#, c-format
msgid "Please report any bugs to %s."
msgstr "Bitte senden Sie Fehlerberichte an %s."
#: 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"
-472
View File
@@ -1,472 +0,0 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \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-"
"comments --keyword=_ --keyword=N_\n"
"Files: src/getopt/getopt.c src/getopt/getopt1.c src/version.c src/main/init."
"c src/main/help.c src/main/xpmptr.c src/guts/load.c src/guts/stop.c src/guts/"
"configure.c src/guts/make.c src/guts/install.c src/guts/prefs.c src/ui/"
"generate.c src/ui/main.c src/ui/xpm.c src/ui/status.c src/ui/activate.c src/"
"ui/handlers/main.c src/ui/handlers/package.c src/ui/handlers/prefs.c src/ui/"
"handlers/dirsel.c src/ui/handlers/popup.c src/ui/handlers/help.c src/ui/"
"textout.c src/ui/report.c src/ui/callback.c src/nls/intl/bindtextdom.c src/"
"nls/intl/dcgettext.c src/nls/intl/dgettext.c src/nls/intl/finddomain.c src/"
"nls/intl/gettext.c src/nls/intl/loadmsgcat.c src/nls/intl/localealias.c src/"
"nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
"compat.c\n"
#: 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/transfer.c:341
msgid "read failed"
msgstr "la lecture a échoué"
#: src/pv/transfer.c:359
msgid "warning: read errors detected"
msgstr "avertissement: erreurs de lecture détectées"
#: src/pv/transfer.c:374
msgid "file is not seekable"
msgstr "ne peut pas se déplacer dans le fichier"
#: src/pv/transfer.c:437
msgid "failed to seek past error"
msgstr "n'a pas réussi à dépasser l'erreur"
#: src/pv/transfer.c:456
msgid "skipped past read error"
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é"
#: 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é"
#: 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
#, c-format
msgid "%s %s - Copyright %s %s"
msgstr "%s %s - Copyright(C) %s %s"
#: src/main/version.c:20
#, c-format
msgid "Web site: %s"
msgstr "Site Web: %s"
#: src/main/version.c:23
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"
"anglophone de la Licence Artistique 2.0 (Artistic License 2.0)."
#: src/main/version.c:28
msgid ""
"This program is distributed in the hope that it will be useful,\n"
"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/help.c:31
msgid "show progress bar"
msgstr "affiche la barre de progression"
#: src/main/help.c:33
msgid "show elapsed time"
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"
#: src/main/help.c:38
msgid "show absolute estimated time of arrival (completion)"
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"
#: src/main/help.c:42
msgid "show data transfer average rate counter"
msgstr "afficher le compteur de taux moyen de transfert de données"
#: src/main/help.c:43 src/main/help.c:63 src/main/help.c:71
msgid "SEC"
msgstr "SEC"
#: 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 "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:66
msgid "set estimated data size to SIZE bytes"
msgstr "ajuste la taille estimée des données à TAILLE octets"
#: src/main/help.c:68
msgid "count lines instead of bytes"
msgstr "compte les lignes au lieu des octets"
#: src/main/help.c:70
msgid "lines are null-terminated"
msgstr "les lignes sont terminées par un nul"
#: src/main/help.c:72
msgid "update every SEC seconds"
msgstr "mise-à-jour toute les SEC secondes"
#: src/main/help.c:73
msgid "WIDTH"
msgstr "LARGEUR"
#: src/main/help.c:74
msgid "assume terminal is WIDTH characters wide"
msgstr "présumer la largeur du terminal à LARGEUR caractères"
#: src/main/help.c:75
msgid "HEIGHT"
msgstr "HAUTEUR"
#: src/main/help.c:76
msgid "assume terminal is HEIGHT rows high"
msgstr "présumer la hauteur du terminal à HAUTEUR lignes"
#: src/main/help.c:77
msgid "NAME"
msgstr "NOM"
#: src/main/help.c:78
msgid "prefix visual information with NAME"
msgstr "préfixer les informations visuelles avec NOM"
#: 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"
#: src/main/help.c:82
msgid "use cursor positioning escape sequences"
msgstr "utiliser les séquences d'échappements de positionnement de curseur"
#: src/main/help.c:84
msgid "RATE"
msgstr "TAUX"
#: src/main/help.c:85
msgid "limit transfer to RATE bytes per second"
msgstr "limite le taux de transfer à TAUX octets par seconde"
#: src/main/help.c:86
msgid "BYTES"
msgstr "OCTETS"
#: src/main/help.c:87
msgid "use a buffer size of BYTES"
msgstr "Utiliser une mémoire tampon de OCTETS octets"
#: src/main/help.c:89
msgid "never use splice(), always use read/write"
msgstr "n'utilisez jamais splice(), utilisez toujours read/write"
#: src/main/help.c:91
msgid "skip read errors in input"
msgstr "ignorer les erreurs de lecture dans l'entrée"
#: src/main/help.c:93
msgid "stop after --size bytes have been transferred"
msgstr "arrêter après le transfert de --size octets"
#: src/main/help.c:95
msgid "PID"
msgstr "PID"
#: src/main/help.c:96
msgid "update settings of process PID"
msgstr "mettre-à-jour la configuration du processus PID"
#: src/main/help.c:99
msgid "FILE"
msgstr ""
#: src/main/help.c:100
msgid "save process ID in FILE"
msgstr "enregistrer l'ID de processus dans FILE"
#: src/main/help.c:102
msgid "PID[:FD]"
msgstr ""
#: src/main/help.c:103
msgid "watch file FD opened by process PID"
msgstr "regarder le fichier FD ouvert par le processus PID"
#: src/main/help.c:106
msgid "show this help and exit"
msgstr "afficher cette aide puis quitter"
#: src/main/help.c:108
msgid "show version information and exit"
msgstr "afficher la version puis quitter"
#: src/main/help.c:114
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Utilisation : %s [OPTIONS] [FICHIER]..."
#: 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"
"avec monitorage."
#: 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:216
#, c-format
msgid "Please report any bugs to %s."
msgstr "SVP rapporter touts bogues à %s."
#: 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"
-453
View File
@@ -1,453 +0,0 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/pv/cursor.c:80
msgid "failed to get terminal name"
msgstr ""
# "Przewidywany czas ukończenia" for ETA is too long
#: src/pv/cursor.c:125
msgid "failed to open lock file"
msgstr ""
#: src/pv/cursor.c:159
msgid "lock attempt failed"
msgstr ""
#: src/pv/cursor.c:409
msgid "failed to open terminal"
msgstr "nie udało się otworzyć terminala"
#: src/pv/file.c:119
msgid "failed to seek to start of output"
msgstr ""
# "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"
#: src/pv/file.c:238
msgid "failed to read file"
msgstr "nie udało się odczytać pliku"
#: 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"
#: src/pv/file.c:257
msgid "failed to stat output file"
msgstr "nie udało się wykonać operacji stat na pliku wyjściowym"
#: src/pv/file.c:280
msgid "input file is output file"
msgstr "plik wejściowy jest zarazem plikiem wyjściowym"
#: 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
msgid "read failed"
msgstr "błąd odczytu"
#: src/pv/transfer.c:359
msgid "warning: read errors detected"
msgstr ""
#: src/pv/transfer.c:374
msgid "file is not seekable"
msgstr ""
#: src/pv/transfer.c:437
msgid "failed to seek past error"
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"
#: 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"
#: 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
#, c-format
msgid "%s %s - Copyright %s %s"
msgstr ""
#: src/main/version.c:20
#, c-format
msgid "Web site: %s"
msgstr "Strona WWW: %s"
#: src/main/version.c:23
msgid ""
"This program is free software, and is being distributed under the\n"
"terms of the Artistic License 2.0."
msgstr ""
#: src/main/version.c:28
msgid ""
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: src/main/help.c:31
msgid "show progress bar"
msgstr "pokaż pasek postępu"
#: src/main/help.c:33
msgid "show elapsed time"
msgstr "pokaż upływający czas"
#: src/main/help.c:35
msgid "show estimated time of arrival (completion)"
msgstr "pokaż szacowany czas ukończenia"
#: src/main/help.c:38
msgid "show absolute estimated time of arrival (completion)"
msgstr ""
#: src/main/help.c:40
msgid "show data transfer rate counter"
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:43 src/main/help.c:63 src/main/help.c:71
msgid "SEC"
msgstr "WARTOŚĆ"
#: 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 "pokaż ilość przesłanych bajtów"
#: 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 "wświetl wyjście procentowo, bez graficznej prezentacji"
#: src/main/help.c:59
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 ""
#: 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:72
msgid "update every SEC seconds"
msgstr "aktualizuj co każde WARTOŚĆ sekund"
#: src/main/help.c:73
msgid "WIDTH"
msgstr "WARTOŚĆ"
#: src/main/help.c:74
msgid "assume terminal is WIDTH characters wide"
msgstr "przyjmij, że terminal ma szerokość WARTOŚĆ znaków"
#: src/main/help.c:75
msgid "HEIGHT"
msgstr ""
#: src/main/help.c:76
msgid "assume terminal is HEIGHT rows high"
msgstr "przyjmij, że terminal ma szerokość WARTOŚĆ znaków"
#: src/main/help.c:77
msgid "NAME"
msgstr "NAZWA"
#: src/main/help.c:78
msgid "prefix visual information with NAME"
msgstr "poprzedź informacje prefiksem NAZWA"
#: 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"
#: src/main/help.c:82
msgid "use cursor positioning escape sequences"
msgstr "używaj sekwencji escape do pozycjonowania"
#: src/main/help.c:84
msgid "RATE"
msgstr ""
#: src/main/help.c:85
msgid "limit transfer to RATE bytes per second"
msgstr "ogranicz przesyłane dane do RATE bajtów na sekundę"
#: src/main/help.c:86
msgid "BYTES"
msgstr ""
#: src/main/help.c:87
msgid "use a buffer size of BYTES"
msgstr ""
#: src/main/help.c:89
msgid "never use splice(), always use read/write"
msgstr ""
#: src/main/help.c:91
msgid "skip read errors in input"
msgstr ""
#: src/main/help.c:93
msgid "stop after --size bytes have been transferred"
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:102
msgid "PID[:FD]"
msgstr ""
#: src/main/help.c:103
msgid "watch file FD opened by process PID"
msgstr ""
#: src/main/help.c:106
msgid "show this help and exit"
msgstr "wyświetl te informacje z pomocą i wyjdź"
#: src/main/help.c:108
msgid "show version information and exit"
msgstr "wyświetl informacje o wersji i wyjdź"
#: src/main/help.c:114
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Sposób użycia: %s [OPCJA] [PLIK]..."
#: 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"
"z monitoringiem."
#: 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:216
#, c-format
msgid "Please report any bugs to %s."
msgstr "Proszę przesyłać zgłoszenia błędów do %s."
#: 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 "nie udało się zaalokować struktur opcji"
#: src/main/options.c:116
msgid "option structure argv allocation failed"
msgstr "nie udało się zaalokować struktur opcji argv"
#: 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 "Spróbuj `%s --help' by uzyskać więcej informacji"
#: src/main/options.c:359
#, c-format
msgid "Try `%s -h' for more information."
msgstr "Spróbuj `%s -h' by uzyskać więcej informacji"
#: 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 ""
-462
View File
@@ -1,462 +0,0 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/pv/cursor.c:80
msgid "failed to get terminal name"
msgstr "erro ao ler o nome do terminal"
#: src/pv/cursor.c:125
msgid "failed to open lock file"
msgstr "erro ao abrir arquivo de bloqueio"
#: src/pv/cursor.c:159
msgid "lock attempt failed"
msgstr "tentativa de bloqueio falhou"
#: src/pv/cursor.c:409
msgid "failed to open terminal"
msgstr "erro abrindo o terminal"
#: src/pv/file.c:119
msgid "failed to seek to start of output"
msgstr "não pode mover para o início da produção"
#: src/pv/file.c:215
msgid "failed to close file"
msgstr "erro fechando o arquivo"
#: src/pv/file.c:238
msgid "failed to read file"
msgstr "erro lendo o arquivo"
#: src/pv/file.c:248 src/main/options.c:288
msgid "failed to stat file"
msgstr "erro obtendo informações do arquivo"
#: src/pv/file.c:257
msgid "failed to stat output file"
msgstr "erro obtendo informações do arquivo de saída"
#: src/pv/file.c:280
msgid "input file is output file"
msgstr "os arquivos de entrada e saída são o mesmo"
#: 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
msgid "read failed"
msgstr "erro de leitura"
#: src/pv/transfer.c:359
msgid "warning: read errors detected"
msgstr "aviso: erros de leitura detectados"
#: src/pv/transfer.c:374
msgid "file is not seekable"
msgstr "não pode mover dentro do arquivo"
#: src/pv/transfer.c:437
msgid "failed to seek past error"
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"
#: 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"
#: 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
#, c-format
msgid "%s %s - Copyright %s %s"
msgstr "%s %s - Copyright(C) %s %s"
#: src/main/version.c:20
#, c-format
msgid "Web site: %s"
msgstr "Site: %s"
#: src/main/version.c:23
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."
#: src/main/version.c:28
msgid ""
"This program is distributed in the hope that it will be useful,\n"
"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/help.c:31
msgid "show progress bar"
msgstr "exibe barra de progressão"
#: src/main/help.c:33
msgid "show elapsed time"
msgstr "exibe tempo passado"
#: src/main/help.c:35
msgid "show estimated time of arrival (completion)"
msgstr "exibe o tempo estimado de término"
#: src/main/help.c:38
msgid "show absolute estimated time of arrival (completion)"
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"
#: src/main/help.c:42
msgid "show data transfer average rate counter"
msgstr "exibe o contador da taxa média de transferência de dados"
#: 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 "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:66
msgid "set estimated data size to SIZE bytes"
msgstr "seta a quantidade estimada de dados em SIZE bytes"
#: 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:74
msgid "assume terminal is WIDTH characters wide"
msgstr "presuma que o terminal tem WIDTH caracteres de largura"
#: src/main/help.c:75
msgid "HEIGHT"
msgstr ""
#: src/main/help.c:76
msgid "assume terminal is HEIGHT rows high"
msgstr "presuma que o terminal tem HEIGHT caracteres de altura"
#: src/main/help.c:77
msgid "NAME"
msgstr ""
#: src/main/help.c:78
msgid "prefix visual information with NAME"
msgstr "exibe NAME antes das demais informações"
#: 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"
#: src/main/help.c:82
msgid "use cursor positioning escape sequences"
msgstr "utiliza caracteres de escape para posicionar o cursor"
#: src/main/help.c:84
msgid "RATE"
msgstr ""
#: src/main/help.c:85
msgid "limit transfer to RATE bytes per second"
msgstr "limita a transferência a RATE bytes por segundo"
#: src/main/help.c:86
msgid "BYTES"
msgstr ""
#: src/main/help.c:87
msgid "use a buffer size of BYTES"
msgstr "use um tamanho de buffer de BYTES"
#: src/main/help.c:89
msgid "never use splice(), always use read/write"
msgstr "nunca use splice(), sempre use read/write"
#: src/main/help.c:91
msgid "skip read errors in input"
msgstr "ignorar erros de leitura em entrada"
#: src/main/help.c:93
msgid "stop after --size bytes have been transferred"
msgstr "parar após --size bytes terem sido transferidos"
#: src/main/help.c:95
msgid "PID"
msgstr ""
#: src/main/help.c:96
msgid "update settings of process PID"
msgstr "atualizar as configurações do processo PID"
#: src/main/help.c:99
msgid "FILE"
msgstr ""
#: src/main/help.c:100
msgid "save process ID in FILE"
msgstr "salvar ID do processo em FILE"
#: src/main/help.c:102
msgid "PID[:FD]"
msgstr ""
#: src/main/help.c:103
msgid "watch file FD opened by process PID"
msgstr "assistir arquivo FD aberto pelo processo PID"
#: src/main/help.c:106
msgid "show this help and exit"
msgstr "exibe esta tela de ajuda e termina"
#: src/main/help.c:108
msgid "show version information and exit"
msgstr "exibe a versão e termina"
#: src/main/help.c:114
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Uso: %s [OPÇÕES] [ARQUIVOS]..."
#: 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"
"com monitoramento."
#: 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:216
#, c-format
msgid "Please report any bugs to %s."
msgstr "Por favor, reporte quaisquer defeitos para %s."
#: 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"
-451
View File
@@ -1,451 +0,0 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/pv/cursor.c:80
msgid "failed to get terminal name"
msgstr ""
#: src/pv/cursor.c:125
msgid "failed to open lock file"
msgstr ""
#: src/pv/cursor.c:159
msgid "lock attempt failed"
msgstr ""
#: src/pv/cursor.c:409
msgid "failed to open terminal"
msgstr ""
#: src/pv/file.c:119
msgid "failed to seek to start of output"
msgstr ""
#: src/pv/file.c:215
msgid "failed to close file"
msgstr ""
#: src/pv/file.c:238
msgid "failed to read file"
msgstr ""
#: src/pv/file.c:248 src/main/options.c:288
msgid "failed to stat file"
msgstr ""
#: src/pv/file.c:257
msgid "failed to stat output file"
msgstr ""
#: src/pv/file.c:280
msgid "input file is output file"
msgstr ""
#: 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
msgid "read failed"
msgstr ""
#: src/pv/transfer.c:359
msgid "warning: read errors detected"
msgstr ""
#: src/pv/transfer.c:374
msgid "file is not seekable"
msgstr ""
#: src/pv/transfer.c:437
msgid "failed to seek past error"
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 ""
#: 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: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"
msgstr ""
#: src/main/version.c:20
#, c-format
msgid "Web site: %s"
msgstr ""
#: src/main/version.c:23
msgid ""
"This program is free software, and is being distributed under the\n"
"terms of the Artistic License 2.0."
msgstr ""
#: src/main/version.c:28
msgid ""
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
msgstr ""
#: src/main/help.c:31
msgid "show progress bar"
msgstr ""
#: src/main/help.c:33
msgid "show elapsed time"
msgstr ""
#: src/main/help.c:35
msgid "show estimated time of arrival (completion)"
msgstr ""
#: src/main/help.c:38
msgid "show absolute estimated time of arrival (completion)"
msgstr ""
#: src/main/help.c:40
msgid "show data transfer rate counter"
msgstr ""
#: src/main/help.c:42
msgid "show data transfer average rate counter"
msgstr ""
#: 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:65
msgid "SIZE"
msgstr ""
#: src/main/help.c:66
msgid "set estimated data size to SIZE bytes"
msgstr ""
#: 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:72
msgid "update every SEC seconds"
msgstr ""
#: src/main/help.c:73
msgid "WIDTH"
msgstr ""
#: src/main/help.c:74
msgid "assume terminal is WIDTH characters wide"
msgstr ""
#: src/main/help.c:75
msgid "HEIGHT"
msgstr ""
#: src/main/help.c:76
msgid "assume terminal is HEIGHT rows high"
msgstr ""
#: src/main/help.c:77
msgid "NAME"
msgstr ""
#: src/main/help.c:78
msgid "prefix visual information with NAME"
msgstr ""
#: src/main/help.c:80
msgid "output even if standard error is not a terminal"
msgstr ""
#: src/main/help.c:82
msgid "use cursor positioning escape sequences"
msgstr ""
#: src/main/help.c:84
msgid "RATE"
msgstr ""
#: src/main/help.c:85
msgid "limit transfer to RATE bytes per second"
msgstr ""
#: src/main/help.c:86
msgid "BYTES"
msgstr ""
#: src/main/help.c:87
msgid "use a buffer size of BYTES"
msgstr ""
#: src/main/help.c:89
msgid "never use splice(), always use read/write"
msgstr ""
#: src/main/help.c:91
msgid "skip read errors in input"
msgstr ""
#: src/main/help.c:93
msgid "stop after --size bytes have been transferred"
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:102
msgid "PID[:FD]"
msgstr ""
#: src/main/help.c:103
msgid "watch file FD opened by process PID"
msgstr ""
#: src/main/help.c:106
msgid "show this help and exit"
msgstr ""
#: src/main/help.c:108
msgid "show version information and exit"
msgstr ""
#: src/main/help.c:114
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr ""
#: src/main/help.c:117
msgid ""
"Concatenate FILE(s), or standard input, to standard output,\n"
"with monitoring."
msgstr ""
#: 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: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 ""
+180
View File
@@ -0,0 +1,180 @@
/*
* Functions for updating the calculated state of the transfer.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Update the current average rate, using a ring buffer of past transfer
* positions - if this is the first entry, use the provided instantaneous
* rate, otherwise calculate the average rate from the difference between
* the current position + elapsed time pair, and the oldest pair in the
* buffer. The current elapsed time and amount transferred (both from
* "transfer") are added to the buffer.
*/
static void pv__update_average_rate_history(pvtransfercalc_t calc, readonly_pvtransferstate_t transfer,
unsigned int history_interval, long double rate)
{
size_t first = calc->history_first;
size_t last = calc->history_last;
long double last_elapsed;
if (NULL == calc->history)
return;
last_elapsed = calc->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)
&& (transfer->elapsed_seconds < (last_elapsed + history_interval)))
return;
/*
* If this is not the first call, add a new entry to the ring
* buffer.
*/
if (last_elapsed > 0.0) {
size_t len = calc->history_len;
last = (last + 1) % len;
calc->history_last = last;
if (last == first) {
first = (first + 1) % len;
calc->history_first = first;
}
}
calc->history[last].elapsed_sec = transfer->elapsed_seconds;
calc->history[last].transferred = transfer->transferred;
if (first == last) {
calc->current_avg_rate = rate;
} else {
off_t bytes = (calc->history[last].transferred - calc->history[first].transferred);
long double sec = (calc->history[last].elapsed_sec - calc->history[first].elapsed_sec);
/* Safety check to avoid division by zero. */
if (sec < 0.000001 && sec > -0.000001)
sec = 0.000001;
calc->current_avg_rate = (long double) bytes / sec;
}
}
/*
* Update all calculated transfer state in calc (usually from state->calc).
*
* If "final" is true, this is the final update, so calc->transfer_rate and
* calc->average_rate are given as an average over the whole transfer;
* otherwise they are the current transfer rate and current average rate.
*
* The value of calc->percentage will reflect the percentage completion if
* control->size is greater than zero, otherwise it will increase by 2 each
* call and wrap at 200.
*/
void pv_calculate_transfer_rate(pvtransfercalc_t calc, readonly_pvtransferstate_t transfer,
readonly_pvcontrol_t control, readonly_pvdisplay_t display, bool final)
{
off_t bytes_since_last;
long double time_since_last, transfer_rate, average_rate;
/* Quick safety checks for null pointers. */
if (NULL == calc)
return;
if (NULL == transfer)
return;
if (NULL == control)
return;
if (NULL == display)
return;
bytes_since_last = 0;
if (transfer->transferred >= 0) {
bytes_since_last = transfer->transferred - calc->prev_transferred;
calc->prev_transferred = transfer->transferred;
}
/*
* When the time since the last update is very small, keep track of
* the amount transferred since the last update, and just keep
* adding to that until a reasonable amount of time has passed to
* avoid rate spikes or division by zero.
*/
time_since_last = transfer->elapsed_seconds - calc->prev_elapsed_sec;
if (time_since_last <= 0.01) {
transfer_rate = calc->prev_rate;
calc->prev_trans += bytes_since_last;
} else {
long double measured_rate;
transfer_rate = ((long double) bytes_since_last + calc->prev_trans) / time_since_last;
measured_rate = transfer_rate;
calc->prev_elapsed_sec = transfer->elapsed_seconds;
calc->prev_trans = 0;
if ((calc->measurements_taken < 1) || (measured_rate < calc->rate_min)) {
calc->rate_min = measured_rate;
}
if (measured_rate > calc->rate_max) {
calc->rate_max = measured_rate;
}
calc->rate_sum += measured_rate;
calc->ratesquared_sum += (measured_rate * measured_rate);
calc->measurements_taken++;
}
calc->prev_rate = transfer_rate;
/* Update the history and current average rate. */
pv__update_average_rate_history(calc, transfer, control->history_interval, transfer_rate);
average_rate = calc->current_avg_rate;
/*
* If this is the final update at the end of the transfer,
* recalculate the rate - and the average rate - across the whole
* period of the transfer.
*/
if (final) {
long double total_elapsed_seconds = (long double) (transfer->elapsed_seconds);
/* Safety check to avoid division by zero. */
if (total_elapsed_seconds < 0.000001)
total_elapsed_seconds = 0.000001;
average_rate =
(((long double) (transfer->transferred)) -
((long double) display->initial_offset)) / total_elapsed_seconds;
transfer_rate = average_rate;
}
calc->transfer_rate = transfer_rate;
calc->average_rate = average_rate;
if (control->size <= 0) {
/*
* If the total size of the incoming data is unknown, then
* for a percentage, gradually increase the percentage
* completion as data arrives, to a maximum of 200, then
* reset it. This means that the numeric percentage output
* will go 0%-100%, 100%-0%, 0%-100%, and so on.
*/
if (transfer_rate > 0)
calc->percentage += 2;
if (calc->percentage > 199)
calc->percentage = 0;
} else {
calc->percentage = pv_percentage(transfer->transferred, control->size);
}
/* Ensure the percentage is never negative or huge. */
if (calc->percentage < 0.0)
calc->percentage = 0.0;
if (calc->percentage > 100000.0)
calc->percentage = 100000.0;
}
+403 -268
View File
File diff suppressed because it is too large Load Diff
+1133 -842
View File
File diff suppressed because it is too large Load Diff
+250
View File
@@ -0,0 +1,250 @@
/*
* Functions relating to elapsed time.
*
* Copyright 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
#include <string.h>
#include <errno.h>
/*
* Read the current elapsed time, relative to an unspecified point in the
* past, and store it in "return_time". The time is guaranteed to not go
* backwards and does not count time when the system was suspended. See
* clock_gettime(2) with CLOCK_MONOTONIC.
*
* The read should not fail; if it does, the program is aborted with exit
* status 16 (transfer error).
*/
void pv_elapsedtime_read(struct timespec *return_time)
{
/*@-unrecog@ *//* splint doesn't know clock_gettime. */
if (0 != clock_gettime(CLOCK_MONOTONIC, return_time)) {
pv_perror("%s", "clock_gettime");
/*@-exitarg@ *//* The special exit status is explicitly chosen. */
exit(PV_ERROREXIT_TRANSFER);
/*@+exitarg@ */
}
/*@+unrecog@ */
}
/*
* Set the time in the timespec to zero.
*/
void pv_elapsedtime_zero(struct timespec *zero_time)
{
if (NULL == zero_time)
return;
zero_time->tv_sec = 0;
zero_time->tv_nsec = 0;
}
/*
* Copy source_time into dest_time. Analogous to strcpy(3).
*/
void pv_elapsedtime_copy(struct timespec *dest_time, const struct timespec *source_time)
{
if (NULL == dest_time)
return;
if (NULL == source_time)
return;
dest_time->tv_sec = source_time->tv_sec;
dest_time->tv_nsec = source_time->tv_nsec;
}
/*
* Return -1, 0, or 1 depending on whether the first time is earlier than,
* equal to, or later than the second time. Analogous to strcmp(3).
*/
int pv_elapsedtime_compare(const struct timespec *first_time, const struct timespec *second_time)
{
/* Treat NULL as a zero time. */
if ((NULL == first_time) && (NULL == second_time))
return 0;
if ((NULL == first_time) && (NULL != second_time))
return -1;
if ((NULL != first_time) && (NULL == second_time))
return 1;
/* These should never happen, but check just in case. */
if (NULL == first_time)
return 0;
if (NULL == second_time)
return 0;
/* Check the seconds part, first */
if (first_time->tv_sec < second_time->tv_sec)
return -1;
if (first_time->tv_sec > second_time->tv_sec)
return 1;
/* Seconds are equal - compare nanoseconds. */
if (first_time->tv_nsec < second_time->tv_nsec)
return -1;
if (first_time->tv_nsec > second_time->tv_nsec)
return 1;
/* Nanoseconds are also equal - times are equal. */
return 0;
}
/*
* Add first_time and second_time, writing the result to return_time.
*/
void pv_elapsedtime_add(struct timespec *return_time, const struct timespec *first_time,
const struct timespec *second_time)
{
long long seconds, nanoseconds;
if (NULL == return_time)
return;
seconds = 0;
nanoseconds = 0;
if (NULL != first_time) {
seconds += first_time->tv_sec;
nanoseconds += first_time->tv_nsec;
}
if (NULL != second_time) {
seconds += second_time->tv_sec;
nanoseconds += second_time->tv_nsec;
}
seconds += nanoseconds / 1000000000;
nanoseconds = nanoseconds % 1000000000;
/*@-type@ */
return_time->tv_sec = seconds;
return_time->tv_nsec = nanoseconds;
/*@+type@ */
/*
* splint rationale: the manual for timespec(3) states that its
* types are implementation-defined, so the best option is to use
* types that are the most likely to be large enough, and let the
* compiler do the casting.
*/
}
/*
* Add a number of nanoseconds to a timespec.
*/
void pv_elapsedtime_add_nsec(struct timespec *return_time, long long add_nanoseconds)
{
long long seconds, nanoseconds;
if (NULL == return_time)
return;
seconds = return_time->tv_sec;
nanoseconds = return_time->tv_nsec + add_nanoseconds;
seconds += nanoseconds / 1000000000;
nanoseconds = nanoseconds % 1000000000;
/*@-type@ *//* See above. */
return_time->tv_sec = seconds;
return_time->tv_nsec = nanoseconds;
/*@+type@ */
}
/*
* Set the return timespec to the first time minus the second time.
*/
void pv_elapsedtime_subtract(struct timespec *return_time, const struct timespec *first_time,
const struct timespec *second_time)
{
long long seconds, nanoseconds;
if (NULL == return_time)
return;
seconds = 0;
nanoseconds = 0;
if (NULL != first_time) {
seconds += first_time->tv_sec;
nanoseconds += first_time->tv_nsec;
}
if (NULL != second_time) {
seconds -= second_time->tv_sec;
nanoseconds -= second_time->tv_nsec;
}
seconds += nanoseconds / 1000000000;
nanoseconds = nanoseconds % 1000000000;
if (nanoseconds < 0) {
seconds--;
nanoseconds = 1000000000 + nanoseconds;
}
/*@-type@ *//* See above. */
return_time->tv_sec = seconds;
return_time->tv_nsec = nanoseconds;
/*@+type@ */
}
/*
* Convert a timespec to seconds.
*/
long double pv_elapsedtime_seconds(const struct timespec *elapsed_time)
{
long double seconds;
if (NULL == elapsed_time)
return 0.0;
seconds = (long double) elapsed_time->tv_sec;
seconds += (long double) (elapsed_time->tv_nsec) / 1000000000.0L;
return seconds;
}
/*
* Sleep for a number of nanoseconds.
*/
void pv_nanosleep(long long nanoseconds)
{
#if HAVE_NANOSLEEP
struct timespec sleep_for, time_remaining;
memset(&sleep_for, 0, sizeof(sleep_for));
memset(&time_remaining, 0, sizeof(time_remaining));
sleep_for.tv_sec = 0;
/*@-type@ */
sleep_for.tv_nsec = nanoseconds;
/*@+type@ *//* splint rationale - best effort. */
/*@-unrecog@ */
(void) nanosleep(&sleep_for, &time_remaining);
/*@+unrecog@ *//* splint doesn't know of nanosleep(). */
#else
struct timeval tv;
tv.tv_sec = 0;
/*@-type@ */
tv.tv_usec = nanoseconds / 1000;
/*@+type@ *//* splint rationale - best effort. */
/*@-null@ */
(void) select(0, NULL, NULL, NULL, &tv);
/*@+null@ *//* splint doesn't know about select(). */
#endif
}
+598 -176
View File
@@ -1,7 +1,13 @@
/*
* Functions for opening and closing files.
* Functions for opening and closing files, and calculating their size.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
@@ -12,86 +18,169 @@
#include <unistd.h>
#include <fcntl.h>
#include <limits.h>
#include <sys/utsname.h>
/*@-type@*/
/* splint has trouble with off_t and mode_t throughout this file. */
/*
* Check that a file descriptor is open on /dev/null, returning true if so.
* Otherwise return false; if the second argument is true, reports the
* problem with pv_error() before returning.
*
* No error is reported if the file descriptor is less than zero.
*/
bool pv_fd_is_dev_null(int fd, bool report_error)
{
struct stat sb;
struct utsname uts;
unsigned long expected_rdev;
bool is_dev_null;
if (fd < 0)
return false;
memset(&sb, 0, sizeof(sb));
if (fstat(fd, &sb) < 0) {
if (report_error)
pv_perror("%s", "/dev/null");
return false;
}
expected_rdev = 0x0103; /* device 1,3 on Linux. */
is_dev_null = true;
if (!S_ISCHR(sb.st_mode)) {
debug("%s", "/dev/null: not a character device");
is_dev_null = false;
}
memset(&uts, 0, sizeof(uts));
if (uname(&uts) >= 0) {
if (0 == strncmp(uts.sysname, "OpenBSD", 7)) {
expected_rdev = 0x0202;
} else if (0 == strncmp(uts.sysname, "FreeBSD", 7)) {
expected_rdev = 0x0022;
} else if (0 == strncmp(uts.sysname, "NetBSD", 6)) {
expected_rdev = 0x0202;
} else if (0 == strncmp(uts.sysname, "Darwin", 6)) {
expected_rdev = 0x03000002;
}
}
if ((unsigned long) (sb.st_rdev) != expected_rdev) {
debug("/dev/null: fd is %08lx, expected %08lx", sb.st_rdev, expected_rdev);
is_dev_null = false;
}
if (is_dev_null)
return true;
if (report_error)
pv_error("%s", _("/dev/null is not usable"));
return false;
}
/*
* Try to work out the total size of all data by adding up the sizes of all
* input files. If any of the input files are of indeterminate size (i.e.
* they are a pipe), the total size is set to zero.
* Calculate the total number of bytes to be transferred by adding up the
* sizes of all input files. If any of the input files are of indeterminate
* size (such as if they are a pipe), the total size is set to zero.
*
* Any files that cannot be stat()ed or that access() says we can't read
* will cause a warning to be output and will be removed from the list.
*
* In line mode, any files that pass the above checks will then be read to
* determine how many lines they contain, and the total size will be set to
* the total line count. Only regular files will be read.
* If there are any files that cannot be stat()ed, or that access() says are
* not readable, they will be skipped, and the total size will be set to
* zero.
*
* Returns the total size, or 0 if it is unknown.
*/
unsigned long long pv_calc_total_size(pvstate_t state)
static off_t pv_calc_total_bytes(pvstate_t state)
{
unsigned long long total;
struct stat64 sb;
int rc, i, j, fd;
off_t total;
struct stat sb;
unsigned int file_idx;
total = 0;
rc = 0;
memset(&sb, 0, sizeof(sb));
/*
* No files specified - check stdin.
*/
if (state->input_file_count < 1) {
if (0 == fstat64(STDIN_FILENO, &sb))
if ((state->files.file_count < 1) || (NULL == state->files.filename)) {
if (0 == fstat(STDIN_FILENO, &sb))
total = sb.st_size;
return total;
}
for (i = 0; i < state->input_file_count; i++) {
if (0 == strcmp(state->input_files[i], "-")) {
rc = fstat64(STDIN_FILENO, &sb);
for (file_idx = 0; file_idx < state->files.file_count; file_idx++) {
int rc;
/* Skip any NULL entries, though they should be impossible. */
if (NULL == state->files.filename[file_idx])
continue;
if (0 == strcmp(state->files.filename[file_idx], "-")) {
rc = fstat(STDIN_FILENO, &sb);
if (rc != 0) {
total = 0;
return total;
}
} else {
rc = stat64(state->input_files[i], &sb);
if (0 == rc)
rc = access(state->input_files[i], R_OK);
rc = stat(state->files.filename[file_idx], &sb);
if (0 == rc) {
rc = access(state->files.filename[file_idx], R_OK); /* flawfinder: ignore */
/*
* flawfinder rationale: access() can lead
* to TOCTOU issues but here it isn't being
* used to check permissions, only to zero
* the total if the file is likely to be
* unreadable later. If an attacker
* redirected one of the input files in
* between this part and the actual reading,
* the outcome would be that the total byte
* count would be wrong or missing, nothing
* otherwise exploitable.
*/
}
}
if (rc != 0) {
pv_error(state, "%s: %s",
state->input_files[i], strerror(errno));
for (j = i; j < state->input_file_count - 1; j++) {
state->input_files[j] =
state->input_files[j + 1];
}
state->input_file_count--;
i--;
state->exit_status |= 2;
continue;
debug("%s: %s", state->files.filename[file_idx], strerror(errno));
total = 0;
return total;
}
if (S_ISBLK(sb.st_mode)) {
int fd;
/*
* Get the size of block devices by opening
* them and seeking to the end.
*/
if (0 == strcmp(state->input_files[i], "-")) {
fd = open64("/dev/stdin", O_RDONLY);
if (0 == strcmp(state->files.filename[file_idx], "-")) {
fd = open("/dev/stdin", O_RDONLY); /* flawfinder: ignore */
/*
* flawfinder rationale: "/dev/stdin" may be
* a symlink, so O_NOFOLLOW is not suitable;
* in mitigation, a path under "/dev" is
* unlikely to be under the control of
* someone else.
*/
} else {
fd = open64(state->input_files[i],
O_RDONLY);
fd = open(state->files.filename[file_idx], O_RDONLY); /* flawfinder: ignore */
/* flawfinder - see last open() below. */
}
if (fd >= 0) {
total += lseek64(fd, 0, SEEK_END);
close(fd);
off_t end_position;
end_position = lseek(fd, 0, SEEK_END);
if (end_position > 0) {
total += end_position;
}
(void) close(fd);
} else {
pv_error(state, "%s: %s",
state->input_files[i],
strerror(errno));
state->exit_status |= 2;
total = 0;
return total;
}
} else if (S_ISREG(sb.st_mode)) {
total += sb.st_size;
@@ -101,194 +190,527 @@ unsigned long long pv_calc_total_size(pvstate_t state)
}
/*
* Patch from Peter Samuelson: if we cannot work out the size of the
* input, but we are writing to a block device, then use the size of
* the output block device.
* Patch from Peter Samuelson: if the input size can't be
* determined, but the output is being written to a block device,
* then use the size of the output block device.
*
* Further modified to check that stdout is not in append-only mode
* and that we can seek back to the start after getting the size.
* Further modified to check that output is not in append-only mode,
* such that it is possible to seek back to the start after getting
* the size.
*/
if (total <= 0) {
rc = fstat64(STDOUT_FILENO, &sb);
if (total < 1) {
int rc;
rc = fstat(state->control.output_fd, &sb);
if ((0 == rc) && S_ISBLK(sb.st_mode)
&& (0 == (fcntl(STDOUT_FILENO, F_GETFL) & O_APPEND))) {
total = lseek64(STDOUT_FILENO, 0, SEEK_END);
if (lseek64(STDOUT_FILENO, 0, SEEK_SET) != 0) {
pv_error(state, "%s: %s: %s", "(stdout)",
_
("failed to seek to start of output"),
strerror(errno));
state->exit_status |= 2;
&& (0 == (fcntl(state->control.output_fd, F_GETFL) & O_APPEND))) {
off_t end_position;
end_position = lseek(state->control.output_fd, 0, SEEK_END);
total = 0;
if (end_position > 0) {
total = end_position;
}
if (lseek(state->control.output_fd, 0, SEEK_SET) != 0) {
pv_perror("%s",
NULL == state->control.output_name ? "(null)" : state->control.output_name);
state->status.exit_status |= PV_ERROREXIT_ACCESS;
}
/*
* If we worked out a size, then set the
* stop-at-size flag to prevent a "no space left on
* device" error when we reach the end of the output
* device.
* If a size was found, then set the stop-at-size
* flag to prevent a "no space left on device" error
* when the end of the output device is reached.
*/
if (total > 0) {
state->stop_at_size = 1;
state->control.stop_at_size = true;
}
}
}
if (!state->linemode)
return total;
/*
* In line mode, we count input lines to work out the total size.
*/
total = 0;
for (i = 0; i < state->input_file_count; i++) {
fd = -1;
if (0 == strcmp(state->input_files[i], "-")) {
rc = fstat64(STDIN_FILENO, &sb);
if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
total = 0;
return total;
}
fd = dup(STDIN_FILENO);
} else {
rc = stat64(state->input_files[i], &sb);
if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
total = 0;
return total;
}
fd = open64(state->input_files[i], O_RDONLY);
}
if (fd < 0) {
pv_error(state, "%s: %s", state->input_files[i],
strerror(errno));
total = 0;
state->exit_status |= 2;
return total;
}
while (1) {
unsigned char scanbuf[1024];
int numread, j;
numread = read(fd, scanbuf, sizeof(scanbuf));
if (numread < 0) {
pv_error(state, "%s: %s",
state->input_files[i],
strerror(errno));
state->exit_status |= 2;
break;
} else if (0 == numread) {
break;
}
for (j = 0; j < numread; j++) {
if ('\n' == scanbuf[j])
total++;
}
}
lseek64(fd, 0, SEEK_SET);
close(fd);
}
return total;
}
/*
* Count the total number of lines to be transferred by reading through all
* input files. If any of the inputs are not regular files (such as if they
* are a pipe or a block device), the total size is set to zero.
*
* If there are any files that cannot be stat()ed, or that access() says are
* not readable, they will be skipped, and the total size will be set to
* zero.
*
* Returns the total size, or 0 if it is unknown.
*/
static off_t pv_calc_total_lines(pvstate_t state)
{
off_t total;
struct stat sb;
unsigned int file_idx;
total = 0;
for (file_idx = 0; file_idx < state->files.file_count && NULL != state->files.filename; file_idx++) {
int fd = -1;
int rc = 0;
/* Skip any NULL entries, though they should be impossible. */
if (NULL == state->files.filename[file_idx])
continue;
if (0 == strcmp(state->files.filename[file_idx], "-")) {
rc = fstat(STDIN_FILENO, &sb);
if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
total = 0;
return total;
}
fd = dup(STDIN_FILENO);
} else {
rc = stat(state->files.filename[file_idx], &sb);
if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
total = 0;
return total;
}
fd = open(state->files.filename[file_idx], O_RDONLY); /* flawfinder: ignore */
/* flawfinder - see last open() below. */
}
if (fd < 0) {
debug("%s: %s", state->files.filename[file_idx], strerror(errno));
total = 0;
return total;
}
#if HAVE_POSIX_FADVISE
/* Advise the OS that all reads will be sequential. */
(void) posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
#endif
while (true) {
char scanbuf[1024]; /* flawfinder: ignore */
ssize_t numread, buf_idx;
/* flawfinder - always bounded, below. */
numread = read(fd, scanbuf, sizeof(scanbuf)); /* flawfinder: ignore */
/*
* flawfinder rationale: every read is reading into
* the start of the buffer, not moving along it, so
* the bounding is OK.
*/
if (numread < 0) {
pv_perror("%s", state->files.filename[file_idx]);
state->status.exit_status |= PV_ERROREXIT_ACCESS;
break;
} else if (0 == numread) {
break;
}
for (buf_idx = 0; buf_idx < numread; buf_idx++) {
if (state->control.null_terminated_lines) {
if ('\0' == scanbuf[buf_idx])
total++;
} else {
if ('\n' == scanbuf[buf_idx])
total++;
}
}
}
if (0 != lseek(fd, 0, SEEK_SET)) {
pv_perror("%s", state->files.filename[file_idx]);
state->status.exit_status |= PV_ERROREXIT_ACCESS;
}
(void) close(fd);
}
return total;
}
/*
* Work out the total size of all data by adding up the sizes of all input
* files, using either pv_calc_total_bytes() or pv_calc_total_lines()
* depending on whether state->control.linemode is true.
*
* Returns the total size, or 0 if it is unknown.
*/
off_t pv_calc_total_size(pvstate_t state)
{
if (state->control.linemode) {
return pv_calc_total_lines(state);
} else {
return pv_calc_total_bytes(state);
}
}
/*
* Close the given file descriptor and open the next one, whose number in
* the list is "filenum", returning the new file descriptor (or negative on
* error). It is an error if the next input file is the same as the file
* stdout is pointing to.
* the output is pointing to.
*
* Updates state->current_file in the process.
* Updates state->status.current_input_file and
* state->status.current_input_is_pipe.
*
* If the input is not a pipe, and state->status.output_is_pipe is false,
* and state->control.no_splice is false, also creates a pipe and populates
* state->transfer.intermediate_pipe[] with its file descriptors, if a pipe
* had not already been created (i.e. that array contained [-1,-1]).
*/
int pv_next_file(pvstate_t state, int filenum, int oldfd)
int pv_next_file(pvstate_t state, unsigned int filenum, int oldfd)
{
struct stat64 isb;
struct stat64 osb;
int fd, input_file_is_stdout;
struct stat isb;
struct stat osb;
int fd;
bool input_file_is_output;
char *next_filename;
if (oldfd > 0) {
if (close(oldfd)) {
pv_error(state, "%s: %s",
_("failed to close file"),
strerror(errno));
state->exit_status |= 8;
if (oldfd >= 0) {
if (0 != close(oldfd)) {
pv_perror("%s: %s", pv_current_file_name(state), _("error closing file"));
state->status.exit_status |= PV_ERROREXIT_TRANSITION;
return -1;
}
}
if (filenum >= state->input_file_count) {
state->exit_status |= 8;
if (filenum >= state->files.file_count) {
debug("%s: %d >= %d", "filenum too large", filenum, state->files.file_count);
state->status.exit_status |= PV_ERROREXIT_TRANSITION;
return -1;
}
if (filenum < 0) {
state->exit_status |= 8;
return -1;
next_filename = NULL;
if (NULL != state->files.filename) {
next_filename = state->files.filename[filenum];
if (NULL == next_filename) {
debug("%s: @%d, max %d", "unexpected null filename", filenum, state->files.file_count);
state->status.exit_status |= PV_ERROREXIT_TRANSITION;
return -1;
}
}
if (0 == strcmp(state->input_files[filenum], "-")) {
if ((NULL == next_filename) || (0 == strcmp(next_filename, "-"))) {
fd = STDIN_FILENO;
} else {
fd = open64(state->input_files[filenum], O_RDONLY);
fd = open(next_filename, O_RDONLY); /* flawfinder: ignore */
/*
* flawfinder rationale: the input file list is under the
* control of the operator by its nature, so refusing to
* open symlinks would be counterintuitive.
*/
if (fd < 0) {
pv_error(state, "%s: %s: %s",
_("failed to read file"),
state->input_files[filenum],
strerror(errno));
state->exit_status |= 2;
pv_perror("%s", next_filename);
state->status.exit_status |= PV_ERROREXIT_ACCESS;
return -1;
}
}
if (fstat64(fd, &isb)) {
pv_error(state, "%s: %s: %s",
_("failed to stat file"),
state->input_files[filenum], strerror(errno));
close(fd);
state->exit_status |= 2;
if (0 != fstat(fd, &isb)) {
pv_perror("%s", NULL == next_filename ? "-" : next_filename);
(void) close(fd);
state->status.exit_status |= PV_ERROREXIT_ACCESS;
return -1;
}
if (fstat64(STDOUT_FILENO, &osb)) {
pv_error(state, "%s: %s",
_("failed to stat output file"), strerror(errno));
close(fd);
state->exit_status |= 2;
if (0 != fstat(state->control.output_fd, &osb)) {
pv_perror("%s", NULL == state->control.output_name ? "(null)" : state->control.output_name);
(void) close(fd);
state->status.exit_status |= PV_ERROREXIT_ACCESS;
return -1;
}
/*
* Check that this new input file is not the same as stdout's
* destination. This restriction is ignored for anything other
* than a regular file or block device.
* If the input file is a regular file or a block device, check that
* it is not the same as the output's destination.
*/
input_file_is_stdout = 1;
input_file_is_output = true;
if (isb.st_dev != osb.st_dev)
input_file_is_stdout = 0;
input_file_is_output = false;
if (isb.st_ino != osb.st_ino)
input_file_is_stdout = 0;
if (isatty(fd))
input_file_is_stdout = 0;
input_file_is_output = false;
if (0 != isatty(fd))
input_file_is_output = false;
if ((!S_ISREG(isb.st_mode)) && (!S_ISBLK(isb.st_mode)))
input_file_is_stdout = 0;
input_file_is_output = false;
if (input_file_is_stdout) {
pv_error(state, "%s: %s",
_("input file is output file"),
state->input_files[filenum]);
close(fd);
state->exit_status |= 4;
if (input_file_is_output) {
pv_error("%s: %s", NULL == next_filename ? "-" : next_filename, _("input file is also the output"));
(void) close(fd);
state->status.exit_status |= PV_ERROREXIT_OUROBOROS;
return -1;
}
state->current_file = state->input_files[filenum];
if (0 == strcmp(state->input_files[filenum], "-")) {
state->current_file = "(stdin)";
/*
* Detect whether the input file is a pipe, a regular file, or
* neither. This is used later, in pv__transfer_read(), when
* determining the transfer method - read/write, splice(),
* copy_file_range().
*/
state->status.current_input_is_pipe = false;
state->status.current_input_is_file = false;
if ((isb.st_mode & S_IFMT) == S_IFIFO) {
state->status.current_input_is_pipe = true;
debug("%s (fd %d)", "input is a pipe", fd);
} else if ((isb.st_mode & S_IFMT) == S_IFREG) {
state->status.current_input_is_file = true;
debug("%s (fd %d)", "input is a regular file", fd);
}
state->status.current_input_file = filenum;
#ifdef O_DIRECT
/*
* Set or clear O_DIRECT on the file descriptor.
*/
if (0 != fcntl(fd, F_SETFL, (state->control.direct_io ? O_DIRECT : 0) | fcntl(fd, F_GETFL))) {
/*@-compdef@ */
/*
* splint - passed or returned storage is undefined - but at
* this point, the input file list has been populated, so
* that's OK.
*/
debug("%s: %s: %s", pv_current_file_name(state), "fcntl", strerror(errno));
/*@+compdef@ */
}
/*
* Don't clear direct_io_changed here, to avoid race conditions that
* could cause the input and output settings to differ.
*/
#endif /* O_DIRECT */
debug("%s: %d: %s: fd=%d, is_pipe=%s, is_file=%s", "next file opened", filenum, pv_current_file_name(state), fd,
state->status.current_input_is_pipe ? "true" : "false",
state->status.current_input_is_file ? "true" : "false");
#ifdef HAVE_SPLICE
if (state->control.discard_input && !state->control.no_splice && state->transfer.discard_fd < 0) {
/*
* Open a file descriptor to /dev/null, so that input can be
* spliced to it to implement -X.
*
* If this fails, transfer.discard_fd will be left at -1,
* which means the transfer functions will not use splice().
*/
state->transfer.discard_fd = open("/dev/null", O_WRONLY); /* flawfinder: ignore */
/* flawfinder: /dev/null is trusted. */
if (state->transfer.discard_fd < 0) {
debug("%s: %s", "/dev/null", strerror(errno));
state->transfer.discard_fd = -1;
}
if (!pv_fd_is_dev_null(state->transfer.discard_fd, false)) {
if (state->transfer.discard_fd >= 0)
(void) close(state->transfer.discard_fd);
state->transfer.discard_fd = -1;
}
debug("%s: %d", "discard_fd", state->transfer.discard_fd);
/*
* If discard_fd was successfully opened, it will be used as
* the output, so set the output status flags appropriately.
*/
if (state->transfer.discard_fd >= 0) {
state->status.output_is_pipe = false;
state->status.output_is_file = false;
}
}
if (!(state->status.output_is_pipe || state->status.current_input_is_pipe || state->control.no_splice)
&& (-1 == state->transfer.intermediate_pipe[0])) {
/*
* Create an intermediate pipe to allow the input to be used
* with splice() even though neither it nor the output are
* themselves pipes.
*/
state->transfer.intermediate_pipe_buffer_used = 0;
if (pipe(state->transfer.intermediate_pipe) < 0) {
debug("%s: %s", "pipe()", strerror(errno));
state->transfer.intermediate_pipe[0] = -1;
state->transfer.intermediate_pipe[1] = -1;
} else {
state->transfer.intermediate_pipe_buffer_size = 64 * 1024;
#if defined F_SETPIPE_SZ && defined F_GETPIPE_SZ
{
size_t target_pipe_buffer_size = state->control.pipe_buffer_size;
int new_size;
/* If no pipe buffer size was set, try for 1MiB. */
if (0 == target_pipe_buffer_size)
target_pipe_buffer_size = 1024 * 1024;
/*
* Try to set the pipe buffer size, halving
* repeatedly on failure.
*/
new_size = -1;
while (new_size < 0 && target_pipe_buffer_size >= 4096) {
new_size =
fcntl(state->transfer.intermediate_pipe[1], F_SETPIPE_SZ,
(int) target_pipe_buffer_size);
if (new_size < 0)
target_pipe_buffer_size = target_pipe_buffer_size / 2;
}
/* If all attempts failed, read the current size. */
if (new_size < 0) {
new_size = fcntl(state->transfer.intermediate_pipe[1], F_GETPIPE_SZ);
/* If unable to read, assume 64KiB. */
if (new_size < 0) {
new_size = 64 * 1024;
}
}
state->transfer.intermediate_pipe_buffer_size = new_size;
}
#endif /* defined F_SETPIPE_SZ && defined F_GETPIPE_SZ */
}
debug("%s: [%d,%d]", "intermediate pipe fds", state->transfer.intermediate_pipe[0],
state->transfer.intermediate_pipe[1]);
debug("%s: %d", "intermediate pipe buffer size", state->transfer.intermediate_pipe_buffer_size);
}
#endif /* HAVE_SPLICE */
return fd;
}
/* EOF */
/*
* Return the name of the current file. The returned buffer may point to
* internal state and must not be passed to free() or used after "state" is
* freed.
*/
/*@keep@*/ const char *pv_current_file_name(pvstate_t state)
{
static char *str_none = NULL;
static char *str_stdin = NULL;
const char *input_file_name = NULL;
/*@-observertrans@ */
/*@-onlytrans@ */
/*@-statictrans@ */
/*
* The returned string could be an allocated string from the
* state->files.filename array, a constant string, or a returned
* string from gettext(). The documentation, above, explains that
* the returned string expires with the state.
*/
if (NULL == str_none)
str_none = _("(none)");
if (NULL == str_stdin)
str_stdin = _("(stdin)");
/* Fallback in case of translation failure. */
if (NULL == str_none)
str_none = "(none)";
if (NULL == str_stdin)
str_stdin = "(stdin)";
if (state->status.current_input_file < 0)
return str_none;
if ((unsigned int) (state->status.current_input_file) >= state->files.file_count)
return str_none;
if (NULL == state->files.filename) {
input_file_name = NULL;
} else {
input_file_name = state->files.filename[state->status.current_input_file];
}
if (NULL == input_file_name)
return str_none;
if (0 == strcmp(input_file_name, "-"))
return str_stdin;
/*@-compdef@ */
return input_file_name;
/*@+compdef@ */
/*
* splint warns about state->files.filename being undefined, but it
* has definitely been fully populated by the time this function is
* called.
*/
/*@+statictrans@ */
/*@+onlytrans@ */
/*@+observertrans@ */
}
/*
* Return a stream pointer, and populate the filename buffer, for a control
* file associated with a particular process ID, for the given signal
* number; it will be opened for writing if "sender" is true. Returns NULL
* on error.
*/
/*@null@ */
/*@dependent@ */
FILE *pv_open_controlfile(char *filename, size_t bufsize, pid_t control_pid, int signum, bool sender)
{
int open_flags, open_mode, control_fd;
/*@dependent@ */ FILE *control_fptr = NULL;
open_flags = O_RDONLY;
#ifdef O_NOFOLLOW
open_flags += O_NOFOLLOW;
#endif
if (sender)
open_flags = O_WRONLY | O_CREAT | O_EXCL;
open_mode = 0644;
(void) pv_snprintf(filename, bufsize, "/run/user/%lu/pv.remote.%d.%lu", (unsigned long) geteuid(), signum,
(unsigned long) control_pid);
control_fd = open(filename, open_flags, open_mode); /* flawfinder: ignore */
/*
* If /run/user/<uid> wasn't usable, try $HOME/.pv instead.
*/
if (control_fd < 0) {
char *home_dir;
home_dir = getenv("HOME"); /* flawfinder: ignore */
if (NULL == home_dir)
return NULL;
if ('\0' == home_dir[0])
return NULL;
/*
* flawfinder rationale: null and zero-size values are
* rejected, and the destination buffer is bounded.
*/
(void) pv_snprintf(filename, bufsize, "%s/.pv/remote.%d.%lu", home_dir, signum,
(unsigned long) control_pid);
control_fd = open(filename, open_flags, open_mode); /* flawfinder: ignore */
/*
* If the open failed, try creating the $HOME/.pv directory
* first.
*/
if (control_fd < 0) {
(void) pv_snprintf(filename, bufsize, "%s/.pv", home_dir);
(void) mkdir(filename, 0700);
/* In case of weird umask, explicitly chmod the dir. */
(void) chmod(filename, 0700); /* flawfinder: ignore */
(void) pv_snprintf(filename, bufsize, "%s/.pv/remote.%d.%lu", home_dir, signum,
(unsigned long) control_pid);
control_fd = open(filename, open_flags, open_mode); /* flawfinder: ignore */
}
}
/*
* flawfinder rationale: the files are in a directory whose parents
* cannot be manipulated, and the final component is not allowed to
* be a symbolic link. $HOME is checked for a NULL value, and the
* filename is bounded by pv_snprintf() so it can't overshoot the
* filename buffer. When chmod() is called on $HOME/.pv, an
* attacker is assumed to be unlikely to be able to manipulate
* $HOME's contents to make use of $HOME/.pv's mode of 700.
*/
if (control_fd < 0)
return NULL;
debug("%s: %s", "control filename", filename);
control_fptr = fdopen(control_fd, sender ? "wb" : "rb");
return control_fptr;
}
+44
View File
@@ -0,0 +1,44 @@
/*
* Formatter function for average rate.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Average transfer rate.
*/
pvdisplay_bytecount_t pv_formatter_average_rate(pvformatter_args_t args)
{
char content[128]; /* flawfinder: ignore - always bounded */
content[0] = '\0';
if (0 == args->buffer_size)
return 0;
/*@-mustfreefresh@ */
if (args->control->numeric) {
/* Numeric - raw value without suffix. */
(void) pv_snprintf(content, sizeof(content),
"%.4Lf", ((args->control->bits ? 8.0 : 1.0) * args->calc->average_rate));
} else if (args->control->bits && !args->control->linemode) {
/* Bits per second. */
pv_describe_amount(content, sizeof(content),
"(%s)", 8 * args->calc->average_rate, "", _("b/s"), args->display->count_type);
} else {
/* Bytes or lines per second. */
pv_describe_amount(content,
sizeof(content), "(%s)", args->calc->average_rate, _("/s"), _("B/s"),
args->display->count_type);
}
/*@+mustfreefresh@ *//* splint - false positive from gettext(). */
return pv_formatter_segmentcontent(content, args);
}
+204
View File
@@ -0,0 +1,204 @@
/*
* Formatter functions for styled progress bars.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <string.h>
#if defined(ENABLE_NLS) && defined(HAVE_WCHAR_H)
#include <wchar.h>
#if defined(HAVE_WCTYPE_H)
#include <wctype.h>
#endif
#endif
/*
* Populate "style" with the named bar style, falling back to plain if the
* name was not recognised. Returns true if the named style was found.
*
* Note that strings are copied into the structure, rather than just
* updating pointers, to maintain separation of concern between different
* parts of the code - and because on 64-bit architectures, the sizes of the
* data types and their associated alignment padding tend to outweigh the
* memory savings from using pointers and shared strings.
*/
static bool pv_barstyle(pvformatter_args_t args, pvbarstyle_t style, const char *name)
{
#define populate_string(item, str, w) { \
item.width = w; \
item.bytes = strlen(str); /* flawfinder: ignore */ \
if (item.bytes > 0 && item.bytes <= PV_BARSTYLE_SIZEOF_STRING) \
memcpy(item.string, str, item.bytes); /* flawfinder: ignore */ \
}
/*
* flawfinder - strlen() on null-terminated static strings is OK,
* and with the memcpy(), the buffer size has been checked.
*/
memset(style, 0, sizeof(*style));
if (args->status->terminal_supports_utf8 && 0 == strcmp(name, "block")) {
style->style_id = 2;
populate_string(style->indicator, "◀▶", 2);
populate_string(style->tip, "", 0);
populate_string(style->filler[0], " ", 1);
populate_string(style->filler[1], "", 1);
style->filler_entries = 2;
return true;
} else if (args->status->terminal_supports_utf8 && 0 == strcmp(name, "granular")) {
style->style_id = 3;
populate_string(style->indicator, "◀▶", 2);
populate_string(style->tip, "", 0);
populate_string(style->filler[0], " ", 1);
populate_string(style->filler[1], "", 1);
populate_string(style->filler[2], "", 1);
populate_string(style->filler[3], "", 1);
populate_string(style->filler[4], "", 1);
populate_string(style->filler[5], "", 1);
populate_string(style->filler[6], "", 1);
populate_string(style->filler[7], "", 1);
populate_string(style->filler[8], "", 1);
style->filler_entries = 9;
return true;
} else if (args->status->terminal_supports_utf8 && 0 == strcmp(name, "shaded")) {
style->style_id = 4;
populate_string(style->indicator, "▒▓▒", 3);
populate_string(style->tip, "", 0);
populate_string(style->filler[0], "", 1);
populate_string(style->filler[1], "", 1);
populate_string(style->filler[2], "", 1);
populate_string(style->filler[3], "", 1);
style->filler_entries = 4;
return true;
}
/* Default plain style. */
style->style_id = 1;
populate_string(style->indicator, "<=>", 3);
populate_string(style->tip, ">", 1);
populate_string(style->filler[0], " ", 1);
populate_string(style->filler[1], "=", 1);
style->filler_entries = 2;
if (0 == strcmp(name, "plain"))
return true;
return false;
}
/*
* Return the index into args->display->barstyle for the style with the
* given name, adding that style to the array if it's not there already and
* there's room.
*
* If there is no room, returns zero, so the first style is re-used.
*/
int8_t pv_display_barstyle_index(pvformatter_args_t args, const char *name)
{
struct pvbarstyle_s style;
int8_t barstyle_index;
#ifdef ENABLE_DEBUGGING
bool found;
#endif
memset(&style, 0, sizeof(style));
#ifdef ENABLE_DEBUGGING
found = pv_barstyle(args, &style, name);
if (!found)
debug("%s: %s", name, "bar style not found, using plain");
#else
(void) pv_barstyle(args, &style, name);
#endif
for (barstyle_index = 0;
barstyle_index < PV_BARSTYLE_MAX && args->display->barstyle[barstyle_index].style_id > 0;
barstyle_index++) {
if (args->display->barstyle[barstyle_index].style_id == style.style_id) {
debug("%s: %s: %d", name, "found in bar style array", barstyle_index);
return barstyle_index;
}
}
if (barstyle_index >= PV_BARSTYLE_MAX) {
debug("%s: %s", name, "no room to add another bar style - returning 0");
return 0;
}
memcpy(&(args->display->barstyle[barstyle_index]), &style, sizeof(style)); /* flawfinder: ignore */
/* flawfinder - the destination is an array element of the right size. */
debug("%s: %s: %d", name, "added to bar style array", barstyle_index);
return barstyle_index;
}
pvdisplay_bytecount_t pv_formatter_bar_default(pvformatter_args_t args)
{
if (0 == args->segment->parameter) {
const char *default_name;
default_name = args->control->default_bar_style;
/*@-branchstate@ */
if (NULL == default_name)
default_name = "plain";
/*@+branchstate@ */
/* splint - it doesn't matter that default_name may be static. */
args->segment->parameter = 1 + pv_display_barstyle_index(args, default_name);
}
return pv_formatter_progress_bar_only(args);
}
pvdisplay_bytecount_t pv_formatter_bar_plain(pvformatter_args_t args)
{
if (0 == args->segment->parameter)
args->segment->parameter = 1 + pv_display_barstyle_index(args, "plain");
return pv_formatter_progress_bar_only(args);
}
pvdisplay_bytecount_t pv_formatter_bar_block(pvformatter_args_t args)
{
if (0 == args->segment->parameter)
args->segment->parameter = 1 + pv_display_barstyle_index(args, "block");
return pv_formatter_progress_bar_only(args);
}
pvdisplay_bytecount_t pv_formatter_bar_granular(pvformatter_args_t args)
{
if (0 == args->segment->parameter)
args->segment->parameter = 1 + pv_display_barstyle_index(args, "granular");
return pv_formatter_progress_bar_only(args);
}
pvdisplay_bytecount_t pv_formatter_bar_shaded(pvformatter_args_t args)
{
if (0 == args->segment->parameter)
args->segment->parameter = 1 + pv_display_barstyle_index(args, "shaded");
return pv_formatter_progress_bar_only(args);
}
+51
View File
@@ -0,0 +1,51 @@
/*
* Formatter function for transfer buffer percentage utilisation.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Percentage transfer buffer utilisation.
*/
pvdisplay_bytecount_t pv_formatter_buffer_percent(pvformatter_args_t args)
{
char content[16]; /* flawfinder: ignore - always bounded */
content[0] = '\0';
if (0 == args->buffer_size)
return 0;
if (args->transfer->buffer_size > 0) {
double pct_used = pv_percentage((off_t)
(args->transfer->read_position - args->transfer->write_position),
(off_t)
(args->transfer->buffer_size));
(void) pv_snprintf(content, sizeof(content), "{%3.0f%%}", pct_used);
}
switch (args->transfer->method) {
case PV_TRANSFERMETHOD_READWRITE:
break;
case PV_TRANSFERMETHOD_SPLICE:
(void) pv_snprintf(content, sizeof(content), "{%s}", "----");
break;
case PV_TRANSFERMETHOD_SPLICE_INTERMEDIATE:
(void) pv_snprintf(content, sizeof(content), "{%s}", "-||-");
break;
case PV_TRANSFERMETHOD_COPY_FILE_RANGE:
(void) pv_snprintf(content, sizeof(content), "{%s}", "--->");
break;
case PV_TRANSFERMETHOD__UNSET:
(void) pv_snprintf(content, sizeof(content), "{%s}", "????");
break;
}
return pv_formatter_segmentcontent(content, args);
}
+44
View File
@@ -0,0 +1,44 @@
/*
* Formatter function for bytes or lines transferred.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Number of bytes or lines transferred.
*/
pvdisplay_bytecount_t pv_formatter_bytes(pvformatter_args_t args)
{
char content[128]; /* flawfinder: ignore - always bounded */
args->display->showing_bytes = true;
if (0 == args->buffer_size)
return 0;
content[0] = '\0';
/*@-mustfreefresh@ */
if (args->control->numeric) {
/* Numeric mode - raw values only, no suffix. */
(void) pv_snprintf(content, sizeof(content),
"%lld", (long long) ((args->control->bits ? 8 : 1) * args->transfer->transferred));
} else if (args->control->bits && !args->control->linemode) {
pv_describe_amount(content, sizeof(content), "%s",
(long double) (args->transfer->transferred * 8), "", _("b"),
args->display->count_type);
} else {
pv_describe_amount(content, sizeof(content), "%s",
(long double) (args->transfer->transferred), "", _("B"), args->display->count_type);
}
/*@+mustfreefresh@ *//* splint - false positive from gettext(). */
return pv_formatter_segmentcontent(content, args);
}
+83
View File
@@ -0,0 +1,83 @@
/*
* Formatter function for ETA display.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <limits.h>
/*
* Estimated time until completion.
*/
pvdisplay_bytecount_t pv_formatter_eta(pvformatter_args_t args)
{
char content[128]; /* flawfinder: ignore - bounded in pv_snprintf(). */
long eta, max_days;
content[0] = '\0';
/*
* Don't try to calculate this if the size is not known.
*/
if (args->control->size < 1)
return 0;
if (0 == args->buffer_size)
return 0;
eta =
pv_seconds_remaining((args->transfer->transferred - args->display->initial_offset),
args->control->size - args->display->initial_offset, args->calc->current_avg_rate);
/* The ETA must always be positive. */
if (eta < 0)
eta = 0;
/* The ETA must be under 1,000,000 days so it's not too wide. */
/* If a "long" is 32 bits, only 24,855 days will fit in it. */
max_days = 24855L;
#ifdef LONG_MAX
if (LONG_MAX > 2147483647L)
max_days = 1000000;
#endif
if ((eta / 86400L) >= max_days)
eta = max_days * 86400L - 1L;
/*
* If the ETA is more than a day, include a day count as well as
* hours, minutes, and seconds.
*/
/*@-mustfreefresh@ */
if (eta > 86400L) {
(void) pv_snprintf(content,
sizeof(content),
"%.16s %ld:%02ld:%02ld:%02ld",
_("ETA"), eta / 86400, (eta / 3600) % 24, (eta / 60) % 60, eta % 60);
} else {
(void) pv_snprintf(content,
sizeof(content),
"%.16s %ld:%02ld:%02ld", _("ETA"), eta / 3600, (eta / 60) % 60, eta % 60);
}
/*@+mustfreefresh@ *//* splint: false positives from gettext(). */
/*
* If this is the final update, show a blank space where the ETA
* used to be.
*/
if (args->display->final_update) {
size_t erase_idx;
for (erase_idx = 0; erase_idx < sizeof(content) && content[erase_idx] != '\0'; erase_idx++) {
content[erase_idx] = ' ';
}
}
return pv_formatter_segmentcontent(content, args);
}
+108
View File
@@ -0,0 +1,108 @@
/*
* Formatter function for the local time at which the transfer is expected
* to complete.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <string.h>
#include <time.h>
#include <limits.h>
/*
* Estimated local time of completion.
*/
pvdisplay_bytecount_t pv_formatter_fineta(pvformatter_args_t args)
{
char content[128]; /* flawfinder: ignore - bounded by strftime(). */
time_t now, then;
const struct tm *time_ptr;
long eta, max_years;
const char *time_format;
bool show_fineta;
content[0] = '\0';
/*
* Don't try to calculate this if the size is not known.
*/
if (args->control->size < 1)
return 0;
if (0 == args->buffer_size)
return 0;
now = time(NULL);
show_fineta = true;
time_format = NULL;
/*
* Note that the completion clock time may be hidden by a failed
* localtime lookup.
*/
eta = pv_seconds_remaining(args->transfer->transferred - args->display->initial_offset,
args->control->size - args->display->initial_offset, args->calc->current_avg_rate);
/* The ETA must always be positive. */
if (eta < 0)
eta = 0;
/* Clamp the ETA to 7,000 years max so the date isn't too wide. */
/* If a "long" is 32 bits, only 68 years will fit in it. */
max_years = 68;
#ifdef LONG_MAX
if (LONG_MAX > 2147483647L)
max_years = 7000;
#endif
if ((eta / 31536000L) > max_years)
eta = 31536000L * max_years;
/*
* Only include the date if the ETA is more than 6 hours
* away.
*/
if (eta > (long) (6 * 3600)) {
time_format = "%Y-%m-%d %H:%M:%S";
} else {
time_format = "%H:%M:%S";
}
then = now + eta;
time_ptr = localtime(&then);
if (NULL == time_ptr) {
show_fineta = false;
} else {
/*
* The localtime() function keeps data stored in a static
* buffer that gets overwritten by time functions.
*/
struct tm time = *time_ptr;
size_t content_bytes;
/*@-mustfreefresh@ */
(void) pv_snprintf(content, sizeof(content), "%.16s ", _("FIN"));
/*@+mustfreefresh@ *//* splint: false positive from gettext(). */
content_bytes = strlen(content); /* flawfinder: ignore */
/* flawfinder: always bounded with \0 by pv_snprintf(). */
(void) strftime(content + content_bytes, sizeof(content) - 1 - content_bytes, time_format, &time);
}
if (!show_fineta) {
size_t erase_idx;
for (erase_idx = 0; erase_idx < sizeof(content) && content[erase_idx] != '\0'; erase_idx++) {
content[erase_idx] = ' ';
}
}
return pv_formatter_segmentcontent(content, args);
}
+54
View File
@@ -0,0 +1,54 @@
/*
* Formatter function for showing the last bytes written.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Display the last few bytes written.
*
* As a side effect, this sets args->display->lastwritten_bytes to
* the segment's chosen_size, if it was previously smaller than that.
*/
pvdisplay_bytecount_t pv_formatter_last_written(pvformatter_args_t args)
{
pvdisplay_bytecount_t bytes_to_show, read_offset, write_offset, remaining;
args->display->showing_last_written = true;
bytes_to_show = args->segment->chosen_size;
if (0 == bytes_to_show)
bytes_to_show = args->segment->width;
if (0 == bytes_to_show)
return 0;
if (bytes_to_show > PV_SIZEOF_LASTWRITTEN_BUFFER)
bytes_to_show = PV_SIZEOF_LASTWRITTEN_BUFFER;
if (bytes_to_show > args->display->lastwritten_bytes)
args->display->lastwritten_bytes = bytes_to_show;
if (0 == args->buffer_size)
return 0;
if (args->offset + bytes_to_show >= args->buffer_size)
return 0;
args->segment->offset = args->offset;
args->segment->bytes = bytes_to_show;
read_offset = args->display->lastwritten_bytes - bytes_to_show;
write_offset = args->offset;
for (remaining = bytes_to_show; remaining > 0; remaining--) {
char display_char = args->display->lastwritten_buffer[read_offset++];
args->buffer[write_offset++] = pv_isprint(display_char) ? display_char : '.';
}
return bytes_to_show;
}
+43
View File
@@ -0,0 +1,43 @@
/*
* Formatter function for showing the name of the transfer.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <string.h>
/*
* Display the transfer's name.
*/
pvdisplay_bytecount_t pv_formatter_name(pvformatter_args_t args)
{
char string_format[32]; /* flawfinder: ignore - always bounded */
char content[512]; /* flawfinder: ignore - always bounded */
pvdisplay_bytecount_t field_width;
if (0 == args->buffer_size)
return 0;
field_width = args->segment->chosen_size;
if (field_width < 1)
field_width = 9;
if (field_width > 500)
field_width = 500;
memset(string_format, 0, sizeof(string_format));
(void) pv_snprintf(string_format, sizeof(string_format), "%%%d.500s:", field_width);
content[0] = '\0';
if (NULL != args->control->name) {
(void) pv_snprintf(content, sizeof(content), string_format, args->control->name);
}
return pv_formatter_segmentcontent(content, args);
}
+49
View File
@@ -0,0 +1,49 @@
/*
* Formatter function for the most recently written line.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Display the previously written line.
*/
pvdisplay_bytecount_t pv_formatter_previous_line(pvformatter_args_t args)
{
pvdisplay_bytecount_t bytes_to_show, read_offset, write_offset, remaining;
args->display->showing_previous_line = true;
if (0 == args->buffer_size)
return 0;
bytes_to_show = args->segment->chosen_size;
if (0 == bytes_to_show)
bytes_to_show = args->segment->width;
if (0 == bytes_to_show)
return 0;
if (bytes_to_show > PV_SIZEOF_PREVLINE_BUFFER)
bytes_to_show = PV_SIZEOF_PREVLINE_BUFFER;
if (args->offset + bytes_to_show >= args->buffer_size)
return 0;
args->segment->offset = args->offset;
args->segment->bytes = bytes_to_show;
read_offset = 0;
write_offset = args->offset;
for (remaining = bytes_to_show; remaining > 0; remaining--) {
char display_char = args->display->previous_line[read_offset++];
args->buffer[write_offset++] = pv_isprint(display_char) ? display_char : ' ';
}
return bytes_to_show;
}
+410
View File
@@ -0,0 +1,410 @@
/*
* Formatter functions for progress bars.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <string.h>
#if HAVE_MATH_H
#include <math.h>
#endif
/* Convenience macro for appending a string to the buffer. */
#define append_to_buffer(x) { \
if (buffer_offset < (buffer_size - x.bytes)) { \
memcpy(&(buffer[buffer_offset]), x.string, x.bytes); /* flawfinder: ignore */ \
buffer_offset += x.bytes; \
} \
}
/*
* flawfinder - the byte count and offset are checked against the buffer
* size before memcpy() is called.
*/
/*
* Write a progress bar to a buffer, in known-size or rate-gauge mode - a
* bar, and a percentage (size) or max rate (gauge). The total width of the
* content is bounded to the given width. Returns the number of bytes
* written to the buffer.
*
* If "bar_sides" is false, only the bar itself is rendered, not the opening
* and closing characters.
*
* If "include_bar" is false, the bar is omitted entirely.
*
* If "include_amount" is false, the percentage or rate after the bar is
* omitted.
*
* This is only called by pv_formatter_progress().
*/
static pvdisplay_bytecount_t pv_formatter_progress_knownsize(pvformatter_args_t args, char *buffer,
pvdisplay_bytecount_t buffer_size, bool bar_sides,
bool include_bar, bool include_amount)
{
char after_bar[32]; /* flawfinder: ignore - only populated by pv_snprintf(). */
pvdisplay_bytecount_t after_bar_bytes, buffer_offset;
pvdisplay_width_t after_bar_width;
pvdisplay_width_t bar_area_width, filled_bar_width, pad_count;
double bar_percentage;
pvbarstyle_t style;
pvdisplay_bytecount_t full_cell_index;
bool has_tip = false;
buffer[0] = '\0';
if (args->segment->parameter > 0 && args->segment->parameter <= PV_BARSTYLE_MAX) {
style = &(args->display->barstyle[args->segment->parameter - 1]);
} else {
style = &(args->display->barstyle[0]);
}
full_cell_index = style->filler_entries;
if (full_cell_index > 0)
full_cell_index--;
if (1 == full_cell_index && style->tip.width > 0)
has_tip = true;
memset(after_bar, 0, sizeof(after_bar));
if (args->control->size > 0) {
/* Percentage of data transferred. */
bar_percentage = (double) (args->calc->percentage);
(void) pv_snprintf(after_bar, sizeof(after_bar), " %3ld%%", (int) bar_percentage);
} else {
/* Current rate vs max rate. */
bar_percentage = 0.0;
if (args->calc->rate_max > 0) {
bar_percentage = (double) (100.0 * args->calc->transfer_rate / args->calc->rate_max);
}
/*@-mustfreefresh@ */
if (args->control->bits && !args->control->linemode) {
/* Bits per second. */
pv_describe_amount(after_bar, sizeof(after_bar), "/%s",
8.0 * args->calc->rate_max, "", _("b/s"), args->display->count_type);
} else {
/* Bytes or lines per second. */
pv_describe_amount(after_bar, sizeof(after_bar),
"/%s", args->calc->rate_max, _("/s"), _("B/s"), args->display->count_type);
}
/*@+mustfreefresh@ *//* splint: false positives from gettext(). */
}
if (!include_amount)
after_bar[0] = '\0';
after_bar_bytes = strlen(after_bar); /* flawfinder: ignore */
/* flawfinder: always \0-terminated by pv_snprintf() and the earlier memset(). */
after_bar_width = pv_strwidth(after_bar, after_bar_bytes);
if (!include_bar) {
/*
* Only returning the "after bar" portion - the amount
* (progress or max rate).
*/
if (buffer_size < after_bar_bytes)
return 0;
if (after_bar_bytes > 1) {
/* NB skip the leading space. */
memmove(buffer, after_bar + 1, after_bar_bytes - 1);
buffer[after_bar_bytes - 1] = '\0';
return after_bar_bytes - 1;
}
return 0;
}
if (bar_sides) {
if (args->segment->width < (after_bar_width + 2))
return 0;
bar_area_width = args->segment->width - after_bar_width - 2;
} else {
if (args->segment->width < after_bar_width)
return 0;
bar_area_width = args->segment->width - after_bar_width;
}
filled_bar_width = (pvdisplay_width_t) ((bar_area_width * bar_percentage) / 100);
/* Leave room for the tip of the bar. */
if (has_tip && filled_bar_width > 0)
filled_bar_width -= style->tip.width;
debug("percentage=%.2f width=%d bar_area_width=%d filled_bar_width=%d after_bar_width=%d", bar_percentage,
args->segment->width, bar_area_width, filled_bar_width, after_bar_width);
buffer_offset = 0;
if (bar_sides) {
/* The opening of the bar area. */
buffer[buffer_offset++] = '[';
}
/* The bar portion. */
pad_count = 0;
while (pad_count < filled_bar_width && pad_count < bar_area_width) {
append_to_buffer(style->filler[full_cell_index]);
pad_count += style->filler[full_cell_index].width;
if (0 == style->filler[full_cell_index].width)
pad_count++;
}
/* The tip of the bar, if not at 100%. */
if (has_tip && pad_count < bar_area_width) {
append_to_buffer(style->tip);
pad_count += style->tip.width;
}
/* A partial cell, if below 100% and there are intermediates. */
if (pad_count < bar_area_width && full_cell_index > 1 && !has_tip) {
double exact_width = (((double) bar_area_width) * bar_percentage) / 100.0;
double cell_portion = exact_width - (double) filled_bar_width;
double cell_index_double = ((double) full_cell_index) * cell_portion;
size_t cell_index = (size_t) cell_index_double;
if (cell_index > full_cell_index)
cell_index = full_cell_index;
append_to_buffer(style->filler[cell_index]);
pad_count += style->filler[cell_index].width;
if (0 == style->filler[cell_index].width)
pad_count++;
}
/* The spaces after the bar. */
while (pad_count < bar_area_width) {
append_to_buffer(style->filler[0]);
pad_count += style->filler[0].width;
if (0 == style->filler[0].width)
pad_count++;
}
if (bar_sides) {
/* The closure of the bar area. */
if (buffer_offset < buffer_size - 1)
buffer[buffer_offset++] = ']';
}
/* The percentage. */
if (after_bar_bytes > 0 && after_bar_bytes < (buffer_size - 1 - buffer_offset)) {
memmove(buffer + buffer_offset, after_bar, after_bar_bytes);
buffer_offset += after_bar_bytes;
}
buffer[buffer_offset] = '\0';
return buffer_offset;
}
/*
* Write a progress bar to a buffer, in unknown-size mode - just a moving
* indicator. The total width of the content is bounded to the given width.
* Returns the number of bytes written to the buffer.
*
* If "bar_sides" is false, only the bar itself is rendered, not the opening
* and closing characters.
*
* This is only called by pv_formatter_progress().
*/
static pvdisplay_bytecount_t pv_formatter_progress_unknownsize(pvformatter_args_t args, char *buffer,
pvdisplay_bytecount_t buffer_size, bool bar_sides)
{
pvdisplay_bytecount_t buffer_offset;
pvdisplay_width_t bar_area_width, pad_count;
double indicator_position, padding_width;
pvbarstyle_t style;
buffer[0] = '\0';
if (args->segment->parameter > 0 && args->segment->parameter <= PV_BARSTYLE_MAX) {
style = &(args->display->barstyle[args->segment->parameter - 1]);
} else {
style = &(args->display->barstyle[0]);
}
if (bar_sides) {
if (args->segment->width < (style->indicator.width + 3))
return 0;
bar_area_width = args->segment->width - (style->indicator.width + 2);
} else {
if (args->segment->width < (style->indicator.width + 2))
return 0;
bar_area_width = args->segment->width - style->indicator.width;
}
/*
* Note that pv_calculate_transfer_rate() sets the percentage when
* the size is unknown to a value that goes 0 - 200 and resets, so
* here this is used make values above 100 send the indicator back
* down again, so it moves back and forth.
*/
indicator_position = args->calc->percentage;
if (indicator_position > 200.0)
#if HAVE_FMOD
indicator_position = fmod(indicator_position, 200.0);
#else
{
while (indicator_position > 200.0)
indicator_position -= 200.0;
}
#endif
if (indicator_position > 100.0)
indicator_position = 200.0 - indicator_position;
if (indicator_position < 0.0)
indicator_position = 0.0;
buffer_offset = 0;
if (bar_sides) {
/* The opening of the bar area. */
buffer[buffer_offset++] = '[';
}
/* The spaces before the indicator. */
pad_count = 0;
padding_width = (((double) bar_area_width) * indicator_position) / 100.0;
while (pad_count < bar_area_width && pad_count < (pvdisplay_width_t) padding_width) {
append_to_buffer(style->filler[0]);
pad_count += style->filler[0].width;
if (0 == style->filler[0].width)
pad_count++;
}
/* The indicator. */
if (buffer_offset < buffer_size - style->indicator.bytes) {
append_to_buffer(style->indicator);
}
/* The spaces after the indicator. */
while (pad_count < bar_area_width) {
append_to_buffer(style->filler[0]);
pad_count += style->filler[0].width;
if (0 == style->filler[0].width)
pad_count++;
}
if (bar_sides) {
/* The closure of the bar area. */
if (buffer_offset < buffer_size - 1)
buffer[buffer_offset++] = ']';
}
buffer[buffer_offset] = '\0';
return buffer_offset;
}
/*
* Progress bar.
*/
pvdisplay_bytecount_t pv_formatter_progress(pvformatter_args_t args)
{
char content[4096]; /* flawfinder: ignore - always bounded */
pvdisplay_bytecount_t bytes;
content[0] = '\0';
if (0 == args->segment->parameter) {
const char *default_name;
default_name = args->control->default_bar_style;
/*@-branchstate@ */
if (NULL == default_name)
default_name = "plain";
/*@+branchstate@ */
/* splint - it doesn't matter that default_name may be static. */
args->segment->parameter = 1 + pv_display_barstyle_index(args, default_name);
}
if (0 == args->buffer_size)
return 0;
if (args->control->size > 0 || args->control->rate_gauge) {
/* Known size or rate gauge - bar with percentage. */
bytes = pv_formatter_progress_knownsize(args, content, sizeof(content), true, true, true);
} else {
/* Unknown size - back-and-forth moving indicator. */
bytes = pv_formatter_progress_unknownsize(args, content, sizeof(content), true);
}
content[bytes] = '\0';
return pv_formatter_segmentcontent(content, args);
}
/*
* Progress bar, without sides and without a number afterwards.
*/
pvdisplay_bytecount_t pv_formatter_progress_bar_only(pvformatter_args_t args)
{
char content[4096]; /* flawfinder: ignore - always bounded */
pvdisplay_bytecount_t bytes;
content[0] = '\0';
if (0 == args->segment->parameter) {
const char *default_name;
default_name = args->control->default_bar_style;
/*@-branchstate@ */
if (NULL == default_name)
default_name = "plain";
/*@+branchstate@ */
/* splint - it doesn't matter that default_name may be static. */
args->segment->parameter = 1 + pv_display_barstyle_index(args, default_name);
}
if (0 == args->buffer_size)
return 0;
if (args->control->size > 0 || args->control->rate_gauge) {
/* Known size or rate gauge - bar with percentage. */
bytes = pv_formatter_progress_knownsize(args, content, sizeof(content), false, true, false);
} else {
/* Unknown size - back-and-forth moving indicator. */
bytes = pv_formatter_progress_unknownsize(args, content, sizeof(content), false);
}
content[bytes] = '\0';
return pv_formatter_segmentcontent(content, args);
}
/*
* The number after the progress bar.
*/
pvdisplay_bytecount_t pv_formatter_progress_amount_only(pvformatter_args_t args)
{
char content[256]; /* flawfinder: ignore - always bounded */
pvdisplay_bytecount_t bytes;
memset(content, 0, sizeof(content));
if (0 == args->buffer_size)
return 0;
if (args->control->numeric) {
/* Numeric mode - percentage as a rounded integer with no suffix. */
(void) pv_snprintf(content, sizeof(content), "%.0f", args->calc->percentage);
bytes = strlen(content); /* flawfinder: ignore */
/* flawfinder: always \0-terminated by pv_snprintf() and the earlier memset(). */
} else if (args->control->size > 0 || args->control->rate_gauge) {
/* Known size or rate gauge - percentage or rate. */
bytes = pv_formatter_progress_knownsize(args, content, sizeof(content), false, false, true);
} else {
/* Unknown size - no number. */
return 0;
}
content[bytes] = '\0';
return pv_formatter_segmentcontent(content, args);
}
+45
View File
@@ -0,0 +1,45 @@
/*
* Formatter function for the current rate of transfer.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Transfer rate.
*/
pvdisplay_bytecount_t pv_formatter_rate(pvformatter_args_t args)
{
char content[128]; /* flawfinder: ignore - always bounded */
args->display->showing_rate = true;
content[0] = '\0';
if (0 == args->buffer_size)
return 0;
/*@-mustfreefresh@ */
if (args->control->numeric) {
/* Numeric - raw value without suffix. */
(void) pv_snprintf(content, sizeof(content),
"%.4Lf", ((args->control->bits ? 8.0 : 1.0) * args->calc->transfer_rate));
} else if (args->control->bits && !args->control->linemode) {
/* Bits per second. */
pv_describe_amount(content, sizeof(content), "[%s]",
8 * args->calc->transfer_rate, "", _("b/s"), args->display->count_type);
} else {
/* Bytes or lines per second. */
pv_describe_amount(content, sizeof(content),
"[%s]", args->calc->transfer_rate, _("/s"), _("B/s"), args->display->count_type);
}
/*@+mustfreefresh@ *//* splint - false positives from gettext(). */
return pv_formatter_segmentcontent(content, args);
}
+50
View File
@@ -0,0 +1,50 @@
/*
* Formatter function for ratio of bytes transferred by the other monitored
* side to bytes transferred by this side.
*
* Copyright 2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Ratio of bytes or lines transferred by the other monitored side ("-M
* both") to the bytes or lines transferred by this side.
*/
pvdisplay_bytecount_t pv_formatter_ratio(pvformatter_args_t args)
{
char content[128]; /* flawfinder: ignore - always bounded */
args->display->showing_ratio = true;
if (0 == args->buffer_size)
return 0;
content[0] = '\0';
if (0 == args->transfer->otherside_transferred || 0 == args->transfer->transferred) {
(void) pv_snprintf(content, sizeof(content), "%s:%s", "-", "-");
} else if (args->transfer->otherside_transferred == args->transfer->transferred) {
(void) pv_snprintf(content, sizeof(content), "%d:%d", 1, 1);
} else {
long double side1, side2, ratio;
side1 = (long double) (args->transfer->otherside_transferred);
side2 = (long double) (args->transfer->transferred);
if (side1 > side2) {
ratio = side1 / side2;
(void) pv_snprintf(content, sizeof(content), "%.4Lg:%d", ratio, 1);
} else {
ratio = side2 / side1;
(void) pv_snprintf(content, sizeof(content), "%d:%.4Lg", 1, ratio);
}
}
return pv_formatter_segmentcontent(content, args);
}
+218
View File
@@ -0,0 +1,218 @@
/*
* Formatter function for ECMA-48 SGR codes.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <string.h>
struct sgr_keyword_map_s {
/*@null@ */ const char *keyword;
uint8_t bytes;
uint8_t code;
};
/*
* Return an array mapping keywords to ECMA-48 SGR code numbers.
*/
/*@keep@ */ static struct sgr_keyword_map_s *sgr_keywords(void)
{
/*@keep@ */ static struct sgr_keyword_map_s keywords[] = {
{ "reset", 0, 0 },
{ "none", 0, 0 },
{ "bold", 0, 1 },
{ "dim", 0, 2 },
{ "italic", 0, 3 },
{ "underscore", 0, 4 },
{ "underline", 0, 4 },
{ "blink", 0, 5 },
{ "reverse", 0, 7 },
{ "no-bold", 0, 22 }, /* same as no-dim */
{ "no-dim", 0, 22 },
{ "no-italic", 0, 23 },
{ "no-underscore", 0, 24 },
{ "no-underline", 0, 24 },
{ "no-blink", 0, 25 },
{ "no-reverse", 0, 27 },
{ "black", 0, 30 },
{ "red", 0, 31 },
{ "green", 0, 32 },
{ "brown", 0, 33 },
{ "yellow", 0, 33 },
{ "blue", 0, 34 },
{ "magenta", 0, 35 },
{ "cyan", 0, 36 },
{ "white", 0, 37 },
{ "fg-black", 0, 30 },
{ "fg-red", 0, 31 },
{ "fg-green", 0, 32 },
{ "fg-brown", 0, 33 },
{ "fg-yellow", 0, 33 },
{ "fg-blue", 0, 34 },
{ "fg-magenta", 0, 35 },
{ "fg-cyan", 0, 36 },
{ "fg-white", 0, 37 },
{ "fg-default", 0, 39 },
{ "bg-black", 0, 40 },
{ "bg-red", 0, 41 },
{ "bg-green", 0, 42 },
{ "bg-brown", 0, 43 },
{ "bg-yellow", 0, 43 },
{ "bg-blue", 0, 44 },
{ "bg-magenta", 0, 45 },
{ "bg-cyan", 0, 46 },
{ "bg-white", 0, 47 },
{ "bg-default", 0, 49 },
{ NULL, 0, 0 }
};
/* Calculate the lengths of each keyword on the first call. */
if (0 == keywords[0].bytes) {
int keyword_index;
for (keyword_index = 0; NULL != keywords[keyword_index].keyword; keyword_index++) {
keywords[keyword_index].bytes = strlen(keywords[keyword_index].keyword); /* flawfinder: ignore */
/* flawfinder - strlen() on a static null-terminated string is OK. */
}
}
/*@-compmempass@ */
return keywords;
/*@+compmempass@ */
/*
* splint - no other way to pass static back without a false
* positive warning about a memory leak.
*/
}
/*
* Display SGR codes if colour output is supported.
*/
pvdisplay_bytecount_t pv_formatter_sgr(pvformatter_args_t args)
{
/*@keep@ */ static struct sgr_keyword_map_s *keywords;
char content[1024]; /* flawfinder: ignore */
size_t content_buffer_size = sizeof(content);
pvdisplay_bytecount_t write_position, read_position, keyword_start, keyword_length;
int numeric_value, code_count, most_recent_code;
/* flawfinder - null-terminated and bounded with pv_snprintf(). */
if (!args->display->colour_permitted)
return 0;
args->display->format_uses_colour = true;
if (!args->status->terminal_supports_colour)
return 0;
if (NULL == args->segment->string_parameter)
return 0;
if (0 == args->segment->string_parameter_bytes)
return 0;
keywords = sgr_keywords();
write_position = 0;
content[0] = '\0';
debug("%p+%d [%.*s]", args->segment->string_parameter, args->segment->string_parameter_bytes,
args->segment->string_parameter_bytes, args->segment->string_parameter);
read_position = 0;
keyword_start = 0;
keyword_length = 0;
numeric_value = -1;
code_count = 0;
most_recent_code = -1;
while (read_position < args->segment->string_parameter_bytes) {
char read_char = args->segment->string_parameter[read_position++];
if ((',' == read_char) || (';' == read_char)) {
keyword_length = read_position - keyword_start;
if (keyword_length > 0)
keyword_length--;
} else {
if ((read_char >= '0' && read_char <= '9')
&& (numeric_value >= 0 || keyword_start == read_position - 1)) {
if (keyword_start == read_position - 1)
numeric_value = 0;
numeric_value = numeric_value * 10 + (int) (read_char - '0');
} else {
numeric_value = -1;
}
if (read_position >= args->segment->string_parameter_bytes) {
keyword_length = read_position - keyword_start;
}
}
if (keyword_length > 0) {
int code = -1;
debug("keyword@%d+%d: [%.*s]; numeric=%d", keyword_start, keyword_length, keyword_length,
&(args->segment->string_parameter[keyword_start]), numeric_value);
if (numeric_value >= 0 && numeric_value < 255) {
code = numeric_value;
} else {
int keyword_index;
for (keyword_index = 0; -1 == code && NULL != keywords[keyword_index].keyword;
keyword_index++) {
if (keyword_length != keywords[keyword_index].bytes)
continue;
if (0 !=
strncmp(keywords[keyword_index].keyword,
&(args->segment->string_parameter[keyword_start]), keyword_length))
continue;
code = (int) (keywords[keyword_index].code);
}
}
debug("code=%d", code);
if (code >= 0) {
if (code_count > 15 && write_position < content_buffer_size) {
write_position +=
pv_snprintf(content + write_position, sizeof(content) - write_position,
"%s", "m");
code_count = 0;
}
if (0 == code_count && write_position < content_buffer_size) {
write_position +=
pv_snprintf(content + write_position, sizeof(content) - write_position,
"%s", "\033[");
} else if (write_position < content_buffer_size) {
write_position +=
pv_snprintf(content + write_position, sizeof(content) - write_position,
"%s", ";");
}
if (write_position < content_buffer_size) {
write_position +=
pv_snprintf(content + write_position, sizeof(content) - write_position,
"%d", code);
}
code_count++;
most_recent_code = code;
}
keyword_length = 0;
keyword_start = read_position;
}
}
if (code_count > 0 && write_position < content_buffer_size)
write_position += pv_snprintf(content + write_position, sizeof(content) - write_position, "%s", "m");
if (most_recent_code > 0) {
args->display->sgr_code_active = true;
} else if (0 == most_recent_code) {
args->display->sgr_code_active = false;
}
return pv_formatter_segmentcontent(content, args);
}
+69
View File
@@ -0,0 +1,69 @@
/*
* Formatter function for the elapsed transfer time.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
/*
* Elapsed time.
*/
pvdisplay_bytecount_t pv_formatter_timer(pvformatter_args_t args)
{
char content[128]; /* flawfinder: ignore - bounded with pv_snprintf(). */
long double elapsed_seconds;
args->display->showing_timer = true;
content[0] = '\0';
if (0 == args->buffer_size)
return 0;
elapsed_seconds = args->transfer->elapsed_seconds;
/* The timer must always be positive. */
if (elapsed_seconds < 0.0L)
elapsed_seconds = 0.0L;
if (args->control->numeric) {
/* Numeric mode - show the number of seconds, unformatted. */
(void) pv_snprintf(content, sizeof(content), "%.4Lf", elapsed_seconds);
} else if (elapsed_seconds > (long double) (999999.999999L * 86400.0L)) {
/*
* At a million days, the timer would be too wide, so avoid
* an overflow.
*/
(void) pv_snprintf(content,
sizeof(content),
"%s:%02ld:%02ld:%02ld",
">=1e6",
(((long) (elapsed_seconds)) / 3600) %
24, (((long) (elapsed_seconds)) / 60) % 60, ((long) (elapsed_seconds)) % 60);
} else if (elapsed_seconds > (long double) 86400.0L) {
/*
* If the elapsed time is more than a day, include a day count as
* well as hours, minutes, and seconds.
*/
(void) pv_snprintf(content,
sizeof(content),
"%ld:%02ld:%02ld:%02ld",
((long) (elapsed_seconds)) / 86400,
(((long) (elapsed_seconds)) / 3600) %
24, (((long) (elapsed_seconds)) / 60) % 60, ((long) (elapsed_seconds)) % 60);
} else {
(void) pv_snprintf(content,
sizeof(content),
"%ld:%02ld:%02ld",
((long) (elapsed_seconds)) / 3600,
(((long) (elapsed_seconds)) / 60) % 60, ((long) (elapsed_seconds)) % 60);
}
return pv_formatter_segmentcontent(content, args);
}
+1400 -597
View File
File diff suppressed because it is too large Load Diff
+190 -86
View File
@@ -1,85 +1,114 @@
/*
* Functions for converting strings to numbers.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include <stddef.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "pv.h"
#include <stddef.h>
/*
* This function is used instead of the macro from <ctype.h> because
* including <ctype.h> causes weird versioned glibc dependencies on certain
* Red Hat systems, complicating package management.
*/
static bool pv__isdigit(char c)
bool pv_isdigit(char c)
{
return ((c >= '0') && (c <= '9')) ? true : false;
}
/*
* Return the numeric value of "str", as an unsigned long long.
* Return the numeric value of "str", as an off_t, where "str" is expected
* to be a sequence of digits (without a thousands separator), possibly with
* a fractional part, optionally followed by a units suffix such as "K" for
* kibibytes. If "decimal_units" is true, suffixes are interpreted as
* multiples of 1000, rather than multiples of 1024.
*
* If resultptr is not NULL, it is populated with the result as a long
* double.
*/
unsigned long long pv_getnum_ull(const char *str)
off_t pv_getnum_size(const char *str, bool decimal_units, /*@null@ */ long double *resultptr)
{
unsigned long long n = 0;
unsigned long long decimal = 0;
unsigned int decdivisor = 1;
unsigned int shift = 0;
off_t integral_part = 0;
off_t fractional_part = 0;
unsigned int fractional_divisor = 1;
unsigned int binary_shift = 0;
off_t decimal_multiplier = 0;
size_t readpos = 0;
if (NULL == str)
return n;
if (NULL == str) {
if (NULL != resultptr)
*resultptr = 0.0;
return (off_t) 0;
}
while (str[0] != '\0' && (!pv__isdigit(str[0])))
str++;
/* Skip any non-numeric leading characters. */
while (str[readpos] != '\0' && (!pv_isdigit(str[readpos])))
readpos++;
for (; pv__isdigit(str[0]); str++) {
n = n * 10;
n += (unsigned long long) (str[0] - '0');
/*
* Parse the integral part of the number - the digits before the
* decimal mark or units.
*/
for (; pv_isdigit(str[readpos]); readpos++) {
integral_part = integral_part * 10;
integral_part += (off_t) (str[readpos] - '0');
}
/*
* If a decimal value was given, skip the decimal part.
* If the next character is a decimal mark, skip over it and parse
* the following digits as the fractional part of the number.
*
* Note that the decimal mark is hard-coded as being either '.' or
* ',' so this will fail if there are any locales whose decimal mark
* is not one of those two characters.
*/
if (('.' == str[0]) || (',' == str[0])) {
str++;
for (; pv__isdigit(str[0]); str++) {
if (decdivisor < 10000) {
decimal = decimal * 10;
decimal +=
(unsigned long long) (str[0] - '0');
decdivisor = decdivisor * 10;
if (('.' == str[readpos]) || (',' == str[readpos])) {
readpos++;
for (; pv_isdigit(str[readpos]); readpos++) {
/* Stop counting below 0.0001. */
if (fractional_divisor < 10000) {
fractional_part = fractional_part * 10;
fractional_part += (off_t) (str[readpos] - '0');
fractional_divisor = fractional_divisor * 10;
}
}
}
/*
* Parse any units given (K=KiB=*1024, M=MiB=1024KiB, G=GiB=1024MiB,
* T=TiB=1024GiB).
* T=TiB=1024GiB; replace 1024 with 1000 if decimal_units is true).
*/
if (str[0] != '\0') {
while ((' ' == str[0]) || ('\t' == str[0]))
str++;
switch (str[0]) {
if (str[readpos] != '\0') {
/* Skip any spaces or tabs after the digits. */
while ((' ' == str[readpos]) || ('\t' == str[readpos]))
readpos++;
switch (str[readpos]) {
case 'k':
case 'K':
shift = 10;
binary_shift = 10;
decimal_multiplier = 1000;
break;
case 'm':
case 'M':
shift = 20;
binary_shift = 20;
decimal_multiplier = 1000000;
break;
case 'g':
case 'G':
shift = 30;
binary_shift = 30;
decimal_multiplier = 1000000000;
break;
case 't':
case 'T':
shift = 40;
binary_shift = 40;
decimal_multiplier = 1000000000000;
break;
default:
break;
@@ -87,109 +116,165 @@ unsigned long long pv_getnum_ull(const char *str)
}
/*
* Binary left-shift the supplied number by "shift" times, i.e.
* If decimal_units is true, set binary_shift to zero; if false, set
* decimal_multiplier to zero. This is so that only one of the two
* multipliers can be active.
*/
if (decimal_units) {
binary_shift = 0;
} else {
decimal_multiplier = 0;
}
/*
* Binary left-shift the supplied number by "binary_shift" times, i.e.
* apply the given units (KiB, MiB, etc) to it, but never shift left
* more than 30 at a time to avoid overflows.
*/
while (shift > 0) {
while (binary_shift > 0) {
unsigned int shiftby;
shiftby = shift;
shiftby = binary_shift;
if (shiftby > 30)
shiftby = 30;
n = n << shiftby;
decimal = decimal << shiftby;
shift -= shiftby;
/*@-shiftimplementation@ */
/*
* splint note: ignore the fact that the types being shifted
* are signed, because they are definitely not negative.
*/
integral_part = (off_t) (integral_part << shiftby);
fractional_part = (off_t) (fractional_part << shiftby);
/*@+shiftimplementation@ */
binary_shift -= shiftby;
}
/*
* Add any decimal component.
* Multiply the supplied number by the decimal multiplier.
*/
decimal = decimal / decdivisor;
n += decimal;
if (decimal_multiplier > 0) {
integral_part = integral_part * decimal_multiplier;
fractional_part = fractional_part * decimal_multiplier;
}
return n;
/*
* Add the fractional part, divided by its divisor, to the integral
* part, now that the multiplier for the units has been applied.
*/
if (NULL != resultptr) {
*resultptr = ((long double) fractional_part) / (long double) fractional_divisor;
*resultptr += (long double) integral_part;
}
fractional_part = fractional_part / fractional_divisor;
integral_part += fractional_part;
if (NULL != resultptr) {
debug("%s [%s] = %lld = %Lf", str, decimal_units ? "decimal" : "binary", (long long) integral_part,
*resultptr);
} else {
debug("%s [%s] = %lld", str, decimal_units ? "decimal" : "binary", (long long) integral_part);
}
return integral_part;
}
/*
* Return the numeric value of "str", as a double.
* Return the numeric value of "str", as a double, where "str" is expected
* to be a positive decimal number expressing a time interval.
*/
double pv_getnum_d(const char *str)
double pv_getnum_interval(const char *str)
{
double n = 0.0;
double result = 0.0;
double step = 1;
if (NULL == str)
return n;
return 0.0;
while (str[0] != '\0' && (!pv__isdigit(str[0])))
/* Skip any non-digit characters at the start. */
while (str[0] != '\0' && (!pv_isdigit(str[0])))
str++;
for (; pv__isdigit(str[0]); str++) {
n = n * 10;
n += (double) (str[0] - '0');
/* Parse the digits before the decimal mark. */
for (; pv_isdigit(str[0]); str++) {
result = result * 10;
result += (double) (str[0] - '0');
}
/* If there is no decimal mark, return the value as-is. */
if ((str[0] != '.') && (str[0] != ','))
return n;
return result;
/* Move past the decimal mark. */
str++;
for (; pv__isdigit(str[0]) && step < 1000000; str++) {
/* Parse the digits after the decimal mark, up to 0.0000001. */
for (; pv_isdigit(str[0]) && step < 1000000; str++) {
step = step * 10;
n += ((double) (str[0] - '0')) / step;
result += ((double) (str[0] - '0')) / step;
}
return n;
return result;
}
/*
* Return the numeric value of "str", as an unsigned int.
* Return the numeric value of "str", as an unsigned int, following the same
* rules as pv_getnum_size(), expecting "str" to express a value to be used
* as a count (such as number of screen columns, or size of a buffer).
*/
unsigned int pv_getnum_ui(const char *str)
unsigned int pv_getnum_count(const char *str, bool decimal_units)
{
return (unsigned int) pv_getnum_ull(str);
return (unsigned int) pv_getnum_size(str, decimal_units, NULL);
}
/*
* Return nonzero if the given string is not a valid number of the given
* type.
* Return true if the given string is a valid number of the given type.
*/
int pv_getnum_check(const char *str, pv_numtype_t type)
bool pv_getnum_check(const char *str, pv_numtype type)
{
if (0 == str)
return 1;
if (NULL == str)
return false;
/* Skip leading spaces and tabs. */
while ((' ' == str[0]) || ('\t' == str[0]))
str++;
if (!pv__isdigit(str[0]))
return 1;
/* If the next character isn't a digit, this isn't a number. */
if (!pv_isdigit(str[0]))
return false;
for (; pv__isdigit(str[0]); str++);
if (('.' == str[0]) || (',' == str[0])) {
if (type == PV_NUMTYPE_INTEGER)
return 1;
str++;
for (; pv__isdigit(str[0]); str++);
}
if ('\0' == str[0])
return 0;
/* Skip over the digits. */
for (; pv_isdigit(str[0]); str++);
/*
* Suffixes are not allowed for doubles, only for integers.
* If there's a decimal mark (see note in pv_getnum_size() above),
* check that too.
*/
if (type == PV_NUMTYPE_DOUBLE)
return 1;
if (('.' == str[0]) || (',' == str[0])) {
/* Bare integers should have no decimal mark. */
if (type == PV_NUMTYPE_BARE_INTEGER)
return false;
/* Skip the decimal mark, then all digits. */
str++;
for (; pv_isdigit(str[0]); str++);
}
/* If the string ends here, this is a valid number. */
if ('\0' == str[0])
return true;
/* A units suffix is only allowed for ANY_WITH_SUFFIX. */
if (type != PV_NUMTYPE_ANY_WITH_SUFFIX)
return false;
/* Skip trailing spaces or tabs. */
while ((' ' == str[0]) || ('\t' == str[0]))
str++;
/* Check the units suffix is known. */
switch (str[0]) {
case 'k':
case 'K':
@@ -202,13 +287,32 @@ int pv_getnum_check(const char *str, pv_numtype_t type)
str++;
break;
default:
return 1;
return false;
}
/* If the string has trailing text, it's not a valid number. */
if (str[0] != '\0')
return 1;
return false;
return 0;
return true;
}
/* EOF */
/*
* Return a value representing "amount" as a percentage of "total", i.e.
* 100*amount/total. If "total" is zero or less, return 0.
*/
double pv_percentage(off_t amount, const off_t total)
{
double amount_as_double;
if (total < 1)
return 0.0;
amount_as_double = (double) amount;
amount_as_double *= 100.0;
amount_as_double /= (double) total;
return amount_as_double;
}
+116
View File
@@ -0,0 +1,116 @@
/*
* Functions for setting the process title.
*
* Copyright 2024-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <unistd.h>
#if ! HAVE_SETPROCTITLE
extern char **environ;
/*@null@*/ static char **base_argv = NULL;
static size_t space_available = 0;
/*
* Assuming the environment comes after the command line arguments, make a
* duplicate of the environment array and all its values, to allow the
* process title to use the space the environment used to occupy.
*
* The logic for this was derived from util-linux-ng.
*/
/*@-mustfreefresh@ */
/*@-nullstate@ */
void initproctitle(int argc, char **argv)
{
char **original_environment = environ;
char **new_environment;
size_t env_array_size, env_index;
/* Find the number of entries in the environment array. */
for (env_array_size = 0; environ[env_array_size] != NULL; env_array_size++);
/* Allocate a new environment array. */
new_environment = (char **) malloc(sizeof(char *) * (env_array_size + 1));
if (NULL == new_environment)
return;
/* Duplicate the strings in the environment. */
for (env_index = 0; original_environment[env_index] != NULL; env_index++) {
new_environment[env_index] = pv_strdup(original_environment[env_index]);
if (NULL == new_environment[env_index])
return;
}
new_environment[env_index] = NULL;
base_argv = argv;
/* Work out how much room is available. */
if (env_index > 0) {
/* From argv[0] to the end of the last environment value. */
space_available = (size_t)
(original_environment[env_index - 1] + strlen(original_environment[env_index - 1]) - argv[0]); /* flawfinder: ignore */
} else if (argc > 0) {
/* No environment; from argv[0] to the end of the last argument. */
space_available = (size_t) (argv[argc - 1] + strlen(argv[argc - 1]) - argv[0]); /* flawfinder: ignore */
}
/*
* flawfinder - the OS is supposed to guarantee that the environment
* and argument strings are null-terminated.
*/
environ = new_environment;
}
/*@+nullstate@ */
/*@+mustfreefresh@ */
/*
* Set the process title visible to ps(1), by overwriting argv[0] with the
* given printf() format string.
*/
void setproctitle(const char *format, ...)
{
char title[1024]; /* flawfinder: ignore */
size_t length;
va_list ap;
/* flawfinder - buffer is zeroed and calls using it are bounded. */
if (NULL == base_argv)
return;
memset(title, 0, sizeof(title));
va_start(ap, format);
(void) vsnprintf(title, sizeof(title) - 1, format, ap); /* flawfinder: ignore */
va_end(ap);
/*
* flawfinder - the format is explicitly caller-supplied. Callers
* of this function are all passing fixed format strings and not
* user-supplied formats.
*/
length = strlen(title); /* flawfinder: ignore */
/* flawfinder - a byte was left at the end to force null-termination. */
if (length > space_available - 2)
length = space_available - 2;
(void) pv_snprintf(base_argv[0], space_available, "%s", title);
if (space_available > length)
memset(base_argv[0] + length, 0, space_available - length);
}
#endif
+682
View File
@@ -0,0 +1,682 @@
/*
* Remote-control and remote-query functions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <signal.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
#ifdef PV_REMOTE_CONTROL
/* Structure for transferring settings with --remote. */
struct remote_msg {
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 */
size_t lastwritten; /* last-written bytes count */
long double rate_limit; /* rate limit, in bytes per second */
size_t buffer_size; /* buffer size, in bytes (0=default) */
off_t size; /* total size of data */
double interval; /* interval between updates */
unsigned int width; /* screen width */
unsigned int height; /* screen height */
bool width_set_manually; /* width was set manually, not detected */
bool height_set_manually; /* height was set manually, not detected */
bool rate_limit_specified; /* whether a rate limit value was set */
bool rate_limit_active; /* whether rate limiting is in effect (>0) */
char name[256]; /* flawfinder: ignore */
char format[256]; /* flawfinder: ignore */
char extra_display[256]; /* flawfinder: ignore */
};
/* Structure for transferring transfer state with --query. */
struct query_msg {
long double elapsed_seconds; /* from state.transfer */
off_t transferred; /* from state.transfer */
off_t size; /* from state.control */
bool response; /* true if this is the response signal. */
};
/*
* flawfinder rationale: name, format, and extra_display are always
* explicitly zeroed and bounded to one less than their size so they are
* always \0 terminated.
*/
/*
* Set the options of a remote process by writing them to a file, sending a
* signal to the receiving process, and waiting for the message to be
* consumed by the remote process.
*
* Returns nonzero on error.
*/
int pv_remote_set(pvstate_t state, pid_t remote)
{
char control_filename[4096]; /* flawfinder: ignore */
FILE *control_fptr;
struct remote_msg msgbuf;
pid_t signal_sender;
long timeout;
bool received;
/*
* flawfinder rationale: buffer is large enough, explicitly zeroed,
* and always bounded properly as we are only writing to it with
* pv_snprintf().
*/
/*
* Check that the remote process exists.
*/
if (kill((pid_t) (remote), 0) != 0) {
pv_perror("%s %u", _("pid"), remote);
return PV_ERROREXIT_REMOTE_OR_PID;
}
/*
* Copy parameters into message buffer.
*/
memset(&msgbuf, 0, sizeof(msgbuf));
msgbuf.progress = state->control.format_option.progress;
msgbuf.timer = state->control.format_option.timer;
msgbuf.eta = state->control.format_option.eta;
msgbuf.fineta = state->control.format_option.fineta;
msgbuf.rate = state->control.format_option.rate;
msgbuf.average_rate = state->control.format_option.average_rate;
msgbuf.bytes = state->control.format_option.bytes;
msgbuf.bufpercent = state->control.format_option.bufpercent;
msgbuf.lastwritten = state->control.format_option.lastwritten;
msgbuf.rate_limit = state->control.rate_limit;
msgbuf.rate_limit_specified = state->control.rate_limit_specified;
msgbuf.rate_limit_active = state->control.rate_limit_active;
msgbuf.buffer_size = state->control.target_buffer_size;
msgbuf.size = state->control.size;
msgbuf.interval = state->control.interval;
msgbuf.width = (unsigned int) (state->control.width);
msgbuf.height = (unsigned int) (state->control.height);
msgbuf.width_set_manually = state->control.width_set_manually;
msgbuf.height_set_manually = state->control.height_set_manually;
if (state->control.name != NULL) {
strncpy(msgbuf.name, state->control.name, sizeof(msgbuf.name) - 1); /* flawfinder: ignore */
}
if (state->control.format_string != NULL) {
strncpy(msgbuf.format, state->control.format_string, sizeof(msgbuf.format) - 1); /* flawfinder: ignore */
}
if (state->control.extra_display_spec != NULL) {
strncpy(msgbuf.extra_display, state->control.extra_display_spec, sizeof(msgbuf.extra_display) - 1); /* flawfinder: ignore */
}
/*
* Make sure parameters are within sensible bounds.
*/
if (msgbuf.width < 1)
msgbuf.width = 80;
if (msgbuf.height < 1)
msgbuf.height = 25;
if (msgbuf.width > 999999)
msgbuf.width = 999999;
if (msgbuf.height > 999999)
msgbuf.height = 999999;
if ((msgbuf.interval > 0) && (msgbuf.interval < 0.1))
msgbuf.interval = 0.1;
if (msgbuf.interval > 600)
msgbuf.interval = 600;
/*
* flawfinder rationale: name, format, and extra_display are
* explicitly bounded to 1 less than the size of their buffer and
* the buffer is \0 terminated by memset() earlier.
*/
/*
* Get the filename and file stream to use for remote control.
*/
memset(control_filename, 0, sizeof(control_filename));
control_fptr = pv_open_controlfile(control_filename, sizeof(control_filename), (pid_t) getpid(), SIGUSR2, true);
if (NULL == control_fptr) {
pv_perror("%s", control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
/*
* Write the message buffer to the remote control file, and close
* it.
*/
if (1 != fwrite(&msgbuf, sizeof(msgbuf), 1, control_fptr)) {
pv_perror("%s", control_filename);
(void) fclose(control_fptr);
(void) remove(control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
if (0 != fclose(control_fptr)) {
pv_perror("%s", control_filename);
(void) remove(control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
/*
* Clear this process's "SIGUSR2 received" flag, and then send a
* SIGUSR2 signal to the remote process, to tell it a message is
* ready to read.
*/
signal_sender = 0;
(void) pv_sigusr2_received(state, &signal_sender);
if (kill((pid_t) (remote), SIGUSR2) != 0) {
pv_perror("%s %u", _("pid"), remote);
(void) remove(control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
debug("%s", "message sent");
/*
* Wait for a signal from the remote process to say it has received
* the message.
*/
timeout = 1100000;
received = false;
while (timeout > 10000 && !received) {
struct timeval tv;
memset(&tv, 0, sizeof(tv));
tv.tv_sec = 0;
tv.tv_usec = 10000;
/*@-nullpass@ *//* splint: NULL is OK with select() */
(void) select(0, NULL, NULL, NULL, &tv);
/*@+nullpass@ */
timeout -= 10000;
if (pv_sigusr2_received(state, &signal_sender)) {
if (signal_sender == remote) {
debug("%s", "message received");
received = true;
}
}
}
/*
* Remove the remote control file.
*/
debug("%s: %s", "removing", control_filename);
if (0 != remove(control_filename)) {
pv_perror("%s", control_filename);
}
/*
* Return 0 if the message was received.
*/
if (received)
return 0;
/*@-mustfreefresh@ */
/*
* splint note: the gettext calls made by _() cause memory leak
* warnings, but in this case it's unavoidable, and mitigated by the
* fact that each string is only translated once.
*/
pv_error("%u: %s", remote, _("message not received"));
return PV_ERROREXIT_REMOTE_OR_PID;
/*@+mustfreefresh @ */
}
/*
* Check for a --remote message (SIGUSR2), returning false if none was
* found.
*
* If a message was received, update the current process's options with the
* ones in the message.
*
* Note that this relies on pv_state_set_format_options() causing the output
* format to be reparsed.
*/
static bool pv__rxsignal_usr2(pvstate_t state)
{
pid_t signal_sender;
char control_filename[4096]; /* flawfinder: ignore */
FILE *control_fptr;
struct remote_msg msgbuf;
pvformatoptions_s format_options;
/* flawfinder rationale: as above. */
/*
* Return early if a SIGUSR2 signal has not been received.
*/
signal_sender = 0;
if (!pv_sigusr2_received(state, &signal_sender))
return false;
memset(control_filename, 0, sizeof(control_filename));
control_fptr = pv_open_controlfile(control_filename, sizeof(control_filename), signal_sender, SIGUSR2, false);
if (NULL == control_fptr) {
pv_perror("%s", control_filename);
return false;
}
/*
* Read the message buffer from the remote control file, and close
* it.
*/
if (1 != fread(&msgbuf, sizeof(msgbuf), 1, control_fptr)) {
pv_perror("%s", control_filename);
(void) fclose(control_fptr);
return false;
}
if (0 != fclose(control_fptr)) {
pv_perror("%s", control_filename);
return false;
}
/*
* Send a SIGUSR2 signal to the sending process, to tell it the
* message has been received.
*/
if (kill(signal_sender, SIGUSR2) != 0) {
debug("%u: %s", signal_sender, strerror(errno));
}
debug("%s", "received remote control message");
pv_state_format_string_set(state, NULL);
pv_state_name_set(state, NULL);
pv_state_extra_display_set(state, NULL);
msgbuf.name[sizeof(msgbuf.name) - 1] = '\0';
msgbuf.format[sizeof(msgbuf.format) - 1] = '\0';
msgbuf.extra_display[sizeof(msgbuf.extra_display) - 1] = '\0';
pv_state_name_set(state, '\0' == msgbuf.name[0] ? NULL : msgbuf.name);
format_options.progress = msgbuf.progress;
format_options.timer = msgbuf.timer;
format_options.eta = msgbuf.eta;
format_options.fineta = msgbuf.fineta;
format_options.rate = msgbuf.rate;
format_options.average_rate = msgbuf.average_rate;
format_options.bytes = msgbuf.bytes;
format_options.bufpercent = msgbuf.bufpercent;
format_options.lastwritten = msgbuf.lastwritten;
pv_state_set_format_options(state, format_options);
if (msgbuf.rate_limit_specified)
pv_state_rate_limit_set(state, msgbuf.rate_limit, msgbuf.rate_limit_specified,
msgbuf.rate_limit_active);
if (msgbuf.buffer_size > 0) {
pv_state_target_buffer_size_set(state, msgbuf.buffer_size);
}
if (msgbuf.size > 0)
pv_state_size_set(state, msgbuf.size);
if (msgbuf.interval > 0)
pv_state_interval_set(state, msgbuf.interval);
if (msgbuf.width > 0 && msgbuf.width_set_manually)
pv_state_width_set(state, msgbuf.width, msgbuf.width_set_manually);
if (msgbuf.height > 0 && msgbuf.height_set_manually)
pv_state_height_set(state, msgbuf.height, msgbuf.height_set_manually);
if (msgbuf.format[0] != '\0')
pv_state_format_string_set(state, msgbuf.format);
if (msgbuf.extra_display[0] != '\0')
pv_state_extra_display_set(state, msgbuf.extra_display);
return true;
}
/*
* Check for a --query message (SIGUSR1).
*
* If a type 0 message was received (query), then write a type 1 message
* (response) to the control file and send a SIGUSR1 to the sending process.
*
* If a type 1 message was received (response), update the state from the
* message in the control file.
*
* In both cases, the receiver of the message deletes its control file.
*
* The state transferred by message is transfer.elapsed_seconds,
* transfer.transferred, and control.size.
*
* Returns true if a signal was received and dealt with, false otherwise.
*
* If match_sender is not zero, then ignores the signal and returns false if
* the sending PID is not match_sender.
*/
static bool pv__rxsignal_usr1(pvstate_t state, pid_t match_sender)
{
pid_t signal_sender;
char control_filename[4096]; /* flawfinder: ignore */
FILE *control_fptr;
struct query_msg msgbuf;
/* flawfinder rationale: as above. */
/*
* Return early if a SIGUSR1 signal has not been received.
*/
signal_sender = 0;
if (!pv_sigusr1_received(state, &signal_sender))
return false;
/*
* If match_sender was specified, ignore the signal if the sender
* doesn't match.
*/
if ((0 != match_sender) && (signal_sender != match_sender)) {
debug("%s=%d, %s=%d - %s", "match_sender", match_sender, "signal_sender", signal_sender,
"ignoring USR1");
return false;
}
/*
* Note that errors are only reported with debug() rather than
* pv_error() here so that the display of a running pv doesn't get
* interrupted by, for example, a querying pv being terminated.
*/
memset(control_filename, 0, sizeof(control_filename));
control_fptr = pv_open_controlfile(control_filename, sizeof(control_filename), signal_sender, SIGUSR1, false);
if (NULL == control_fptr) {
debug("%s: %s", control_filename, strerror(errno));
return false;
}
/*
* Read the message buffer from the remote control file, close it,
* and delete it.
*/
if (1 != fread(&msgbuf, sizeof(msgbuf), 1, control_fptr)) {
debug("fread: %s", strerror(errno));
(void) fclose(control_fptr);
return false;
}
if (0 != fclose(control_fptr)) {
debug("fclose: %s", strerror(errno));
return false;
}
debug("%s: %s", "removing", control_filename);
if (0 != remove(control_filename)) {
debug("remove: %s", strerror(errno));
return false;
}
if (msgbuf.response) {
/* Response message - update local state. */
debug("%s: %d [%Lg, %ld, %ld]", "query response received", signal_sender, msgbuf.elapsed_seconds,
msgbuf.transferred, msgbuf.size);
state->transfer.elapsed_seconds = msgbuf.elapsed_seconds;
state->transfer.transferred = msgbuf.transferred;
state->control.size = msgbuf.size;
return true;
}
/* Query message - transmit state to sender. */
debug("%s: %d", "query received", signal_sender);
msgbuf.elapsed_seconds = state->transfer.elapsed_seconds;
msgbuf.transferred = state->transfer.transferred;
msgbuf.size = state->control.size;
msgbuf.response = true;
memset(control_filename, 0, sizeof(control_filename));
control_fptr = pv_open_controlfile(control_filename, sizeof(control_filename), (pid_t) getpid(), SIGUSR1, true);
if (NULL == control_fptr) {
debug("%s", strerror(errno));
return true; /* true since the signal was received. */
}
if (1 != fwrite(&msgbuf, sizeof(msgbuf), 1, control_fptr)) {
debug("fwrite: %s", strerror(errno));
(void) fclose(control_fptr);
(void) remove(control_filename);
return true; /* as above. */
}
if (0 != fclose(control_fptr)) {
debug("fclose: %s", strerror(errno));
(void) remove(control_filename);
return true;
}
/*
* Send a SIGUSR1 signal to the remote process, to tell it this
* query response message is ready to read.
*/
if (kill((pid_t) (signal_sender), SIGUSR1) != 0) {
debug("%u: %s", signal_sender, strerror(errno));
(void) remove(control_filename);
return true;
}
debug("%s: %d", "query response sent", signal_sender);
return true;
}
/*
* Check for remote control messages. For a SIGUSR2 (--remote), replace the
* current process's options with those being passed in. For a SIGUSR1
* (--query), either receive transfer state from the sending process, or
* send the current transfer state to the sending process, depending on the
* content of the message.
*
* NB --remote relies on pv_state_set_format_options() causing the output
* format to be reparsed.
*
* Returns true if a --remote message was received, false otherwise.
*/
bool pv_remote_check(pvstate_t state)
{
bool received_remote;
received_remote = pv__rxsignal_usr2(state);
(void) pv__rxsignal_usr1(state, 0);
return received_remote;
}
/*
* Replace the transfer state with that of the given process, including the
* total transfer size. If sizeptr is not NULL, the size is also copied to
* *sizeptr (this is so a caller can get the size without knowing the
* structure of pvstate_t).
*
* Returns nonzero on error. If "silent" is false, reports the error.
*/
int pv_remote_transferstate_fetch(pvstate_t state, pid_t query, /*@null@ */ off_t *sizeptr, bool silent)
{
char control_filename[4096]; /* flawfinder: ignore */
FILE *control_fptr;
struct query_msg msgbuf;
pid_t signal_sender;
long timeout;
bool received;
/*
* flawfinder rationale: buffer is large enough, explicitly zeroed,
* and always bounded properly, as only pv_snprintf() writes to it.
*/
/*
* Check that the remote process exists.
*/
if (kill((pid_t) (query), 0) != 0) {
if (!silent)
pv_perror("%s %u", _("pid"), query);
return PV_ERROREXIT_REMOTE_OR_PID;
}
/* Set up the query message. */
memset(&msgbuf, 0, sizeof(msgbuf));
msgbuf.response = false;
/*
* Get the filename and file stream to use.
*/
memset(control_filename, 0, sizeof(control_filename));
control_fptr = pv_open_controlfile(control_filename, sizeof(control_filename), (pid_t) getpid(), SIGUSR1, true);
if (NULL == control_fptr) {
if (!silent)
pv_perror("%s", control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
/*
* Write the message to the control file, and close it.
*/
if (1 != fwrite(&msgbuf, sizeof(msgbuf), 1, control_fptr)) {
if (!silent)
pv_perror("%s", control_filename);
(void) fclose(control_fptr);
(void) remove(control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
if (0 != fclose(control_fptr)) {
if (!silent)
pv_perror("%s", control_filename);
(void) remove(control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
/*
* Clear this process's "SIGUSR1 received" flag and send a SIGUSR1
* signal to the remote process, to tell it a query message is
* ready.
*/
signal_sender = 0;
(void) pv_sigusr1_received(state, &signal_sender);
if (kill((pid_t) (query), SIGUSR1) != 0) {
if (!silent)
pv_perror("%s %u", _("pid"), query);
(void) remove(control_filename);
return PV_ERROREXIT_REMOTE_OR_PID;
}
debug("%s: %d", "query sent", query);
/*
* Wait for a SIGUSR1 signal to be sent back with a query response
* message.
*/
timeout = 1100000;
received = false;
while (timeout > 10000 && !received && 0 == state->flags.trigger_exit) {
struct timeval tv;
memset(&tv, 0, sizeof(tv));
tv.tv_sec = 0;
tv.tv_usec = 10000;
/*@-nullpass@ *//* splint: NULL is OK with select() */
(void) select(0, NULL, NULL, NULL, &tv);
/*@+nullpass@ */
timeout -= 10000;
if (pv__rxsignal_usr1(state, query)) {
debug("%s", "response received");
received = true;
if (NULL != sizeptr)
*sizeptr = state->control.size;
}
}
/*
* Remove the control file in case it still exists - the other
* process should have removed it.
*/
debug("%s: %s", "cleaning up", control_filename);
(void) remove(control_filename);
/*
* Return 0 if the message was received.
*/
if (received)
return 0;
/*@-mustfreefresh@ */
/*
* splint note: the gettext calls made by _() cause memory leak
* warnings, but in this case it's unavoidable, and mitigated by the
* fact that each string is only translated once.
*/
if (!silent)
pv_error("%u: %s", query, _("message not received"));
return PV_ERROREXIT_REMOTE_OR_PID;
/*@+mustfreefresh @ */
}
#else /* !PV_REMOTE_CONTROL */
/*
* Dummy stubs for remote control when PV_REMOTE_CONTROL is not set.
*/
bool pv_remote_check( /*@unused@ */ __attribute__((unused)) pvstate_t state)
{
return false;
}
int pv_remote_set( /*@unused@ */
__attribute__((unused)) pvstate_t state, /*@unused@ */ __attribute__((unused)) pid_t remote)
{
/*@-mustfreefresh@ *//* splint - see above */
pv_error("%s", _("SA_SIGINFO not supported on this system"));
/*@+mustfreefresh@ */
return PV_ERROREXIT_REMOTE_OR_PID;
}
int pv_remote_transferstate_fetch( /*@unused@ */
__attribute__((unused)) pvstate_t state,
/*@unused@ */
__attribute__((unused)) pid_t query,
/*@null@ */
/*@unused@ */
__attribute__((unused)) off_t *sizeptr,
/*@unused@ */
__attribute__((unused))
bool silent)
{
/*@-mustfreefresh@ *//* splint - see above */
pv_error("%s", _("SA_SIGINFO not supported on this system"));
/*@+mustfreefresh@ */
return PV_ERROREXIT_REMOTE_OR_PID;
}
#endif /* PV_REMOTE_CONTROL */
+564 -131
View File
@@ -1,44 +1,169 @@
/*
* Signal handling functions.
*
* Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include "pv-internal.h"
#include <string.h>
#include <errno.h>
#include <signal.h>
#include <termios.h>
#include <time.h>
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
#ifdef HAVE_IPC
void pv_crs_needreinit(pvstate_t);
void pv_crs_needreinit(pvcursorstate_t);
#endif
static pvstate_t pv_sig_state = NULL;
/*@null@*/ static pvstate_t pv_sig_state = NULL;
/*
* Handle SIGTTOU (tty output for background process) by redirecting stderr
* to /dev/null, so that we can be stopped and backgrounded without messing
* up the terminal. We store the old stderr file descriptor so that on a
* subsequent SIGCONT we can try writing to the terminal again, in case we
* get backgrounded and later get foregrounded again.
* Check whether the terminal attribute TOSTOP is set. If it is not, set
* it, and record that fact by setting "clear_tty_tostop_on_exit" to true,
* so that pv_sig_fini() knows to clear it again.
*
* In "-c" mode with IPC, that flag is propagated to other PV instances via
* the shared "tty_tostop_added" flag, so those instances can set their own
* on-exit flag, meaning that if any of the PV instances set it, the last
* one to exit will clear it.
*/
static void pv_sig_ttou( __attribute__ ((unused))
int s)
static void pv_sig_ensure_tty_tostop()
{
int fd;
struct termios terminal_attributes;
fd = open("/dev/null", O_RDWR);
if (fd < 0)
if (NULL == pv_sig_state)
return;
if (-1 == pv_sig_state->pv_sig_old_stderr)
pv_sig_state->pv_sig_old_stderr = dup(STDERR_FILENO);
/* Can't look at terminal flags if backgrounded. */
if (1 == pv_sig_state->flags.suspend_stderr)
return;
dup2(fd, STDERR_FILENO);
close(fd);
if (0 != tcgetattr(STDERR_FILENO, &terminal_attributes)) {
debug("%s: %s", "failed to read terminal attributes", strerror(errno));
return;
}
/* Can't set terminal flags if backgrounded. */
if (1 == pv_sig_state->flags.suspend_stderr)
return;
if (0 == (terminal_attributes.c_lflag & TOSTOP)) {
terminal_attributes.c_lflag |= TOSTOP;
if (0 == tcsetattr(STDERR_FILENO, TCSANOW, &terminal_attributes)) {
pv_sig_state->flags.clear_tty_tostop_on_exit = 1;
debug("%s", "set terminal TOSTOP attribute");
#if HAVE_IPC
/*
* In "-c" mode with IPC, make all "pv -c" instances
* aware that we set TOSTOP, so the last one can
* clear it on exit.
*/
if (pv_sig_state->control.cursor && (NULL != pv_sig_state->cursor.shared)
&& (!pv_sig_state->cursor.noipc)) {
pv_sig_state->cursor.shared->tty_tostop_added = true;
}
#endif
} else {
debug("%s: %s", "failed to set terminal TOSTOP attribute", strerror(errno));
}
}
}
#ifdef ECHOCTL
/*
* Check whether the terminal attribute ECHOCTL is set. If it is, clear it,
* and record that fact by setting "set_tty_echoctl_on_exit" to true, so
* that pv_sig_fini() knows to clear it again.
*
* In "-c" mode with IPC, that flag is propagated to other PV instances via
* the shared "tty_echoctl_cleared" flag, so those instances can set their
* own on-exit flag, meaning that if any of the PV instances clear it, the
* last one to exit will set it.
*/
static void pv_sig_ensure_tty_noechoctl()
{
struct termios terminal_attributes;
if (NULL == pv_sig_state)
return;
/* Can't look at terminal flags if backgrounded. */
if (1 == pv_sig_state->flags.suspend_stderr)
return;
if (0 != tcgetattr(STDERR_FILENO, &terminal_attributes)) {
debug("%s: %s", "failed to read terminal attributes", strerror(errno));
return;
}
/* Can't set terminal flags if backgrounded. */
if (1 == pv_sig_state->flags.suspend_stderr)
return;
if (0 != (terminal_attributes.c_lflag & ECHOCTL)) {
terminal_attributes.c_lflag -= ECHOCTL;
if (0 == tcsetattr(STDERR_FILENO, TCSANOW, &terminal_attributes)) {
pv_sig_state->flags.set_tty_echoctl_on_exit = 1;
debug("%s", "cleared terminal ECHOCTL attribute");
#if HAVE_IPC
/*
* In "-c" mode with IPC, make all "pv -c" instances
* aware that ECHOCTL was cleared, so the last one
* can set it on exit.
*/
if (pv_sig_state->control.cursor && (NULL != pv_sig_state->cursor.shared)
&& (!pv_sig_state->cursor.noipc)) {
pv_sig_state->cursor.shared->tty_echoctl_cleared = true;
}
#endif
} else {
debug("%s: %s", "failed to clear terminal ECHOCTL attribute", strerror(errno));
}
}
}
#endif /* ECHOCTL */
/*
* Handle SIGTTOU (tty output for background process) by setting the flag to
* suspend writes to stderr, to stop the terminal being interfered with when
* pv is stopped and put into the background. On a subsequent SIGCONT, pv
* will try writing to the terminal again, in case it was put into the
* background and later put into the foreground again.
*
* When a SIGTTOU is raised, the rest of the pipeline gets stopped too, so
* transfers involving pipelines need pv to send a SIGCONT to the rest of
* the process group here, otherwise backgrounding stops transfers involving
* pipes.
*/
static void pv_sig_ttou( /*@unused@ */ __attribute__((unused))
int s)
{
if (NULL == pv_sig_state)
return;
if (1 != pv_sig_state->flags.suspend_stderr) {
debug("%s", "SIGTTOU - suspending stderr");
pv_sig_state->flags.suspend_stderr = 1;
/* Also tell the SIGCONT handler to do nothing next time. */
pv_sig_state->flags.skip_next_sigcont++;
/* Raise an immediate SIGCONT to bring the rest of the pipeline back up. */
/*@-unrecog@ *//* splint doesn't know about killpg() */
if (0 != killpg(getpgrp(), SIGCONT)) {
debug("%s: %s", "killpg", strerror(errno));
}
/*@+unrecog@ */
} else {
debug("%s", "SIGTTOU - but stderr was already suspended");
}
}
@@ -46,88 +171,231 @@ static void pv_sig_ttou( __attribute__ ((unused))
* 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( __attribute__ ((unused))
static void pv_sig_tstp( /*@unused@ */ __attribute__((unused))
int s)
{
gettimeofday(&(pv_sig_state->pv_sig_tstp_time), NULL);
raise(SIGSTOP);
if (NULL == pv_sig_state)
return;
pv_elapsedtime_read(&(pv_sig_state->signal.when_tstp_arrived));
if (0 != raise(SIGSTOP)) {
debug("%s: %s", "raise", strerror(errno));
}
}
/*
* Handle SIGCONT (continue if stopped) by adding the elapsed time since the
* 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).
* terminal again.
*/
static void pv_sig_cont( __attribute__ ((unused))
static void pv_sig_cont( /*@unused@ */ __attribute__((unused))
int s)
{
struct timeval tv;
struct termios t;
struct timespec current_time;
struct timespec time_spent_stopped;
pv_sig_state->pv_sig_newsize = 1;
if (0 == pv_sig_state->pv_sig_tstp_time.tv_sec) {
tcgetattr(STDERR_FILENO, &t);
t.c_lflag |= TOSTOP;
tcsetattr(STDERR_FILENO, TCSANOW, &t);
#ifdef HAVE_IPC
pv_crs_needreinit(pv_sig_state);
#endif
if (NULL == pv_sig_state)
return;
if (pv_sig_state->flags.skip_next_sigcont > 0) {
debug("%s: %d", "SIGCONT received but ignored - current value of skip_next_sigcont",
pv_sig_state->flags.skip_next_sigcont);
pv_sig_state->flags.skip_next_sigcont--;
return;
} else if (pv_sig_state->flags.skip_next_sigcont < 0) {
pv_sig_state->flags.skip_next_sigcont = 0;
debug("%s", "skip_next_sigcont underrun cleared");
}
gettimeofday(&tv, NULL);
debug("%s: %d", "SIGCONT received - current value of suspend_stderr", pv_sig_state->flags.suspend_stderr);
pv_sig_state->pv_sig_toffset.tv_sec +=
(tv.tv_sec - pv_sig_state->pv_sig_tstp_time.tv_sec);
pv_sig_state->pv_sig_toffset.tv_usec +=
(tv.tv_usec - pv_sig_state->pv_sig_tstp_time.tv_usec);
if (pv_sig_state->pv_sig_toffset.tv_usec >= 1000000) {
pv_sig_state->pv_sig_toffset.tv_sec++;
pv_sig_state->pv_sig_toffset.tv_usec -= 1000000;
}
if (pv_sig_state->pv_sig_toffset.tv_usec < 0) {
pv_sig_state->pv_sig_toffset.tv_sec--;
pv_sig_state->pv_sig_toffset.tv_usec += 1000000;
pv_sig_state->flags.terminal_resized = 1;
/*
* Time adjustments can only be made if this SIGCONT followed a
* SIGTSTP, such that there is a stop-time to measure from.
*/
if (0 != pv_sig_state->signal.when_tstp_arrived.tv_sec) {
memset(&current_time, 0, sizeof(current_time));
memset(&time_spent_stopped, 0, sizeof(time_spent_stopped));
pv_elapsedtime_read(&current_time);
/* time spent stopped = current time - time SIGTSTP received. */
pv_elapsedtime_subtract(&time_spent_stopped, &current_time, &(pv_sig_state->signal.when_tstp_arrived));
/* add time spent stopped to the total stopped-time count. */
pv_elapsedtime_add(&(pv_sig_state->signal.total_stoppage_time),
&(pv_sig_state->signal.total_stoppage_time), &time_spent_stopped);
/* In watchfd mode, update the stoppage time of all watched fds. */
if (pv_sig_state->watchfd.count > 0 && NULL != pv_sig_state->watchfd.watching) {
unsigned int watch_idx;
for (watch_idx = 0; watch_idx < pv_sig_state->watchfd.count; watch_idx++) {
int info_idx;
if (pv_sig_state->watchfd.watching[watch_idx].finished)
continue;
if (NULL == pv_sig_state->watchfd.watching[watch_idx].info_array)
continue;
for (info_idx = 0; info_idx < pv_sig_state->watchfd.watching[watch_idx].array_length;
info_idx++) {
pvwatchfd_t info_item =
&(pv_sig_state->watchfd.watching[watch_idx].info_array[info_idx]);
if (info_item->unused)
continue;
if (!info_item->displayable)
continue;
pv_elapsedtime_add(&(info_item->total_stoppage_time),
&(info_item->total_stoppage_time), &time_spent_stopped);
}
}
}
/* reset the SIGTSTP receipt time. */
pv_elapsedtime_zero(&(pv_sig_state->signal.when_tstp_arrived));
}
pv_sig_state->pv_sig_tstp_time.tv_sec = 0;
pv_sig_state->pv_sig_tstp_time.tv_usec = 0;
if (pv_sig_state->pv_sig_old_stderr != -1) {
dup2(pv_sig_state->pv_sig_old_stderr, STDERR_FILENO);
close(pv_sig_state->pv_sig_old_stderr);
pv_sig_state->pv_sig_old_stderr = -1;
/*
* Try resuming the use of stderr, if it had been suspended, but
* only if pv is now in the foreground.
*/
if (1 == pv_sig_state->flags.suspend_stderr) {
if (pv_in_foreground()) {
debug("%s", "SIGCONT - resuming stderr");
pv_sig_state->flags.suspend_stderr = 0;
} else {
debug("%s", "SIGCONT but still in background - not resuming stderr");
}
}
tcgetattr(STDERR_FILENO, &t);
t.c_lflag |= TOSTOP;
tcsetattr(STDERR_FILENO, TCSANOW, &t);
if (0 == pv_sig_state->flags.suspend_stderr) {
pv_sig_ensure_tty_tostop();
#ifdef HAVE_IPC
pv_crs_needreinit(pv_sig_state);
pv_crs_needreinit(&(pv_sig_state->cursor));
#endif
}
}
#ifdef SIGWINCH
/*
* Handle SIGWINCH (window size changed) by setting a flag.
*/
static void pv_sig_winch( __attribute__ ((unused))
static void pv_sig_winch( /*@unused@ */ __attribute__((unused))
int s)
{
pv_sig_state->pv_sig_newsize = 1;
if (NULL == pv_sig_state)
return;
pv_sig_state->flags.terminal_resized = 1;
}
#endif
/*
* Handle termination signals by recording which one was received, and then
* setting the abort flag.
*/
static void pv_sig_term(int s)
{
if (NULL == pv_sig_state)
return;
pv_sig_state->flags.terminating_signal = (sig_atomic_t) s;
pv_sig_state->flags.trigger_exit = 1;
}
#ifdef PV_REMOTE_CONTROL
/*
* Handle a SIGUSR2 by recording the PID that sent it, and setting a flag to
* say it was received.
*/
static void pv_sig_usr2( /*@unused@ */ __attribute__((unused))
int sig, siginfo_t *info, /*@unused@ */ __attribute__((unused))
void *ucontext)
{
if (NULL == pv_sig_state)
return;
if (NULL == info)
return;
pv_sig_state->signal.sender_usr2 = info->si_pid;
pv_sig_state->signal.rxusr2 = 1;
}
/*
* Handle termination signals by setting the abort flag.
* Return true if a SIGUSR2 signal has been received since the last time
* this function was called, populating *pid with the sending PID if so.
*/
static void pv_sig_term( __attribute__ ((unused))
bool pv_sigusr2_received(pvstate_t state, pid_t *pid)
{
if (NULL == state)
return false;
if (0 == state->signal.rxusr2)
return false;
if (NULL != pid)
*pid = state->signal.sender_usr2;
state->signal.rxusr2 = 0;
return true;
}
/*
* Handle a SIGUSR1 by recording the PID that sent it, and setting a flag to
* say it was received.
*/
static void pv_sig_usr1( /*@unused@ */ __attribute__((unused))
int sig, siginfo_t *info, /*@unused@ */ __attribute__((unused))
void *ucontext)
{
if (NULL == pv_sig_state)
return;
if (NULL == info)
return;
pv_sig_state->signal.sender_usr1 = info->si_pid;
pv_sig_state->signal.rxusr1 = 1;
}
/*
* Return true if a SIGUSR1 signal has been received since the last time
* this function was called, populating *pid with the sending PID if so.
*/
bool pv_sigusr1_received(pvstate_t state, pid_t *pid)
{
if (NULL == state)
return false;
if (0 == state->signal.rxusr1)
return false;
if (NULL != pid)
*pid = state->signal.sender_usr1;
state->signal.rxusr1 = 0;
return true;
}
#endif /* PV_REMOTE_CONTROL */
/*
* Handle alarm signals by doing nothing.
*
* An empty signal handler is used, instead of SIG_IGN, because ignoring the
* signal with SIG_IGN prevents it from doing anything at all - meaning it
* would not interrupt blocking write() calls, which is what pv uses alarm
* signals for.
*/
static void pv_sig_alrm( /*@unused@ */ __attribute__((unused))
int s)
{
pv_sig_state->pv_sig_abort = 1;
debug("%s", "SIGALRM received");
/* Do nothing. */
}
@@ -136,42 +404,57 @@ static void pv_sig_term( __attribute__ ((unused))
*/
void pv_sig_init(pvstate_t state)
{
struct sigaction sa;
static struct sigaction sa;
memset(&sa, 0, sizeof(sa));
/*
* Wherever a "struct sigaction" is used, it is declared static and
* explicitly zeroed before use, because it may contain deeper
* structures (e.g. "sigset_t") which trigger splint warnings about
* potential memory leaks.
*/
pv_sig_state = state;
pv_sig_state->pv_sig_old_stderr = -1;
pv_sig_state->pv_sig_tstp_time.tv_sec = 0;
pv_sig_state->pv_sig_tstp_time.tv_usec = 0;
pv_sig_state->pv_sig_toffset.tv_sec = 0;
pv_sig_state->pv_sig_toffset.tv_usec = 0;
pv_sig_state->flags.suspend_stderr = 0;
pv_elapsedtime_zero(&(pv_sig_state->signal.when_tstp_arrived));
pv_elapsedtime_zero(&(pv_sig_state->signal.total_stoppage_time));
/*
* Ignore SIGPIPE, so we don't die if stdout is a pipe and the other
* end closes unexpectedly.
* All sigemptyset() and sigaction() return values are ignored, as
* there is no reasonable action to take about any error they
* return.
*/
/*
* Ignore SIGPIPE, in case the output is a pipe and the other end
* closes unexpectedly.
*/
sa.sa_handler = SIG_IGN;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGPIPE, &sa, &(pv_sig_state->pv_sig_old_sigpipe));
(void) sigaction(SIGPIPE, &sa, &(pv_sig_state->signal.old_sigpipe));
/*
* Handle SIGTTOU by continuing with output switched off, so that we
* can be stopped and backgrounded without messing up the terminal.
* Handle SIGTTOU by continuing with the display switched off, to
* allow pv to be stopped and backgrounded without messing up the
* terminal.
*/
pv_sig_state->flags.skip_next_sigcont = 0;
sa.sa_handler = pv_sig_ttou;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGTTOU, &sa, &(pv_sig_state->pv_sig_old_sigttou));
(void) sigaction(SIGTTOU, &sa, &(pv_sig_state->signal.old_sigttou));
/*
* Handle SIGTSTP by storing the time the signal happened for later
* use by pv_sig_cont(), and then stopping the process.
*/
sa.sa_handler = pv_sig_tstp;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGTSTP, &sa, &(pv_sig_state->pv_sig_old_sigtstp));
(void) sigaction(SIGTSTP, &sa, &(pv_sig_state->signal.old_sigtstp));
/*
* Handle SIGCONT by adding the elapsed time since the last SIGTSTP
@@ -179,53 +462,204 @@ void pv_sig_init(pvstate_t state)
* terminal again.
*/
sa.sa_handler = pv_sig_cont;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGCONT, &sa, &(pv_sig_state->pv_sig_old_sigcont));
(void) sigaction(SIGCONT, &sa, &(pv_sig_state->signal.old_sigcont));
/*
* Handle SIGWINCH by setting a flag to let the main loop know it
* has to reread the terminal size.
*/
#ifdef SIGWINCH
sa.sa_handler = pv_sig_winch;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGWINCH, &sa, &(pv_sig_state->pv_sig_old_sigwinch));
(void) sigaction(SIGWINCH, &sa, &(pv_sig_state->signal.old_sigwinch));
#endif
/*
* Handle SIGINT, SIGHUP, SIGTERM by setting a flag to let the
* main loop know it should quit now.
*/
sa.sa_handler = pv_sig_term;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGINT, &sa, &(pv_sig_state->pv_sig_old_sigint));
(void) sigaction(SIGINT, &sa, &(pv_sig_state->signal.old_sigint));
sa.sa_handler = pv_sig_term;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGHUP, &sa, &(pv_sig_state->pv_sig_old_sighup));
(void) sigaction(SIGHUP, &sa, &(pv_sig_state->signal.old_sighup));
sa.sa_handler = pv_sig_term;
sigemptyset(&(sa.sa_mask));
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGTERM, &sa, &(pv_sig_state->pv_sig_old_sigterm));
(void) sigaction(SIGTERM, &sa, &(pv_sig_state->signal.old_sigterm));
#ifdef PV_REMOTE_CONTROL
/*
* Handle SIGUSR2 by setting a flag to say the signal has been
* received, and storing the sending process's PID.
*/
memset(&sa, 0, sizeof(sa));
sa.sa_sigaction = pv_sig_usr2;
(void) sigemptyset(&(sa.sa_mask));
/*@-unrecog@ *//* splint doesn't know about SA_SIGINFO */
sa.sa_flags = SA_SIGINFO;
/*@+unrecog@ */
(void) sigaction(SIGUSR2, &sa, &(pv_sig_state->signal.old_sigusr2));
memset(&sa, 0, sizeof(sa));
/*
* Handle SIGUSR1 by setting a flag to say the signal has been
* received, and storing the sending process's PID.
*/
memset(&sa, 0, sizeof(sa));
sa.sa_sigaction = pv_sig_usr1;
(void) sigemptyset(&(sa.sa_mask));
/*@-unrecog@ *//* splint doesn't know about SA_SIGINFO */
sa.sa_flags = SA_SIGINFO;
/*@+unrecog@ */
(void) sigaction(SIGUSR1, &sa, &(pv_sig_state->signal.old_sigusr1));
memset(&sa, 0, sizeof(sa));
#endif /* PV_REMOTE_CONTROL */
/*
* Ensure that the TOSTOP terminal attribute is set, so that a
* SIGTTOU signal will be raised if pv attempts to write to the
* terminal while backgrounded (see the SIGTTOU handler above).
*/
pv_sig_ensure_tty_tostop();
#ifdef ECHOCTL
/* Clear the ECHOCTL terminal attribute if it's set. */
pv_sig_ensure_tty_noechoctl();
#endif
/*
* Handle SIGALRM by doing nothing, allowing alarms or interval
* timers to interrupt blocking writes (returning EINTR).
*/
sa.sa_handler = pv_sig_alrm;
(void) sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
(void) sigaction(SIGALRM, &sa, &(pv_sig_state->signal.old_sigalrm));
}
/*
* Shut down signal handling.
* Shut down signal handling. If this pv had set the TOSTOP terminal
* attribute, and is in the foreground, also turn that off (with the
* restriction that if in cursor "-c" mode, only do that if this is the last
* PV instance, otherwise leave the terminal alone).
*/
void pv_sig_fini( __attribute__ ((unused)) pvstate_t state)
void pv_sig_fini( /*@unused@ */ __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);
sigaction(SIGTSTP, &(pv_sig_state->pv_sig_old_sigtstp), NULL);
sigaction(SIGCONT, &(pv_sig_state->pv_sig_old_sigcont), NULL);
sigaction(SIGWINCH, &(pv_sig_state->pv_sig_old_sigwinch), NULL);
sigaction(SIGINT, &(pv_sig_state->pv_sig_old_sigint), NULL);
sigaction(SIGHUP, &(pv_sig_state->pv_sig_old_sighup), NULL);
sigaction(SIGTERM, &(pv_sig_state->pv_sig_old_sigterm), NULL);
bool need_to_clear_tostop = false;
bool need_to_set_echoctl = false;
if (NULL == pv_sig_state)
return;
(void) sigaction(SIGPIPE, &(pv_sig_state->signal.old_sigpipe), NULL);
(void) sigaction(SIGTTOU, &(pv_sig_state->signal.old_sigttou), NULL);
(void) sigaction(SIGTSTP, &(pv_sig_state->signal.old_sigtstp), NULL);
(void) sigaction(SIGCONT, &(pv_sig_state->signal.old_sigcont), NULL);
#ifdef SIGWINCH
(void) sigaction(SIGWINCH, &(pv_sig_state->signal.old_sigwinch), NULL);
#endif
(void) sigaction(SIGINT, &(pv_sig_state->signal.old_sigint), NULL);
(void) sigaction(SIGHUP, &(pv_sig_state->signal.old_sighup), NULL);
(void) sigaction(SIGTERM, &(pv_sig_state->signal.old_sigterm), NULL);
#ifdef PV_REMOTE_CONTROL
(void) sigaction(SIGUSR2, &(pv_sig_state->signal.old_sigusr2), NULL);
(void) sigaction(SIGUSR1, &(pv_sig_state->signal.old_sigusr1), NULL);
#endif
(void) sigaction(SIGALRM, &(pv_sig_state->signal.old_sigalrm), NULL);
need_to_clear_tostop = (1 == pv_sig_state->flags.clear_tty_tostop_on_exit) ? true : false;
if (pv_sig_state->control.cursor) {
#ifdef HAVE_IPC
/*
* Don't clear TOSTOP if other "pv -c" instances were still
* running when pv_crs_fini() ran.
*/
if (pv_sig_state->control.cursor && pv_sig_state->cursor.pvcount > 1) {
need_to_clear_tostop = false;
}
#else /* !HAVE_IPC */
/*
* Without IPC there's no way to tell whether other "pv -c"
* instances in the pipeline have finished, so clear TOSTOP
* anyway.
*/
#endif /* !HAVE_IPC */
}
debug("%s=%s", "need_to_clear_tostop", need_to_clear_tostop ? "true" : "false");
if (need_to_clear_tostop && pv_in_foreground()) {
struct termios terminal_attributes;
debug("%s", "about to clear TOSTOP terminal attribute if it is set");
if (0 != tcgetattr(STDERR_FILENO, &terminal_attributes)) {
debug("%s: %s", "tcgetattr", strerror(errno));
} else if (0 != (terminal_attributes.c_lflag & TOSTOP)) {
terminal_attributes.c_lflag -= TOSTOP;
if (0 == tcsetattr(STDERR_FILENO, TCSANOW, &terminal_attributes)) {
debug("%s", "cleared TOSTOP terminal attribute");
} else {
debug("%s: %s", "failed to clear TOSTOP terminal attribute", strerror(errno));
}
}
pv_sig_state->flags.clear_tty_tostop_on_exit = 0;
}
#ifdef ECHOCTL
need_to_set_echoctl = (1 == pv_sig_state->flags.set_tty_echoctl_on_exit) ? true : false;
if (pv_sig_state->control.cursor) {
#ifdef HAVE_IPC
/*
* Don't set ECHOCTL if other "pv -c" instances were still
* running when pv_crs_fini() ran.
*/
if (pv_sig_state->control.cursor && pv_sig_state->cursor.pvcount > 1) {
need_to_set_echoctl = false;
}
#else /* !HAVE_IPC */
/*
* Without IPC there's no way to tell whether other "pv -c"
* instances in the pipeline have finished, so set ECHOCTL
* anyway.
*/
#endif /* !HAVE_IPC */
}
debug("%s=%s", "need_to_set_echoctl", need_to_set_echoctl ? "true" : "false");
if (need_to_set_echoctl && pv_in_foreground()) {
struct termios terminal_attributes;
debug("%s", "about to set ECHOCTL terminal attribute if it is not set");
if (0 != tcgetattr(STDERR_FILENO, &terminal_attributes)) {
debug("%s: %s", "tcgetattr", strerror(errno));
} else if (0 == (terminal_attributes.c_lflag & ECHOCTL)) {
terminal_attributes.c_lflag |= ECHOCTL;
if (0 == tcsetattr(STDERR_FILENO, TCSANOW, &terminal_attributes)) {
debug("%s", "set TOSTOP terminal attribute");
} else {
debug("%s: %s", "failed to set TOSTOP terminal attribute", strerror(errno));
}
}
pv_sig_state->flags.clear_tty_tostop_on_exit = 0;
}
#endif /* ECHOCTL */
}
@@ -234,17 +668,17 @@ void pv_sig_fini( __attribute__ ((unused)) pvstate_t state)
*/
void pv_sig_nopause(void)
{
struct sigaction sa;
sigset_t signal_set, signal_oldset;
sa.sa_handler = SIG_IGN;
sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGTSTP, &sa, NULL);
debug("%s", "blocking SIGTSTP, SIGCONT");
sa.sa_handler = SIG_DFL;
sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGCONT, &sa, NULL);
(void) sigemptyset(&signal_set);
(void) sigaddset(&signal_set, SIGTSTP);
(void) sigaddset(&signal_set, SIGCONT);
if (0 != sigprocmask(SIG_BLOCK, &signal_set, &signal_oldset)) {
debug("%s: %s", "failed to set signal mask", strerror(errno));
}
}
@@ -253,50 +687,49 @@ void pv_sig_nopause(void)
*/
void pv_sig_allowpause(void)
{
struct sigaction sa;
sigset_t signal_set, signal_oldset;
sa.sa_handler = pv_sig_tstp;
sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGTSTP, &sa, NULL);
debug("%s", "unblocking SIGTSTP, SIGCONT");
sa.sa_handler = pv_sig_cont;
sigemptyset(&(sa.sa_mask));
sa.sa_flags = 0;
sigaction(SIGCONT, &sa, NULL);
(void) sigemptyset(&signal_set);
(void) sigaddset(&signal_set, SIGTSTP);
(void) sigaddset(&signal_set, SIGCONT);
if (0 != sigprocmask(SIG_UNBLOCK, &signal_set, &signal_oldset)) {
debug("%s: %s", "failed to set signal mask", strerror(errno));
}
}
/*
* If we have redirected stderr to /dev/null, check every second or so to
* see whether we can write to the terminal again - this is so that if we
* get backgrounded, then foregrounded again, we start writing to the
* terminal again.
* If output to stderr is suspended, check once a second whether it is safe
* to write to the terminal. This is so that if pv is put into the
* background, and then brought into the foreground again, it can resume
* terminal output.
*/
void pv_sig_checkbg(void)
{
static time_t next_check = 0;
struct termios t;
if (NULL == pv_sig_state)
return;
if (time(NULL) < next_check)
return;
next_check = time(NULL) + 1;
if (-1 == pv_sig_state->pv_sig_old_stderr)
if (0 == pv_sig_state->flags.suspend_stderr)
return;
dup2(pv_sig_state->pv_sig_old_stderr, STDERR_FILENO);
close(pv_sig_state->pv_sig_old_stderr);
pv_sig_state->pv_sig_old_stderr = -1;
if (!pv_in_foreground())
return;
tcgetattr(STDERR_FILENO, &t);
t.c_lflag |= TOSTOP;
tcsetattr(STDERR_FILENO, TCSANOW, &t);
debug("%s: %s", "pv_sig_checkbg", "attempting to resume stderr");
pv_sig_state->flags.suspend_stderr = 0;
pv_sig_ensure_tty_tostop();
#ifdef HAVE_IPC
pv_crs_needreinit(pv_sig_state);
pv_crs_needreinit(&(pv_sig_state->cursor));
#endif
}
/* EOF */
+825 -145
View File
File diff suppressed because it is too large Load Diff
+447
View File
@@ -0,0 +1,447 @@
/*
* Functions for portably managing strings.
*
* Copyright 2023-2026 Andrew Wood
*
* License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
*/
#include "config.h"
#include "pv.h"
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <errno.h>
#if defined(ENABLE_NLS) && defined(HAVE_WCHAR_H)
#include <wchar.h>
#if defined(HAVE_WCTYPE_H)
#include <wctype.h>
#endif
#endif
/*
* Wrapper for snprintf(), falling back to sprintf() on systems without that
* function.
*
* Returns -1 if "format" is NULL.
*
* Otherwise, ensures that the buffer "str" is always terminated with a '\0'
* byte, before returning whatever the system's vsnprintf() or vsprintf()
* returned.
*/
int pv_snprintf(char *str, size_t size, const char *format, ...)
{
va_list ap;
int ret;
if (NULL == format) {
errno = EINVAL;
return -1;
}
if (NULL != str && size > 0)
str[0] = '\0';
va_start(ap, format);
/*@-nullpass@ */
#ifdef HAVE_VSNPRINTF
ret = vsnprintf(str, size, format, ap); /* flawfinder: ignore */
#else /* ! HAVE_VSNPRINTF */
ret = vsprintf(str, format, ap); /* flawfinder: ignore */
#endif /* HAVE_VSNPRINTF */
/*@+nullpass@ *//* explicitly allowing NULL to behave as vsnprintf() does. */
va_end(ap);
if (NULL != str && size > 0)
str[size - 1] = '\0';
/*
* flawfinder rationale: this function replaces snprintf so
* explicitly takes a non-constant format; also it explicitly
* \0-terminates the output buffer, as flawfinder warns that some
* sprintf() variants do not.
*/
return ret;
}
/*
* Wrapper for asprintf(), working around it on systems without that
* function.
*
* Allocates a buffer large enough for the expanded format string plus a
* terminating '\0' byte, points *strp to it, and returns whatever the
* system's vasprintf() or vsprintf() returned.
*
* Returns -1 if "strp" is NULL.
* Returns -1 and sets *strp to NULL if "format" is NULL.
*/
int pv_asprintf(nullable_string_ptr *strp, const char *format, ...)
{
va_list ap;
char *new_string = NULL;
size_t new_size = 0;
int ret;
if (NULL == strp)
return -1;
*strp = NULL;
if (NULL == format)
return -1;
#ifdef HAVE_VASPRINTF
va_start(ap, format);
/*@-unrecog@ */
ret = vasprintf(strp, format, ap); /* flawfinder: ignore */
/*@+unrecog@ *//* splint doesn't know about vasprintf(). */
va_end(ap);
if (ret < 0)
return ret;
new_string = *strp;
new_size = (size_t) ret + 1;
#else /* ! HAVE_VASPRINTF */
#ifdef HAVE_VSNPRINTF
/* Find out the required size. */
{
char tmpbuf[8]; /* flawfinder: ignore - bounded by vsnprintf(). */
va_start(ap, format);
ret = vsnprintf(tmpbuf, 7, format, ap); /* flawfinder: ignore */
va_end(ap);
if (ret < 0)
return ret;
}
/* Allocate a buffer big enough to include a terminating \0. */
new_size = (size_t) ret + 1;
new_string = malloc(new_size);
if (NULL == new_string)
return -1;
new_string[0] = '\0';
/* Generate the string. */
va_start(ap, format);
ret = vsnprintf(new_string, new_size, format, ap); /* flawfinder: ignore */
va_end(ap);
if (ret < 0) {
int old_errno;
old_errno = errno;
free(new_string);
errno = old_errno;
return ret;
}
*strp = new_string;
#else /* ! HAVE_VSNPRINTF */
/*
* Without vsnprintf(), determining the required size is impossible
* without a buffer to write to. The best effort here is to
* allocate a large buffer, write to it, then duplicate the string
* afterwards. This means there's an arbitrary upper bound on
* string size and there will be some heap fragmentation.
*/
/* Allocate a large buffer for the string. */
new_size = 16384;
new_string = malloc(new_size);
if (NULL == new_string)
return -1;
new_string[0] = '\0';
/* Generate the string. */
va_start(ap, format);
ret = vsprintf(new_string, format, ap); /* flawfinder: ignore */
va_end(ap);
if (ret < 0) {
int old_errno;
old_errno = errno;
free(new_string);
errno = old_errno;
return ret;
}
/* Duplicate the string into a buffer just long enough for it. */
*strp = pv_strdup(new_string);
if (NULL == *strp) {
int old_errno;
old_errno = errno;
free(new_string);
errno = old_errno;
return -1;
}
/* Free the original large buffer, and use the new one instead. */
free(new_string);
new_string = *strp;
#endif /* HAVE_VSNPRINTF */
#endif /* HAVE_VASPRINTF */
/* Terminate the new string. */
if (NULL != new_string && new_size > 0)
new_string[new_size - 1] = '\0';
/*
* flawfinder rationale: this function replaces asprintf so
* explicitly takes a non-constant format; also it explicitly
* \0-terminates the output buffer.
*/
return ret;
}
/*
* Implementation of strlcat() where it is unavailable: append a string to a
* buffer, constraining the buffer to a particular size and ensuring
* termination with '\0'.
*
* Appends the string "src" to the buffer "dst", assuming "dst" is "dstsize"
* bytes long, and ensuring that "dst" is always terminated with a '\0'
* byte.
*
* Returns the intended length of the string, not including the terminating
* '\0', i.e. strlen(src)+strlen(dst), regardless of whether truncation
* occurred.
*
* Note that this implementation has the side effect that "dst" will always
* be terminated with a '\0' even if "src" was zero bytes long.
*/
size_t pv_strlcat(char *dst, const char *src, size_t dstsize)
{
#ifdef HAVE_STRLCAT
size_t result;
/*@-unrecog@ *//* splint doesn't recognise strlcat. */
result = strlcat(dst, src, dstsize);
/*@+unrecog@ */
if ((NULL != dst) && (dstsize > 0))
dst[dstsize - 1] = '\0';
return result;
#else
size_t dstlen, srclen, available;
if (NULL == dst)
return 0;
if (NULL == src)
return 0;
if (0 == dstsize)
return 0;
dst[dstsize - 1] = '\0';
dstlen = strlen(dst); /* flawfinder: ignore */
srclen = strlen(src); /* flawfinder: ignore */
/*
* flawfinder rationale: src must explicitly be \0 terminated, so
* this is up to the caller; with dst, \0 termination is enforced
* before strlen() is called.
*/
available = dstsize - dstlen;
if (available > 1)
(void) pv_snprintf(dst + dstlen, available, "%.*s", available - 1, src);
return dstlen + srclen;
#endif
}
/*
* Allocate and return a duplicate of a \0-terminated string, ensuring that
* the duplicate is also \0-terminated. Returns NULL on error.
*/
/*@null@ */
/*@only@ */
char *pv_strdup(const /*@null@ */ char *original)
{
size_t length;
char *duplicate;
if (NULL == original) {
errno = EINVAL;
return NULL;
}
length = strlen(original); /* flawfinder: ignore */
/*
* flawfinder rationale: the original string is explicitly required
* to be \0 terminated.
*/
duplicate = calloc(1, 1 + length);
if (NULL == duplicate)
return NULL;
memcpy(duplicate, original, length); /* flawfinder: ignore */
/*
* flawfinder rationale: the buffer is explicitly allocated to be
* large enough.
*/
duplicate[length] = '\0';
return duplicate;
}
/*
* Return a pointer to the last matching character in the buffer, or NULL if
* not found.
*/
/*@null@ */
/*@temp@ */
void *pv_memrchr(const void *buffer, int match, size_t length)
{
#ifdef HAVE_MEMRCHR
/*@-unrecog@ *//* splint doesn't know of memrchr() */
return memrchr(buffer, match, length);
/*@+unrecog@ */
#else
unsigned char *ptr;
if (length < 1)
return NULL;
ptr = ((unsigned char *) buffer) + length - 1;
while (ptr >= (unsigned char *) buffer) {
if ((int) (ptr[0]) == match)
return (void *) ptr;
ptr--;
}
return NULL;
#endif
}
/*
* Return the number of display columns needed to show the
* non-null-terminated string "string" whose length in bytes is "bytes".
*
* Skips ECMA-48 CSI (ESC [ ...) sequences, but any other control characters
* are treated as printable.
*
* Internally, after skipping CSI sequences, the string is converted to a
* wide character string, and each wide character's width is checked with
* "wcswidth()".
*
* If NLS is disabled, or the string cannot be converted, this just returns
* the number of bytes in the string that aren't part of CSI sequences.
*
* Note that this function uses internal buffers if the string is short
* enough, otherwise it has to call malloc() and free(), so it becomes less
* efficient with larger strings.
*/
size_t pv_strwidth(const char *string, size_t bytes)
{
char *allocated_raw = NULL;
static char internal_raw[256]; /* flawfinder: ignore - bounded */
char *raw_string = NULL;
size_t read_pos, write_pos;
size_t raw_bytes, width;
#if defined(ENABLE_NLS) && defined(HAVE_WCHAR_H)
size_t wide_char_count;
size_t wide_string_buffer_size;
wchar_t *allocated_wide = NULL;
static wchar_t internal_wide[256]; /* flawfinder: ignore - bounded */
wchar_t *wide_string = NULL;
#endif /* defined(ENABLE_NLS) && defined(HAVE_WCHAR_H) */
if (NULL == string)
return 0;
if (0 == bytes)
return 0;
if (bytes < sizeof(internal_raw) - 1) {
raw_string = internal_raw;
} else {
allocated_raw = calloc(1, 1 + bytes);
if (NULL == allocated_raw)
return bytes;
raw_string = allocated_raw;
}
/* Copy the original string, skipping ECMA-48 CSI sequences. */
for (read_pos = 0, write_pos = 0; read_pos < bytes; read_pos++) {
if ((string[read_pos] != '\033') || (read_pos >= bytes - 1) || (string[read_pos + 1] != '[')) {
raw_string[write_pos++] = string[read_pos];
continue;
}
read_pos += 2;
while ((read_pos < bytes - 1)
&& ((string[read_pos] >= '0' && string[read_pos] <= '9')
|| (';' == string[read_pos])
)
) {
read_pos++;
}
}
raw_string[write_pos] = '\0';
raw_bytes = write_pos;
width = raw_bytes;
#if defined(ENABLE_NLS) && defined(HAVE_WCHAR_H)
/*@-nullpass@ */
/*
* splint note: mbstowcs() manual page on Linux explicitly says it
* takes NULL.
*/
wide_char_count = mbstowcs(NULL, raw_string, 0);
/*@+nullpass@ */
if (wide_char_count == (size_t) -1) {
debug("%s: %s: %s", "mbstowcs", raw_string, strerror(errno));
if (NULL != allocated_raw)
free(allocated_raw);
return raw_bytes;
}
wide_string_buffer_size = sizeof(*wide_string) * (1 + wide_char_count);
if (wide_string_buffer_size < sizeof(internal_wide)) {
wide_string = internal_wide;
} else {
allocated_wide = malloc(wide_string_buffer_size);
if (NULL == allocated_wide) {
pv_perror("%s", "malloc");
if (NULL != allocated_raw)
free(allocated_raw);
return raw_bytes;
}
wide_string = allocated_wide;
}
memset(wide_string, 0, wide_string_buffer_size);
if (mbstowcs(wide_string, raw_string, 1 + wide_char_count) == (size_t) -1) {
debug("%s: %s: %s", "mbstowcs", raw_string, strerror(errno));
} else if (NULL != wide_string) {
/*@-unrecog@ *//* splint doesn't see the prototype. */
width = wcswidth(wide_string, wide_char_count);
/*@+unrecog@ */
} else {
width = 0;
}
if (NULL != allocated_wide)
free(allocated_wide);
#endif /* defined(ENABLE_NLS) && defined(HAVE_WCHAR_H) */
if (NULL != allocated_raw)
free(allocated_raw);
return width;
}
/*
* Return true if the character is printable 7-bit ASCII. This function is
* used instead of the macro from <ctype.h> to avoid causing versioned glibc
* dependencies on some systems.
*/
bool pv_isprint(char c)
{
return ((c >= (char) 32) && (c <= (char) 126)) ? true : false;
}
+1620 -516
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More