46 Commits
Author SHA1 Message Date
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
76 changed files with 3198 additions and 1594 deletions
+3 -3
View File
@@ -5,10 +5,10 @@ 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 docs/benchmark.sh
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
EXTRA_DIST = docs/pv.1.md docs/benchmark.sh docs/test-on-vm-lab.sh docs/build-package.sh docs/release.sh
pv_SOURCES = \
src/main/debug.c \
@@ -105,7 +105,7 @@ indent:
cd $(srcdir) && indent -npro -kr -i8 -cd42 -c45 -l120 src/*/*.c
indentclean:
rm -f $(srcdir)/*/*.c~
rm -f $(srcdir)/src/*/*.c~
analyse: $(pv_SOURCES:.c=.e) FORCE
grep -E -e '^Finished checking --' -e 'Hits = ' $+ 2>/dev/null || true
+7 -2
View File
@@ -4,7 +4,7 @@ dnl Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023-2024 Andrew Wood
dnl
dnl License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'.
AC_INIT([pv], [1.9.7], [pv@ivarch.com], [pv], [https://www.ivarch.com/programs/pv.shtml])
AC_INIT([pv], [1.9.15], [pv@ivarch.com], [pv], [https://www.ivarch.com/programs/pv.shtml])
AC_CONFIG_SRCDIR([src/include/config.h.in])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([src/include/config.h])
@@ -40,6 +40,7 @@ AC_CHECK_HEADERS([sys/ioctl.h])
AC_CHECK_HEADERS([libintl.h locale.h])
AC_CHECK_HEADERS([sys/sysmacros.h])
AC_CHECK_MEMBERS([struct stat.st_blksize])
AC_CHECK_DECLS([SA_SIGINFO], [], [], [[#include <signal.h>]])
AC_SEARCH_LIBS([sqrtl],[m])
AC_CHECK_HEADERS([math.h])
@@ -98,7 +99,11 @@ 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"])
+2
View File
@@ -103,6 +103,8 @@ is acknowledged and greatly appreciated:
* Joachim Haga - suggested showing progress in the window title ([#3](https://codeberg.org/a-j-wood/pv/issues/3))
* [Martin Sarsale](https://github.com/runa) - suggested showing progress in the process title ([#4](https://codeberg.org/a-j-wood/pv/issues/4))
* [2bits](https://github.com/2bits) - reported position sensing fault with **--watchfd** in 1.9.0 ([#118](https://codeberg.org/a-j-wood/pv/issues/118))
* [heitbaum](https://codeberg.org/heitbaum) - assisted with cross-compilation fault introduced in 1.9.7 ([#120](https://codeberg.org/a-j-wood/pv/issues/120))
* [meego](https://codeberg.org/meego) - suggested "**%nL**", the last line preview ([#121](https://codeberg.org/a-j-wood/pv/issues/121))
Translations provided through [Codeberg Weblate](https://translate.codeberg.org/projects/pv/):
+1
View File
@@ -161,6 +161,7 @@ The package maintainer should run through these steps for a new release:
* 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
+13
View File
@@ -1,3 +1,16 @@
### 1.9.15 - 8 December 2024
* *feature:* new **--format** sequence "**%nL**", showing the most recent line written ([#121](https://codeberg.org/a-j-wood/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/a-j-wood/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/a-j-wood/pv/issues/120))
* *fix:* allow **extra-display** to be changed by **--remote** ([#123](https://codeberg.org/a-j-wood/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/a-j-wood/pv/issues/3), [#4](https://codeberg.org/a-j-wood/pv/issues/4))
+146
View File
@@ -0,0 +1,146 @@
#!/bin/sh
#
# Usage: sh build-package.sh source-1.2.3.tar.gz
#
# Given a tar.gz, build a package for the current OS.
#
# Supports these packaging types:
#
# .deb (Debian, Ubuntu, etc) - requires dpkg-dev, debhelper
# .rpm (AlmaLinux, Rocky Linux, OpenSUSE etc) - requires rpmbuild
#
# If the MAINTAINER environment variable is set, this is used as a GPG key
# ID for package signing.
#
# The packages built with this script are not "official", in that they are
# not part of any Linux distribution and may not follow the distribution's
# policies. Use at your own risk.
sourceArchive="$1"
test -n "${sourceArchive}" && test -f "${sourceArchive}" \
|| { printf "%s: %s: %s\n" "${0##*/}" "${sourceArchive}" "source archive not found" 1>&2; exit 1; }
packageName="pv"
packageSummary="Shell pipeline element to meter data passing through"
packageDescription="\
pv (Pipe Viewer) 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."
packageUrl="https://www.ivarch.com/programs/pv.shtml"
sourceUrl="https://www.ivarch.com/programs/sources/${packageName}-%{version}.tar.gz"
packageEmail="Andrew Wood <pv@ivarch.com>"
workDir="$(mktemp -d)" || exit 1
trap 'rm -rf "${workDir}"' EXIT
# Infer the version from the most recent NEWS entry.
version="$(tar xzf "${sourceArchive}" --wildcards -O '*/docs/NEWS.md' 2>/dev/null | awk '/^### [0-9]/{print $2}' | sed -n 1p)"
if command -v rpmbuild >/dev/null 2>&1; then
# Build an RPM.
cat > "${workDir}"/spec <<EOF
Summary: ${packageSummary}
Name: ${packageName}
Version: ${version}
Release: 1%{?dist}
License: GPLv3+
Source: ${sourceUrl}
Url: ${packageUrl}
%description
${packageDescription}
%prep
%setup -q
%build
%configure
make %{?_smp_mflags}
%install
test -n "\${RPM_BUILD_ROOT}" && test "\${RPM_BUILD_ROOT}" != '/' && rm -rf "\${RPM_BUILD_ROOT}"
make install DESTDIR="\${RPM_BUILD_ROOT}"
rm -rf "\${RPM_BUILD_ROOT}/usr/share/doc"
%find_lang %{name}
%check
make check
%clean
test -n "\${RPM_BUILD_ROOT}" && test "\${RPM_BUILD_ROOT}" != '/' && rm -rf "\${RPM_BUILD_ROOT}"
%files -f %{name}.lang
%defattr(-, root, root)
%{_bindir}/*
%{_mandir}/man1/*
%doc README.md docs/NEWS.md docs/ACKNOWLEDGEMENTS.md docs/COPYING
%changelog
* $(date '+%a %b %d %Y') ${packageEmail} - ${version}-1
- Package built from main source.
EOF
mkdir "${workDir}/SOURCES"
cp "${sourceArchive}" "${workDir}/SOURCES/${packageName}-${version}.tar.gz"
rpmbuild -D "%_topdir ${workDir}" -bb "${workDir}/spec" || exit 1
if test -n "${MAINTAINER}"; then
# Sign the RPMs.
rpm -D "%_gpg_name ${MAINTAINER}" --addsign "${workDir}/RPMS"/*/*.rpm || exit 1
fi
cp -v "${workDir}/RPMS"/*/*.rpm .
fi
if command -v dpkg-buildpackage >/dev/null 2>&1; then
# Build a Debian package.
mkdir "${workDir}/build" "${workDir}/build/debian" "${workDir}/build/debian/source"
tar xzf "${sourceArchive}" -C "${workDir}/build" --strip-components=1
printf "%s\n" "10" > "${workDir}/build/debian/compat"
touch "${workDir}/build/debian/copyright"
printf "%s\n" "3.0 (quilt)" > "${workDir}/build/debian/source/format"
cat > "${workDir}/build/debian/rules" <<EOF
#!/usr/bin/make -f
export DH_VERBOSE = 1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh \$@
EOF
chmod 700 "${workDir}/build/debian/rules"
cat > "${workDir}/build/debian/control" <<EOF
Source: ${packageName}
Maintainer: ${packageEmail}
Section: misc
Priority: optional
Standards-Version: 3.9.2
Build-Depends: debhelper (>= 9)
Package: ${packageName}
Architecture: any
Depends: \${misc:Depends}
Description: ${packageSummary}
$(printf "%s\n.\n" "${packageDescription}" | sed 's,^, ,')
EOF
cat > "${workDir}/build/debian/changelog" <<EOF
${packageName} (${version}-1) UNRELEASED; urgency=low
* Package built from main source.
-- ${packageEmail} $(date -R)
EOF
if test -n "${MAINTAINER}"; then
(cd "${workDir}/build" && dpkg-buildpackage --build=binary --force-sign --sign-key="${MAINTAINER}") || exit 1
else
(cd "${workDir}/build" && dpkg-buildpackage --build=binary) || exit 1
fi
cp -v "${workDir}"/*.deb . || exit 1
fi
+44 -16
View File
@@ -1,4 +1,4 @@
.TH PV 1 2024-12-02 pv-1.9.7 "User Commands"
.TH PV 1 2024-12-08 pv-1.9.15 "User Commands"
.\"
.SH NAME
pv \- monitor the progress of data through a pipe
@@ -471,51 +471,66 @@ Print version information on standard output and exit successfully.
Format strings used by \*(lq\fB\-\-format\fR\*(rq and
\*(lq\fB\-\-extra\-display\fR\*(rq can contain the following sequences:
.TP
.B %p
Progress bar.
Expands to fill the remaining space.
Should only be specified once.
.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
.B %t
.B %{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
.BR %t ", " %{timer}
Elapsed time.
Equivalent to \*(lq\fB\-\-timer\fR\*(rq.
.TP
.B %e
.BR %e ", " %{eta}
ETA as time remaining.
Equivalent to \*(lq\fB\-\-eta\fR\*(rq.
.TP
.B %I
.BR %I ", " %{fineta}
ETA as local time at which the transfer will finish.
Equivalent to \*(lq\fB\-\-fineta\fR\*(rq.
.TP
.B %r
.BR %r ", " %{rate}
Current data transfer rate.
Equivalent to \*(lq\fB\-\-rate\fR\*(rq.
.TP
.B %a
.BR %a ", " %{average-rate}
Average data transfer rate.
Equivalent to \*(lq\fB\-\-average\-rate\fR\*(rq.
.TP
.B %b
.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 %T
.BR %T ", " %{buffer-percent}
Percentage of the transfer buffer in use.
Equivalent to \*(lq\fB\-\-buffer\-percent\fR\*(rq.
Displays \*(lq{\-\-\-\-}\*(rq if the transfer is being done with
\fBsplice\fR(2), since splicing to or from pipes does not use the buffer.
.TP
.B %nA
.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 being done with \fBsplice\fR(2), since
splicing to or from pipes does not use the buffer.
.TP
.B %N
.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 being done with \fBsplice\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
@@ -524,8 +539,8 @@ A single \*(lq%\*(rq.
.PP
Any other contents are reproduced in the progress display as-is.
.PP
The format string equivalent of turning on all display switches is
\*(lq\fB%N\~%b\~%T\~%t\~%r\~%a\~%p\~%e\~%I\~%8A\fR\*(rq.
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:
@@ -629,6 +644,15 @@ pv \-d 1234:3
pv \-d 1234
.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 \-F '%a %p : %L' big.log | processing-script
.EE
.in
.\"
.SH EXIT STATUS
An exit status of 1 indicates a problem with the \*(lq\fB\-\-remote\fR\*(rq
@@ -721,6 +745,10 @@ 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.
.\"
.SH REPORTING BUGS
Please report any bugs to \fBpv@ivarch.com\fR.
+43 -14
View File
@@ -420,53 +420,73 @@ are explicitly switched on will be shown.
Format strings used by "**\--format**" and "**\--extra-display**" can
contain the following sequences:
**%p**
**%p**, **%{progress}**
: Progress bar. Expands to fill the remaining space. Should only be
specified once. Equivalent to "**\--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}**".
**%t**
**%{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).
**%t**, **%{timer}**
: Elapsed time. Equivalent to "**\--timer**".
**%e**
**%e**, **%{eta}**
: ETA as time remaining. Equivalent to "**\--eta**".
**%I**
**%I**, **%{fineta}**
: ETA as local time at which the transfer will finish. Equivalent to
"**\--fineta**".
**%r**
**%r**, **%{rate}**
: Current data transfer rate. Equivalent to "**\--rate**".
**%a**
**%a**, **%{average-rate}**
: Average data transfer rate. Equivalent to "**\--average-rate**".
**%b**
**%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.
**%T**
**%T**, **%{buffer-percent}**
: Percentage of the transfer buffer in use. Equivalent to
"**\--buffer-percent**". Displays "{\-\-\--}" if the transfer is
being done with **splice**(2), since splicing to or from pipes does
not use the buffer.
**%nA**
**%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 being done with
**splice**(2), since splicing to or from pipes does not use the
buffer.
**%N**
**%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 being done with **splice**(2).
**%N**, **%{name}**
: Show the name prefix given by "**\--name**". Padded to 9 characters
with spaces, and suffixed with ":".
@@ -477,8 +497,8 @@ contain the following sequences:
Any other contents are reproduced in the progress display as-is.
The format string equivalent of turning on all display switches is
"**%N %b %T %t %r %a %p %e %I %8A**".
The format string equivalent of the default display switches is
"**%b %t %r %p %e**".
# EXAMPLES
@@ -557,6 +577,11 @@ been given.
pv -d 1234
Sending logs to a processing script, showing the most recent line as
part of the progress display:
pv -F '%a %p : %L' big.log | processing-script
# EXIT STATUS
An exit status of 1 indicates a problem with the "**\--remote**" or
@@ -644,6 +669,10 @@ 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.
# REPORTING BUGS
Please report any bugs to **pv@ivarch.com**.
+141
View File
@@ -0,0 +1,141 @@
#!/bin/sh
#
# Automate a portion of the release checklist. Expects to be run from a
# build directory, such as one in which "configure" has been run, i.e.
# there should be a Makefile present.
#
# If ~/.config/packaging-hosts exists, then build-package.sh is run on each
# one and the resultant packages (RPMs, DEBs, etc) are copied back.
#
# All of the release artefacts are placed in a "RELEASE-x" directory, where
# "x" is the version.
srcdir="$(awk '/^VPATH/{print $NF}' < Makefile | sed -n 1p)"
possiblyDie () {
printf "\n" >&2
tput bold >&2
printf "%s: %s\n" "release" "$*" >&2
tput sgr0 >&2
printf "\n%s\n" "Type 'y' and hit Enter to continue anyway."
read -r line
test "${line}" = "y" || exit 1
}
# The checklist is re-ordered a little so that we defer making changes (like
# "make indent") until as late as possible, in case any checks fail.
# Check MAINTAINER is provided.
test -n "${MAINTAINER}" || possiblyDie "environment variable MAINTAINER is empty"
# * Check that `po/POTFILES.in` is up to date
inFile="$(sort < "${srcdir}/po/POTFILES.in")"
realList="$(find "${srcdir}" -name "*.c" -printf "%P\n" | sort)"
test "${inFile}" = "${realList}" || possiblyDie "po/POTFILES.in is incorrect"
# * Run "`make analyse`" and see whether remaining warnings can be addressed
make analyse || possiblyDie "failed 'make analyse'"
# * Version bump and documentation checks:
# * Check that `docs/NEWS.md` is up to date
versionInNews="$(awk 'FNR==1{print $2}' "${srcdir}/docs/NEWS.md")"
printf "%s\n" "${versionInNews}" | grep -Eq '^[0-9]' || possiblyDie "version in NEWS.md (${versionInNews}) is not numeric"
# * Check the version in `configure.ac` and `docs/NEWS.md` were updated
versionInConfig="$(grep ^AC_INIT "${srcdir}/configure.ac" | cut -d '[' -f 3 | cut -d ']' -f 1)"
test "${versionInConfig}" = "${versionInNews}" || possiblyDie "version in configure.ac (${versionInConfig}) mismatches NEWS.md (${versionInNews})"
# * Check that the manual `docs/pv.1` is up to date
versionInManual="$(awk 'FNR==1 {print $5}' "${srcdir}/docs/pv.1" | cut -d - -f 2)"
test "${versionInManual}" = "${versionInNews}" || possiblyDie "version in pv.1 (${versionInManual}) mismatches NEWS.md (${versionInNews})"
# * Check that the year displayed by src/main/version.c is correct
yearInSource="$(grep -F 'printf("Copyright' "${srcdir}/src/main/version.c" | cut -d '"' -f 4)"
yearNow="$(date '+%Y')"
test "${yearInSource}" = "${yearNow}" || possiblyDie "the year in src/main/version.c (${yearInSource}) is not this year (${yearNow})"
# * Run "`make docs/pv.1.md`" and, if using VPATH, copy the result to the source directory
# We also wipe everything in "docs" so we don't accidentally package
# leftover working files.
rm -f docs/*
make docs/pv.1.md
cp docs/pv.1.md "${srcdir}/docs/pv.1.md"
# * Run "`make indent; make indent indentclean check`"
make indent
make indent indentclean
# The check will run later as part of "make distcheck".
# * Run "`make -C po update-po`"
make -C po update-po || possiblyDie "update-po failed"
# * Run "`autoreconf`" in the source directory
(cd "${srcdir}" && autoreconf -is) || possiblyDie "autoreconf failed"
# * Ensure everything has been committed to the repository
gitStatus="$(cd "${srcdir}" && git status --porcelain=v1)" || possiblyDie "failed to run 'git status'"
test -z "${gitStatus}" || possiblyDie "not everything is committed - 'git status' is not empty"
# * Consistency and build checks:
# * Wipe the build directory, and run "`configure`" there
# * Run "`make distcheck`"
# * Run "`make release MAINTAINER=<signing-user>`"
# NB "make release" implies "make distcheck".
workDir="$(mktemp -d)" || possiblyDie "mktemp failed"
trap 'chmod -R u+w "${workDir}"; rm -rf "${workDir}"' EXIT
(
cd "${workDir}" || exit 1
sh "${srcdir}/configure" || exit 1
export SKIP_VALGRIND_TESTS=1
make -j8 release || exit 1
exit 0
) || possiblyDie "failed on 'make release'"
sourceArchive="$(find "${workDir}" -mindepth 1 -maxdepth 1 -type f -name "*.tar.gz")"
test -e "${sourceArchive}.asc" || possiblyDie "release was not signed"
# * Run "`./configure && make check`" on all test systems including Cygwin, using the `tar.gz` that was just created
# * Run a cross-compilation check
sh "${srcdir}/docs/test-on-vm-lab.sh" "${sourceArchive}" || possiblyDie "lab test failed"
# * 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
rm -rf "RELEASE-${versionInNews}"
mkdir "RELEASE-${versionInNews}"
cp "${sourceArchive}" "${sourceArchive}.asc" "${sourceArchive}.txt" "RELEASE-${versionInNews}/" || possiblyDie "failed to copy release files"
pandoc --from markdown --to html --shift-heading-level-by=1 < "${srcdir}/docs/pv.1.md" > "RELEASE-${versionInNews}/manual.html"
pandoc --from markdown --to html < "${srcdir}/docs/NEWS.md" > "RELEASE-${versionInNews}/news.html"
# Build OS packages.
packagingHosts="$(cat ~/.config/packaging-hosts 2>/dev/null)"
for buildHost in ${packagingHosts}; do
remoteWorkDir="$(ssh "${buildHost}" "mktemp -d")" || continue
test -n "${remoteWorkDir}" || continue
buildOK=true
scp "${srcdir}/docs/build-package.sh" "${buildHost}:${remoteWorkDir}/" || buildOK=false
${buildOK} && scp "${sourceArchive}" "${buildHost}:${remoteWorkDir}/" || buildOK=false
${buildOK} && ssh -t "${buildHost}" "cd \"${remoteWorkDir}\" && SKIP_VALGRIND_TESTS=\"${SKIP_VALGRIND_TESTS}\" MAINTAINER=\"${MAINTAINER}\" sh ./build-package.sh ./*gz" || buildOK=false
${buildOK} && ssh "${buildHost}" "rm \"${remoteWorkDir}\"/${sourceArchive##*/} \"${remoteWorkDir}/build-package.sh\""
${buildOK} && mkdir -p "RELEASE-${versionInNews}/${buildHost}"
${buildOK} && scp "${buildHost}:${remoteWorkDir}/*" "RELEASE-${versionInNews}/${buildHost}/"
ssh "${buildHost}" "rm -rf \"${remoteWorkDir}\""
done
find "RELEASE-${versionInNews}/" -type f -exec chmod 644 '{}' ';'
find "RELEASE-${versionInNews}/" -type d -exec chmod 755 '{}' ';'
cat <<EOF
Files are under: RELEASE-${versionInNews}/
Still to do:
* 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
EOF
exit 0
+338
View File
@@ -0,0 +1,338 @@
#!/bin/sh
#
# Run "make check" from a source tarball, on a whole lab of VMs.
#
# The source tarball should contain a directory; this directory must contain
# a "configure" script. After running "configure", this script calls "make"
# and then "make check", from a build subdirectory.
#
# Hostnames need to be listed on the command line after the tarball, or in
# ~/.config/lab-hosts. They need to be reachable over SSH with no password.
#
# Cross-compilation is performed if the hostname is of the form "x:y", where
# "x" is a target like "arm-linux-gnueabi", and "y" is the name of a host of
# that architecture. The package is built locally with "--host=x" and the
# result is copied to "y" and "make check" is run.
#
# Displays progress to the terminal and produces a tarball of results. In
# the results, the file "latest-status.txt" contains the last status
# display, and there is a directory for each host. The directories contain
# SCW metrics files plus "output.log" (timestamped), "raw-output.log"
# (without timestamps), "framework-output.log" (messages from this script),
# and the "config.log", "test-suite.log", and "tests/" from the build area.
#
# Requires "scw" (https://www.ivarch.com/programs/scw.shtml).
# Number of tests to run in parallel on each host.
concurrency="1"
# Run a build and check, according to these environment variables:
#
# sourceArchive local source tarball path
# buildHost where to build, or "" for local
# checkHost where to test, or "" for local
# remoteBuildDir temp directory for remote build or check
# localBuildDir temp directory for local build
# configureArguments extra "configure" script arguments
#
# Does not return - always exits.
#
# Expects to be run under SCW, so writes status to fd 3.
#
testRunner () {
printf '%s %s\n' 'notice' 'creating build area' >&3
if test -n "${buildHost}"; then
ssh "${buildHost}" mkdir "${remoteBuildDir}" || exit 1
else
mkdir "${localBuildDir}" || exit 1
fi
printf '%s %s\n' 'ok' 'created build area' >&3
if test -n "${checkHost}"; then
printf '%s %s\n' 'notice' 'creating check area' >&3
ssh "${checkHost}" mkdir "${remoteBuildDir}" || exit 1
printf '%s %s\n' 'ok' 'created check area' >&3
fi
printf '%s %s\n' 'notice' 'copying source archive' >&3
if test -n "${buildHost}"; then
scp "${sourceArchive}" "${buildHost}:${remoteBuildDir}/" || exit 1
elif test -n "${checkHost}"; then
scp "${sourceArchive}" "${checkHost}:${remoteBuildDir}/" || exit 1
fi
printf '%s %s\n' 'ok' 'source archive copied' >&3
printf '%s %s\n' 'notice' 'extracting source archive' >&3
if test -n "${buildHost}"; then
ssh "${buildHost}" tar xzf "${remoteBuildDir}/${sourceArchive##*/}" -C "${remoteBuildDir}" || exit $?
else
tar xzf "${sourceArchive}" -C "${localBuildDir}" || exit $?
ssh "${checkHost}" tar xzf "${remoteBuildDir}/${sourceArchive##*/}" -C "${remoteBuildDir}" || exit $?
fi
printf '%s %s\n' 'ok' 'source archive extracted' >&3
stepResult="ok"
if test -n "${buildHost}"; then
printf '%s %s\n' 'notice' 'configuring' >&3
ssh "${buildHost}" "cd \"${remoteBuildDir}\" && mkdir BUILD && cd BUILD && ../*/configure ${configureArguments}" || exit $?
else
printf '%s %s\n' 'notice' 'configuring locally' >&3
( cd "${localBuildDir}" && mkdir BUILD && cd BUILD && ../*/configure ${configureArguments} ) || exit $?
printf '%s %s\n' 'notice' "configuring on ${checkHost}" >&3
ssh "${checkHost}" "cd \"${remoteBuildDir}\" && mkdir BUILD && cd BUILD && ../*/configure" \
|| { stepResult="warning"; printf '%s %s\n' 'warning' "configuration failed on ${checkHost}" >&3; }
fi
printf '%s %s\n' "${stepResult}" 'configuration completed' >&3
printf '%s %s\n' 'notice' 'building' >&3
if test -n "${buildHost}"; then
ssh "${buildHost}" "cd \"${remoteBuildDir}/BUILD\" && make -j${concurrency}" || exit $?
else
make -j${concurrency} -C "${localBuildDir}/BUILD" || exit $?
fi
printf '%s %s\n' 'ok' 'build completed' >&3
if test -n "${buildHost}"; then
printf '%s %s\n' 'notice' 'testing' >&3
ssh "${buildHost}" "cd \"${remoteBuildDir}/BUILD\" && make -j${concurrency} check" || exit $?
printf '%s %s\n' 'ok' 'testing completed' >&3
elif test -n "${checkHost}"; then
printf '%s %s\n' 'notice' "transferring build to ${checkHost}" >&3
tar cvf "${localBuildDir}/build.tar" -C "${localBuildDir}" BUILD || exit $?
scp "${localBuildDir}/build.tar" "${checkHost}:${remoteBuildDir}/build.tar" || exit $?
ssh "${checkHost}" "tar xf \"${remoteBuildDir}/build.tar\" -C \"${remoteBuildDir}\"" || exit $?
printf '%s %s\n' 'ok' "transferred build to ${checkHost}" >&3
printf '%s %s\n' 'notice' "testing on ${checkHost}" >&3
ssh "${checkHost}" "cd \"${remoteBuildDir}/BUILD\" && make -j${concurrency} check-TESTS XCTEST=1" || exit $?
printf '%s %s\n' 'ok' 'testing completed' >&3
fi
exit 0
}
# Using directory $1 for metrics and output, run the remaining arguments as
# a command using "scw" to capture metrics and record logs.
#
recordCommand () {
targetDir="$1"
shift
mkdir -p "${targetDir}"
scw -c /dev/null \
-s UserConfigFile=/dev/null \
-s ItemsDir=/dev/null \
-s MetricsDir="${targetDir}" \
-s CheckLockFile="${targetDir}/.widelock" \
-s OutputMap= \
-s OutputMap="OES stamped ${targetDir}/output.log" \
-s OutputMap="OES raw ${targetDir}/raw-output.log" \
-s Command="$*" \
run item
}
if test "$1" = "--testRunner"; then
testRunner
exit 1
fi
labHosts="$(cat ~/.config/lab-hosts 2>/dev/null)"
workDir=$(mktemp -d) || exit 1
trap 'rm -rf "${workDir}"' EXIT
sourceArchive="$1"
shift
hostList="$*"
test -n "${hostList}" || hostList="${labHosts}"
test -n "${sourceArchive}" || { echo "Usage: ${0##*/} TARBALL [HOST...]"; exit 1; }
test -s "${sourceArchive}" || { echo "${sourceArchive}: not found"; exit 1; }
attrBold="$(tput bold 2>/dev/null)"
attrUnderline="$(tput smul 2>/dev/null)"
attrRed="$(tput setaf 1 2>/dev/null)"
attrGreen="$(tput setaf 2 2>/dev/null)"
attrYellow="$(tput setaf 3 2>/dev/null)"
attrBlue="$(tput setaf 4 2>/dev/null)"
attrMagenta="$(tput setaf 5 2>/dev/null)"
attrCyan="$(tput setaf 6 2>/dev/null)"
attrWhite="$(tput setaf 7 2>/dev/null)"
attrNone="$(tput sgr0 2>/dev/null)"
dateStamp="$(date +%Y%m%d-%H%M)"
resultsArchive="result-${dateStamp}.tar.gz"
startEpoch="$(date +%s)"
for hostSpec in ${hostList}; do
localTestDir="${workDir}/${hostSpec}"
remoteBuildDir="test-${dateStamp}.$(date +%s).$$"
buildHost="${hostSpec}"
checkHost=""
configureArguments=""
xcFor="${hostSpec%:*}"
xcRunOn="${hostSpec#*:}"
if ! test "${xcFor}" = "${xcRunOn}"; then
localTestDir="${workDir}/${xcFor}-${xcRunOn}"
buildHost=""
checkHost="${xcRunOn}"
configureArguments="--host ${xcFor}"
fi
mkdir "${localTestDir}"
printf "%s\n" "${hostSpec}" > "${localTestDir}/hostSpec"
localBuildDir="${localTestDir}/XC"
(
flock -x 3
export sourceArchive buildHost checkHost remoteBuildDir localBuildDir configureArguments
recordCommand "${localTestDir}" "sh \"$0\" --testRunner" 3<&-
exec >>"${localTestDir}/output.log" 2>&1
printf '*** %s\n' 'retrieving build and test artefacts'
mkdir "${localTestDir}/tests"
if test -n "${buildHost}"; then
scp "${buildHost}:${remoteBuildDir}/BUILD/config.log" "${localTestDir}/"
scp "${buildHost}:${remoteBuildDir}/BUILD/test-suite.log" "${localTestDir}/"
scp "${buildHost}:${remoteBuildDir}/BUILD/tests/*" "${localTestDir}/tests/"
elif test -n "${checkHost}"; then
scp "${checkHost}:${remoteBuildDir}/BUILD/config.log" "${localTestDir}/"
scp "${checkHost}:${remoteBuildDir}/BUILD/test-suite.log" "${localTestDir}/"
scp "${checkHost}:${remoteBuildDir}/BUILD/tests/*" "${localTestDir}/tests/"
fi
printf '*** %s\n' 'removing build area'
rm -rf "${localBuildDir}"
if test -n "${buildHost}"; then
ssh "${buildHost}" rm -rf "${remoteBuildDir}"
elif test -n "${checkHost}"; then
ssh "${checkHost}" rm -rf "${remoteBuildDir}"
fi
printf '\n'
flock -u 3
) > "${localTestDir}/framework-output.log" 2>&1 3>>"${localTestDir}/active" &
done
sleep 0.1
allTestHostDirs="$(find "${workDir}" -mindepth 1 -maxdepth 1 -name "[0-9A-Za-z_]*" -type d -printf "%f\n" | sort)"
hostCount=0
for testHostDir in ${allTestHostDirs}; do hostCount=$((1+hostCount)); done
exitedCount=0
overallStatus=""
while test "${exitedCount}" -lt "${hostCount}"; do
width="$(tput cols 2>/dev/null)"
test -n "${width}" || width=80
currentEpoch="$(date +%s)"
elapsedSeconds=$((currentEpoch-startEpoch))
{
nameWidth=0
runningCount=0
failedCount=0
passedCount=0
exitedCount=0
overallStatus=""
for testHostDir in ${allTestHostDirs}; do
hostSpec="${testHostDir}"
{ read -r hostSpec < "${workDir}/${testHostDir}/hostSpec"; } 2>/dev/null
test "${#hostSpec}" -gt "${nameWidth}" && nameWidth="${#hostSpec}"
exec 3>>"${workDir}/${testHostDir}/active"
flock -x -n 3 && exitedCount=$((1+exitedCount))
exec 3<&-
test -e "${workDir}/${testHostDir}/ended" || runningCount=$((1+runningCount))
if test -e "${workDir}/${testHostDir}/failed"; then
overallStatus="FAIL"
failedCount=$((1+failedCount))
elif test -e "${workDir}/${testHostDir}/succeeded"; then
test -z "${overallStatus}" && overallStatus="PASS"
passedCount=$((1+passedCount))
fi
done
test -n "${overallStatus}" || overallStatus="----"
printf "%sT+%04d - %s%s\n\n" "${attrUnderline}" "${elapsedSeconds}" "$(date '+%Y-%m-%d %H:%M:%S')" "${attrNone}"
for testHostDir in ${allTestHostDirs}; do
hostSpec="${testHostDir}"
{ read -r hostSpec < "${workDir}/${testHostDir}/hostSpec"; } 2>/dev/null
lastStatusWord="-"
lastStatusMessage="-"
{ read -r lastStatusWord lastStatusMessage < "${workDir}/${testHostDir}/last-status"; } 2>/dev/null
lastLine="-"
test -s "${workDir}/${testHostDir}/output.log" && lastLine="$(tail -n 1 "${workDir}/${testHostDir}/output.log" 2>/dev/null | expand)"
testResult="----"
test -e "${workDir}/${testHostDir}/failed" && testResult="FAIL"
test -e "${workDir}/${testHostDir}/succeeded" && testResult="PASS"
remainingWidth=$((width-nameWidth-20))
statusWidth=$((remainingWidth*2/3))
test "${statusWidth}" -gt 40 && statusWidth=40
lastLineWidth=$((remainingWidth-statusWidth))
printf " %s%${nameWidth}s%s " "${attrBold}${attrYellow}" "${hostSpec}" "${attrNone}"
case "${testResult}" in
"PASS") printf "%s%s%s" "${attrBold}${attrGreen}" "PASS" "${attrNone}" ;;
"FAIL") printf "%s%s%s" "${attrBold}${attrRed}" "FAIL" "${attrNone}" ;;
*) printf "%s" "----"
esac
case "${lastStatusWord}" in
"(begin)"|"begin") printf " (%s%s%s) " "${attrBold}${attrMagenta}" "begin" "${attrNone}" ;;
"(end)"|"end") printf " (%s%s%s) " "${attrBold}${attrMagenta}" "end" "${attrNone}" ;;
"(notice)"|"notice") printf " (%s%s%s) " "${attrBold}${attrCyan}" "notice" "${attrNone}" ;;
"(ok)"|"ok") printf " (%s%s%s) " "${attrBold}${attrGreen}" "ok" "${attrNone}" ;;
"(warning)"|"warning") printf " (%s%s%s)" "${attrBold}${attrYellow}" "warning" "${attrNone}" ;;
"(error)"|"error") printf " (%s%s%s) " "${attrBold}${attrRed}" "error" "${attrNone}" ;;
*) printf " %7s " ""; lastStatusMessage="${lastStatusWord} ${lastStatusMessage}" ;;
esac
printf " %s%-${statusWidth}.${statusWidth}s%s" "${attrWhite}" "${lastStatusMessage}" "${attrNone}"
printf " %s%-${lastLineWidth}.${lastLineWidth}s%s" "${attrBlue}" "${lastLine}" "${attrNone}"
printf "\n"
done
printf "\n%s%s%s " "${attrBold}" "Overall status:" "${attrNone}"
case "${overallStatus}" in
"PASS") printf "%s%s%s" "${attrBold}${attrGreen}" "PASS" "${attrNone}" ;;
"FAIL") printf "%s%s%s" "${attrBold}${attrRed}" "FAIL" "${attrNone}" ;;
*) printf "%s" "----"
esac
printf " %s%s%s " "${attrBold}" "Running,Passed,Failed:" "${attrNone}"
printf "%sR%d%s" "${attrBold}${attrMagenta}" "${runningCount}" "${attrNone}"
printf ",%sP%d%s" "${attrBold}${attrGreen}" "${passedCount}" "${attrNone}"
printf ",%sF%d%s" "${attrBold}${attrRed}" "${failedCount}" "${attrNone}"
printf " = %d" "${hostCount}"
printf "\n\n"
} > "${workDir}/latest-status.txt"
cat "${workDir}/latest-status.txt"
sleep 1
done
endEpoch="$(date +%s)"
elapsedSeconds=$((endEpoch-startEpoch))
printf '%s\n' 'Generating results archive'
tar czf "${resultsArchive}" -C "${workDir}" .
printf '%s: %d%s\n' 'Total time taken' "${elapsedSeconds}" "s"
printf '%s: %s\n' 'Results archive' "${resultsArchive}"
test "${overallStatus}" = "PASS" || exit 1
+98 -94
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\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"
@@ -12,255 +12,259 @@ msgstr ""
"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:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr "ukaž indikátor průběhu"
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr "ukaž uběhlý čas"
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr "ukaž přibližný zbývající čas"
#: src/main/help.c:293
#: src/main/help.c:245
msgid "show absolute estimated time of arrival (completion)"
msgstr "ukaž přibližný čas dokončení"
#: src/main/help.c:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr "ukaž okamžitou rychlost přenosu dat"
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr "ukaž průměrnou rychlost přenosu dat"
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr "ukaž počet přenesených bajtů"
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr "ukaž procento využité vyrovnávací paměti"
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr "ČÍS"
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr "zobraz ČÍS posledních zapsaných bajtů"
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr "FORMÁT"
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr "nastav formát výstupu na FORMÁT"
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr "vypisuj procenta, ne vizuální informace"
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr "nevypisuj žádné informace o přenosu"
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr "ukaž počet přenesených bitů"
#: src/main/help.c:324
#: src/main/help.c:276
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:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr "nic nevypisuj, dokud není přenesen první byte"
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr "SEK"
#: src/main/help.c:330
#: src/main/help.c:282
msgid "display nothing until SEC seconds have passed"
msgstr "nic nevypisuj, dokud neuplyne SEK sekund"
#: src/main/help.c:332
#: src/main/help.c:284
msgid "SIZE"
msgstr "VEL"
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr "nastav očekávanou velikost dat na VEL bajtů"
#: src/main/help.c:336
#: src/main/help.c:288
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:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr "počítej řádky místo bajtů"
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr "řádky jsou zakončené nulovým znakem"
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr "aktualizuj každých SEK sekund"
#: src/main/help.c:348
#: src/main/help.c:300
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:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr "ŠÍŘ"
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr "předpokládej šířku terminálu ŠÍŘ znaků"
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr "VÝŠ"
#: src/main/help.c:354
#: src/main/help.c:306
msgid "assume terminal is HEIGHT rows high"
msgstr "předpokládej výšku terminálu VÝŠ znaků"
#: src/main/help.c:356
#: src/main/help.c:308
msgid "NAME"
msgstr "JMÉNO"
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr "přidej JMÉNO před vizuální informace"
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr "po dokončení vypiš údaje o přenosu"
#: src/main/help.c:366
#: src/main/help.c:318
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:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr "pozicuj kurzor pomocí řídících znaků"
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr "SOUBOR"
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr "zapiš výstup do SOUBORu namísto standardního výstupu"
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr "RYCH"
#: src/main/help.c:376
#: src/main/help.c:328
msgid "limit transfer to RATE bytes per second"
msgstr "omez přenosovou rychlost na RYCH bajtů za sekundu"
#: src/main/help.c:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr "BAJT"
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr "použij vyrovnávací pamět BAJT bajtů"
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr "nepoužívej splice(), vždy použij read/write"
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr "ignoruj chyby při čtení vstupu"
#: src/main/help.c:388
#: src/main/help.c:340
msgid "skip errors in BYTES blocks at a time"
msgstr "přeskakuj chyby v blocích BAJTů naráz"
#: src/main/help.c:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr "zastav po přenosu --size bajtů"
#: src/main/help.c:394
#: src/main/help.c:346
msgid "flush cache to disk after every write"
msgstr "po každém zápisu vyprázdni cache na disk"
#: src/main/help.c:397
#: src/main/help.c:349
msgid "use direct I/O to bypass cache"
msgstr "použij přímý V/V k obejítí cache"
#: src/main/help.c:400
#: src/main/help.c:352
msgid "discard input instead of writing to output"
msgstr "zahoď vstup namísto zápisu na výstup"
#: src/main/help.c:403
#: src/main/help.c:355
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:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr "PID[:DS]"
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr "sleduj soubor DS otevřený procesem PID"
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr "PID"
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr "aktualizuj nastavení procesu PID"
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr "ulož id procesu do SOUBORu"
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr "ukaž pomoc a skonči"
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr "ukaž informace o verzi a skonči"
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr "zapiš ladící záznamy do SOUBORu"
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Použití: %s [VOLBY] [SOUBOR]..."
#: src/main/help.c:461
#: src/main/help.c:414
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:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Prosím, hlašte veškeré chyby na: %s"
@@ -355,11 +359,11 @@ msgstr "při sledování deskriptorů souborů nelze použít přenos souborů"
msgid "not available on systems without /proc/self/fdinfo"
msgstr "není dostupné na systémech bez /proc/self/fdinfo"
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr "zpráva nepřijata"
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO není na tomto systému podporováno"
@@ -403,40 +407,40 @@ msgstr "yzafpnum kMGTPEZY"
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnum KMGTPEZY"
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr "selhala alokace vyrovnávací paměti"
#: src/pv/display.c:810
msgid "b"
msgstr "b"
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr "B"
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr "b/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr "/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr "B/s"
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr "ETA"
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr "FIN"
#: src/pv/display.c:1057
msgid "b"
msgstr "b"
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "selhala alokace vyrovnávací paměti"
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr "selhalo posunutí za začátek výstupu"
@@ -489,47 +493,47 @@ msgstr "selhala alokace struktury historie"
msgid "file list allocation failed"
msgstr "selhala alokace seznamu souborů"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "čtení selhalo"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "varování: detekovány chyby při čtení"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "souborem nelze procházet"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "selhal skok za chybu"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "chyba přeskočena"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "vyrovnávací paměť není alokována"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "selhalo nastavení intervalového časovače"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "selhalo vynulování intervalového časovače"
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "selhala alokace vyrovnávací paměti pro pozici v řádcích"
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "zápis selhal"
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "selhalo volání select"
+98 -94
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\n"
"PO-Revision-Date: 2024-10-13 20:43+0000\n"
"Last-Translator: fnetX <otto@codeberg.org>\n"
"Language-Team: German <https://translate.codeberg.org/projects/pv/pv/de/>\n"
@@ -26,259 +26,263 @@ msgstr ""
"nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
"compat.c\n"
#: src/main/help.c:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr "Fortschritts-Anzeige"
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr "zeige die verstrichene Zeit an"
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr "zeige die erwartete Zeit bis zum Ende an"
#: src/main/help.c:293
#: src/main/help.c:245
msgid "show absolute estimated time of arrival (completion)"
msgstr "zeige die absolute geschätzte Zeit bis zur Fertigstellung"
#: src/main/help.c:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr "zeige die Datentransferrate an"
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr "zeige die durchschnittliche Übertragungsrate"
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr "zeige die Anzahl der übertragenen Bytes"
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr "zeige, wie viel Prozent des Übertragungsbuffers in Benutzung sind"
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr "NUM"
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr "NUM zeige die zuletzt geschriebenen NUM Bytes"
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr "setze das Ausgabeformat auf FORMAT"
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr "Ausgabe von Prozent-Angaben statt visueller Darstellung"
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr "sämtliche Transferinformationen unterdrücken"
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr "zeige die Anzahl der übertragenen Bits"
#: src/main/help.c:324
#: src/main/help.c:276
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "behandle Endungen als Vielfache von 1000 statt von 1024"
#: src/main/help.c:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr "keine Ausgabe bevor das erste Byte übertragen wurde"
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr "SEK"
#: src/main/help.c:330
#: src/main/help.c:282
msgid "display nothing until SEC seconds have passed"
msgstr "nichts anzeigen ehe SEK Sekunden vergangen sind"
#: src/main/help.c:332
#: src/main/help.c:284
msgid "SIZE"
msgstr "GRÖẞE"
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr "setze erwartete Datenlänge auf SIZE Byte"
#: src/main/help.c:336
#: src/main/help.c:288
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:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr "zähle Zeilen anstelle von Bytes"
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr "Zeilen sind nullterminiert"
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr "aktualisiere Ausgabe nach SEK Sekunden Intervall"
#: src/main/help.c:348
#: src/main/help.c:300
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:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr "BREITE"
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr "setze Terminal-Breite auf BREITE Zeichen"
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr "HÖHE"
#: src/main/help.c:354
#: src/main/help.c:306
msgid "assume terminal is HEIGHT rows high"
msgstr "setze Terminal-Höhe auf HÖHE Zeichen"
#: src/main/help.c:356
#: src/main/help.c:308
msgid "NAME"
msgstr "NAME"
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr "setze den NAMEn für visuelle Darstellung"
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr "Übertragungsstatistiken am Ende ausgeben"
#: src/main/help.c:366
#: src/main/help.c:318
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:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr "benutze Escape-Sequenzen zur Cursor-Positionierung"
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr "DATEI"
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr "schreibe die Ausgabe in DATEI statt in die Standardausgabe"
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr "RATE"
#: src/main/help.c:376
#: src/main/help.c:328
msgid "limit transfer to RATE bytes per second"
msgstr "beschränke die Transferrate auf RATE Byte pro Sekunde"
#: src/main/help.c:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr "BYTES"
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr "benutze einen Puffer in der Größe von BYTES"
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr "anstelle von splice() immer read/write benutzen"
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr "Lesefehler in der Eingabe nicht beachten"
#: src/main/help.c:388
#: src/main/help.c:340
msgid "skip errors in BYTES blocks at a time"
msgstr "bei Fehlern BYTES am Stück überspringen"
#: src/main/help.c:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr "anhalten, nachdem --size Bytes übertragen wurden"
#: src/main/help.c:394
#: src/main/help.c:346
msgid "flush cache to disk after every write"
msgstr "schreibe den Cache nach jedem Schreibvorgang auf die Festplatte"
#: src/main/help.c:397
#: src/main/help.c:349
msgid "use direct I/O to bypass cache"
msgstr "verwende direkte E/A, um den Cache zu umgehen"
#: src/main/help.c:400
#: src/main/help.c:352
msgid "discard input instead of writing to output"
msgstr "verwirf die Eingabe anstatt in die Ausgabe zu schreiben"
#: src/main/help.c:403
#: src/main/help.c:355
msgid "write all input to FILE before writing to output"
msgstr "Ausgabe nach FILE schrieben bevor sie ausgegeben wird"
#: src/main/help.c:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr "PID[:FD]"
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr "die vom Prozess PID geöffnete Datei FD beobachten"
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr "PID"
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr "Einstellungen der Prozess-PID updaten"
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr "Prozess-ID in DATEI speichern"
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr "zeige diese Hilfe und beende"
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr "zeige Versionsinformationen und beende"
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr "schreibe Debug-Protokolle in DATEI"
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Aufruf: %s [OPTION] [DATEI]..."
#: src/main/help.c:461
#: src/main/help.c:414
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:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Bitte senden Sie Fehlerberichte an %s"
@@ -378,11 +382,11 @@ msgstr ""
msgid "not available on systems without /proc/self/fdinfo"
msgstr "Nicht verfügbar auf Systemen ohne /proc/self/fdinfo"
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr "Nachricht nicht empfangen"
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO wird auf diesem System nicht unterstützt"
@@ -426,40 +430,40 @@ msgstr "yzafpnµm kMGTPEZY"
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnµm KMGTPEZY"
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr "Speicherzuweisung für den Puffer fehlgeschlagen"
#: src/pv/display.c:810
msgid "b"
msgstr "b"
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr "B"
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr "b/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr "/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr "B/s"
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr "ETA"
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr "Endzeit"
#: src/pv/display.c:1057
msgid "b"
msgstr "b"
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "Speicherzuweisung für den Puffer fehlgeschlagen"
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr "Konnte nicht zum Anfang der Ausgabe springen"
@@ -513,47 +517,47 @@ msgstr "Speicherzuweisung für `history' fehlgeschlagen"
msgid "file list allocation failed"
msgstr "Speicherzuweisung für die Dateiliste fehlgeschlagen"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "read-Aufruf fehlgeschlagen"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "warnung: lesefehler erkannt"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "Datei ist nicht durchsuchbar"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "konnte den Fehler nicht überwinden"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "über den Lesefehler hinaus verschoben"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "Speicherzuweisung für den Transferpuffer fehlgeschlagen"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "konnte Intervall-Timer nicht setzen"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "konnte Intervall-Timer nicht löschen"
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "Zuweisung des Zeilenpuffers fehlgeschlagen"
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "write-Aufruf fehlgeschlagen"
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "select-Aufruf fehlgeschlagen"
+98 -94
View File
@@ -1,260 +1,264 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/main/help.c:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr ""
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr ""
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr ""
#: src/main/help.c:293
#: src/main/help.c:245
msgid "show absolute estimated time of arrival (completion)"
msgstr ""
#: src/main/help.c:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr ""
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr ""
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr ""
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr ""
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr ""
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr ""
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr ""
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr ""
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr ""
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr ""
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr ""
#: src/main/help.c:324
#: src/main/help.c:276
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr ""
#: src/main/help.c:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr ""
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr ""
#: src/main/help.c:330
#: src/main/help.c:282
msgid "display nothing until SEC seconds have passed"
msgstr ""
#: src/main/help.c:332
#: src/main/help.c:284
msgid "SIZE"
msgstr ""
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr ""
#: src/main/help.c:336
#: src/main/help.c:288
msgid "if size unknown, show rate vs max rate"
msgstr ""
#: src/main/help.c:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr ""
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr ""
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr ""
#: src/main/help.c:348
#: src/main/help.c:300
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr ""
#: src/main/help.c:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr ""
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr ""
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr ""
#: src/main/help.c:354
#: src/main/help.c:306
msgid "assume terminal is HEIGHT rows high"
msgstr ""
#: src/main/help.c:356
#: src/main/help.c:308
msgid "NAME"
msgstr ""
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr ""
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr ""
#: src/main/help.c:366
#: src/main/help.c:318
msgid "output even if standard error is not a terminal"
msgstr ""
#: src/main/help.c:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr ""
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr ""
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr ""
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr ""
#: src/main/help.c:376
#: src/main/help.c:328
msgid "limit transfer to RATE bytes per second"
msgstr ""
#: src/main/help.c:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr ""
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr ""
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr ""
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr ""
#: src/main/help.c:388
#: src/main/help.c:340
msgid "skip errors in BYTES blocks at a time"
msgstr ""
#: src/main/help.c:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr ""
#: src/main/help.c:394
#: src/main/help.c:346
msgid "flush cache to disk after every write"
msgstr ""
#: src/main/help.c:397
#: src/main/help.c:349
msgid "use direct I/O to bypass cache"
msgstr ""
#: src/main/help.c:400
#: src/main/help.c:352
msgid "discard input instead of writing to output"
msgstr ""
#: src/main/help.c:403
#: src/main/help.c:355
msgid "write all input to FILE before writing to output"
msgstr ""
#: src/main/help.c:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr ""
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr ""
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr ""
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr ""
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr ""
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr ""
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr ""
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr ""
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr ""
#: src/main/help.c:461
#: src/main/help.c:414
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
#: src/main/help.c:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr ""
@@ -347,11 +351,11 @@ msgstr ""
msgid "not available on systems without /proc/self/fdinfo"
msgstr ""
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr ""
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr ""
@@ -395,40 +399,40 @@ msgstr ""
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr ""
#: src/pv/display.c:810
msgid "b"
msgstr ""
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr ""
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr ""
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr ""
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr ""
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr ""
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr ""
#: src/pv/display.c:1057
msgid "b"
msgstr ""
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr ""
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr ""
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr ""
@@ -481,47 +485,47 @@ msgstr ""
msgid "file list allocation failed"
msgstr ""
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr ""
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr ""
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr ""
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr ""
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr ""
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr ""
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr ""
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr ""
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr ""
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr ""
+98 -94
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\n"
"PO-Revision-Date: 2024-10-12 11:13+0000\n"
"Last-Translator: a-j-wood <a-j-wood@users.noreply.translate.codeberg.org>\n"
"Language-Team: French <https://translate.codeberg.org/projects/pv/pv/fr/>\n"
@@ -26,260 +26,264 @@ msgstr ""
"nls/intl/textdomain.c src/nls/intl-cat/cat-compat.c src/nls/intl-gett/intl-"
"compat.c\n"
#: src/main/help.c:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr "afficher la barre de progression"
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr "afficher le temps écoulé"
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr "afficher l'heure approximative de l'achèvement de la tâche"
#: src/main/help.c:293
#: src/main/help.c:245
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:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr "afficher le taux de tranfert des données"
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr "afficher le compteur de taux moyen de transfert de données"
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr "afficher le nombre d'octets transférés"
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr "afficher le pourcentage de tampon de transfert utilisé"
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr "NUM"
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr "afficher les derniers NUM octets écrits"
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr "définir le format de sortie sur FORMAT"
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr "imprimer en pourcentage plutôt que des informations visuelles"
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr "n'afficher aucune information de transfert"
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr "afficher le nombre de bits transférés"
#: src/main/help.c:324
#: src/main/help.c:276
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:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr "ne rien afficher avant qu'au moins un octet soit tranféré"
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr "SEC"
#: src/main/help.c:330
#: src/main/help.c:282
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:332
#: src/main/help.c:284
msgid "SIZE"
msgstr "TAILLE"
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr "ajuster la taille estimée des données à TAILLE octets"
#: src/main/help.c:336
#: src/main/help.c:288
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:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr "compter les lignes au lieu des octets"
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr "les lignes sont terminées par un caractère nul"
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr "mettre à jour toutes les SEC secondes"
#: src/main/help.c:348
#: src/main/help.c:300
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:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr "LARGEUR"
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr "présumer la largeur du terminal à LARGEUR caractères"
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr "HAUTEUR"
#: src/main/help.c:354
#: src/main/help.c:306
msgid "assume terminal is HEIGHT rows high"
msgstr "présumer la hauteur du terminal à HAUTEUR lignes"
#: src/main/help.c:356
#: src/main/help.c:308
msgid "NAME"
msgstr "NOM"
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr "préfixer les informations visuelles avec NOM"
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr "afficher les statistiques de transfert à la fin"
#: src/main/help.c:366
#: src/main/help.c:318
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:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr "utiliser les séquences d'échappements de positionnement de curseur"
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr "FICHIER"
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr "écrire la sortie dans FICHIER au lieu de la sortie standard"
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr "TAUX"
#: src/main/help.c:376
#: src/main/help.c:328
msgid "limit transfer to RATE bytes per second"
msgstr "limite le taux de transfert à TAUX octets par seconde"
#: src/main/help.c:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr "OCTETS"
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr "Utiliser une mémoire tampon de OCTETS octets"
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr "ne jamais utiliser splice(), toujours utiliser read/write"
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr "ignorer les erreurs de lecture dans l'entrée"
#: src/main/help.c:388
#: src/main/help.c:340
msgid "skip errors in BYTES blocks at a time"
msgstr "ignorer les erreurs dans OCTETS blocs à la fois"
#: src/main/help.c:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr "arrêter après le transfert de --size octets"
#: src/main/help.c:394
#: src/main/help.c:346
msgid "flush cache to disk after every write"
msgstr "vider le cache sur le disque après chaque écriture"
#: src/main/help.c:397
#: src/main/help.c:349
msgid "use direct I/O to bypass cache"
msgstr "utiliser les E/S directes pour contourner le cache"
#: src/main/help.c:400
#: src/main/help.c:352
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:403
#: src/main/help.c:355
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:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr "PID[:FD]"
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr "surveiller le fichier FD ouvert par le processus PID"
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr "PID"
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr "mettre à jour la configuration du processus PID"
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr "enregistrer l'ID de processus dans FICHIER"
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr "afficher cette aide puis quitter"
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr "afficher la version puis quitter"
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr "écrire les journaux de déboggage vers FICHIER"
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Utilisation : %s [OPTIONS] [FICHIER]..."
#: src/main/help.c:461
#: src/main/help.c:414
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:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr "SVP rapporter tous bogues à %s"
@@ -380,11 +384,11 @@ msgstr ""
msgid "not available on systems without /proc/self/fdinfo"
msgstr "non disponible sur les systèmes sans /proc/self/fdinfo"
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr "message non reçu"
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO non pris en charge sur ce système"
@@ -430,40 +434,40 @@ msgstr ""
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr "échec de l'allocation de mémoire tampon"
#: src/pv/display.c:810
msgid "b"
msgstr ""
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr "O"
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr ""
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr "/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr "O/s"
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr "ETA"
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr ""
#: src/pv/display.c:1057
msgid "b"
msgstr ""
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr "O"
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "échec de l'allocation de mémoire tampon"
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr "ne peut pas passer au début de la sortie"
@@ -516,47 +520,47 @@ 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"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "la lecture a échoué"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "avertissement : erreurs de lecture détectées"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "ne peut pas se déplacer dans le fichier"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "n'a pas réussi à dépasser l'erreur"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "erreur de lecture dépassée"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "aucun tampon de transfert alloué"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr ""
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr ""
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "l'écriture a échoué"
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "l'appel de sélection a échoué"
+98 -94
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\n"
"PO-Revision-Date: 2024-10-20 14:07+0000\n"
"Last-Translator: coralpink <coralpink@users.noreply.translate.codeberg.org>\n"
"Language-Team: Polish <https://translate.codeberg.org/projects/pv/pv/pl/>\n"
@@ -18,262 +18,266 @@ msgstr ""
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 5.7.2\n"
#: src/main/help.c:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr "pokaż pasek postępu"
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr "pokaż upływający czas"
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr "pokaż szacowany czas ukończenia"
#: src/main/help.c:293
#: src/main/help.c:245
msgid "show absolute estimated time of arrival (completion)"
msgstr "pokaż bezwzględny szacowany czas ukończenia"
#: src/main/help.c:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr "pokaż licznik prędkości przesyłania"
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr "pokaż licznik uśrednionej prędkości przesyłania"
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr "pokaż ilość przesłanych bajtów"
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr "pokaż procentowe użycie bufora transferu"
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr "LICZBA"
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr "pokaż ostatnie LICZBA przesłanych bajtów"
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr "ustaw FORMAT jako format wyjściowy"
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr "wyświetl wyjście procentowo, bez graficznej prezentacji"
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr "nie wyświetlaj żadnych informacji o przesyłaniu"
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr "pokaż ilość przesłanych bitów"
#: src/main/help.c:324
#: src/main/help.c:276
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "traktuj przyrostki jako wielokrotności 1000 zamiast 1024"
#: src/main/help.c:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr "nie wyświetlaj nic aż do pierwszego przesłanego bajtu"
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr "SEKUNDY"
#: src/main/help.c:330
#: src/main/help.c:282
msgid "display nothing until SEC seconds have passed"
msgstr "nie wyświetlaj nic do momentu upłynięcia SEKUNDY sekund"
#: src/main/help.c:332
#: src/main/help.c:284
msgid "SIZE"
msgstr "ROZMIAR"
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr "ustaw oczekiwany rozmiar danych na ROZMIAR bajtów"
#: src/main/help.c:336
#: src/main/help.c:288
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:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr "zliczaj linie zamiast bajty"
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr "linie są zakończone znakiem NUL"
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr "aktualizuj co każde SEKUNDY sekund"
#: src/main/help.c:348
#: src/main/help.c:300
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:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr "SZEROKOŚĆ"
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr "przyjmij, że terminal ma szerokość SZEROKOŚĆ znaków"
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr "WYSOKOŚĆ"
#: src/main/help.c:354
#: src/main/help.c:306
msgid "assume terminal is HEIGHT rows high"
msgstr "przyjmij, że terminal ma wysokość WYSOKOŚĆ linii"
#: src/main/help.c:356
#: src/main/help.c:308
msgid "NAME"
msgstr "NAZWA"
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr "poprzedź informacje prefiksem NAZWA"
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr "wyświetl na końcu statystyki transferu"
#: src/main/help.c:366
#: src/main/help.c:318
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:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr "używaj znaków ucieczki do pozycjonowania kursora"
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr "PLIK"
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr "zapisz wyjście do PLIK zamiast do wyjścia standardowego"
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr "PRĘDKOŚĆ"
#: src/main/help.c:376
#: src/main/help.c:328
msgid "limit transfer to RATE bytes per second"
msgstr "ogranicz przesyłane dane do PRĘDKOŚĆ bajtów na sekundę"
#: src/main/help.c:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr "BAJTY"
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr "użyj bufora o rozmiarze BAJTY"
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr "nigdy nie używaj splice(), zawsze używaj read/write"
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr "pomijaj błędy odczytu wejścia"
#: src/main/help.c:388
#: src/main/help.c:340
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:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr "zakończ po przesłaniu --size bajtów"
#: src/main/help.c:394
#: src/main/help.c:346
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:397
#: src/main/help.c:349
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:400
#: src/main/help.c:352
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:403
#: src/main/help.c:355
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:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr "PID[:FD]"
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr "obserwuj plik FD otworzony przez proces PID"
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr "PID"
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr "zaktualizuj ustawienia procesu PID"
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr "zapisz ID procesu do PLIK"
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr "wyświetl te informacje z pomocą i wyjdź"
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr "wyświetl informacje o wersji i wyjdź"
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr "zapisz logi debugujące do PLIK"
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Sposób użycia: %s [OPCJA] [PLIK]..."
#: src/main/help.c:461
#: src/main/help.c:414
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 "
"monitoringiem."
#: src/main/help.c:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Proszę przesyłać zgłoszenia błędów do %s"
@@ -372,11 +376,11 @@ msgstr "nie można przesyłać plików z opcją obserwowania deskryptorów plik
msgid "not available on systems without /proc/self/fdinfo"
msgstr "niedostępne na systemach bez /proc/self/fdinfo"
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr "wiadomość nieodebrana"
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO nie jest wspierane na tym systemie"
@@ -421,40 +425,40 @@ msgstr "yzafpnum kMGTPEZY"
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnum KMGTPEZY"
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr "nie udało się zaalokować bufora"
#: src/pv/display.c:810
msgid "b"
msgstr "b"
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr "B"
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr "b/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr "/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr "B/s"
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr "ETA"
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr "FIN"
#: src/pv/display.c:1057
msgid "b"
msgstr "b"
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "nie udało się zaalokować bufora"
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr "nie udało się przewinąć wyjścia do początku"
@@ -508,48 +512,48 @@ msgstr "nie udało się zaalokować struktury historii"
msgid "file list allocation failed"
msgstr "nie udało się zaalokować listy plików"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "błąd odczytu"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "ostrzeżenie: błędy odczytu wykryte"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "pliku nie da się przewijać"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "nie udało się przewinąć za błąd"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "pominięto błąd odczytu"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "brak zaalokowanego bufora transferu"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "nie udało się ustawić interwału czasowego"
# "Przewidywany czas ukończenia" for ETA is too long
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "nie udało się wyczyścić interwału czasowego"
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "alokacja buforu pozycji linii nie powiodła się"
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "błąd zapisu"
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "nie udało się wywołać funkcji select"
+98 -94
View File
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\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"
@@ -15,256 +15,260 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/main/help.c:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr "exibe barra de progressão"
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr "exibe tempo passado"
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr "exibe o tempo estimado de término"
#: src/main/help.c:293
#: src/main/help.c:245
msgid "show absolute estimated time of arrival (completion)"
msgstr "exibe o tempo absoluto estimado de término"
#: src/main/help.c:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr "exibe a taxa de transferência"
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr "exibe o contador da taxa média de transferência de dados"
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr "exibe a quantidade de bytes transferidos"
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr "exibe a porcentagem de buffer de transferência em uso"
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr ""
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr "exibe NUM bytes gravados pela última vez"
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr ""
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr "definir o formato de saída para FORMAT"
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr "exibe apenas as porcentagens, sem informações visuais"
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr "executa programa sem exibir quaisquer informações"
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr ""
#: src/main/help.c:324
#: src/main/help.c:276
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr ""
#: src/main/help.c:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr "não exibe nada até iniciar o processamento"
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr ""
#: src/main/help.c:330
#: src/main/help.c:282
msgid "display nothing until SEC seconds have passed"
msgstr "não exibir nada até que os segundos SEC tenham passado"
#: src/main/help.c:332
#: src/main/help.c:284
msgid "SIZE"
msgstr ""
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr "seta a quantidade estimada de dados em SIZE bytes"
#: src/main/help.c:336
#: src/main/help.c:288
msgid "if size unknown, show rate vs max rate"
msgstr ""
#: src/main/help.c:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr "contar linhas em vez de bytes"
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr "linhas são terminadas em nulo"
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr "atualiza informações a cada SEC segundos"
#: src/main/help.c:348
#: src/main/help.c:300
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr ""
#: src/main/help.c:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr ""
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr "presuma que o terminal tem WIDTH caracteres de largura"
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr ""
#: src/main/help.c:354
#: src/main/help.c:306
msgid "assume terminal is HEIGHT rows high"
msgstr "presuma que o terminal tem HEIGHT caracteres de altura"
#: src/main/help.c:356
#: src/main/help.c:308
msgid "NAME"
msgstr ""
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr "exibe NAME antes das demais informações"
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr ""
#: src/main/help.c:366
#: src/main/help.c:318
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:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr "utiliza caracteres de escape para posicionar o cursor"
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr ""
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr ""
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr ""
#: src/main/help.c:376
#: src/main/help.c:328
msgid "limit transfer to RATE bytes per second"
msgstr "limita a transferência a RATE bytes por segundo"
#: src/main/help.c:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr ""
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr "use um tamanho de buffer de BYTES"
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr "nunca use splice(), sempre use read/write"
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr "ignorar erros de leitura em entrada"
#: src/main/help.c:388
#: src/main/help.c:340
msgid "skip errors in BYTES blocks at a time"
msgstr ""
#: src/main/help.c:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr "parar após --size bytes terem sido transferidos"
#: src/main/help.c:394
#: src/main/help.c:346
msgid "flush cache to disk after every write"
msgstr ""
#: src/main/help.c:397
#: src/main/help.c:349
msgid "use direct I/O to bypass cache"
msgstr ""
#: src/main/help.c:400
#: src/main/help.c:352
msgid "discard input instead of writing to output"
msgstr ""
#: src/main/help.c:403
#: src/main/help.c:355
msgid "write all input to FILE before writing to output"
msgstr ""
#: src/main/help.c:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr ""
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr "assistir arquivo FD aberto pelo processo PID"
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr ""
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr "atualizar as configurações do processo PID"
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr "salvar ID do processo em FILE"
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr "exibe esta tela de ajuda e termina"
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr "exibe a versão e termina"
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr ""
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Uso: %s [OPÇÕES] [ARQUIVOS]..."
#: src/main/help.c:461
#: src/main/help.c:414
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:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Por favor, reporte quaisquer defeitos para %s"
@@ -361,11 +365,11 @@ msgstr "não pode transferir arquivos ao assistir descritores de arquivo"
msgid "not available on systems without /proc/self/fdinfo"
msgstr "não disponível em sistemas sem /proc/self/fdinfo"
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr "mensagem não recebida"
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO não suportado neste sistema"
@@ -409,40 +413,40 @@ msgstr ""
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr "erro alocando o buffer"
#: src/pv/display.c:810
msgid "b"
msgstr ""
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr ""
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr ""
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr ""
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr "B/s"
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr "ETA"
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr ""
#: src/pv/display.c:1057
msgid "b"
msgstr ""
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr ""
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "erro alocando o buffer"
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr "não pode mover para o início da produção"
@@ -495,47 +499,47 @@ msgstr ""
msgid "file list allocation failed"
msgstr ""
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "erro de leitura"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "aviso: erros de leitura detectados"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "não pode mover dentro do arquivo"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "não pode ir além do erro"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "ignorado erro de leitura"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr ""
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr ""
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr ""
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "erro de gravação"
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "erro na chamada da função select"
+98 -94
View File
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\n"
"PO-Revision-Date: 2024-10-22 18:07+0000\n"
"Last-Translator: 0ko <0ko@users.noreply.translate.codeberg.org>\n"
"Language-Team: Russian <https://translate.codeberg.org/projects/pv/pv/ru/>\n"
@@ -13,255 +13,259 @@ msgstr ""
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 5.8.1\n"
#: src/main/help.c:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr "показать полосу прогресса"
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr "показать прошедшее время"
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr "показать примерное время завершения"
#: src/main/help.c:293
#: src/main/help.c:245
msgid "show absolute estimated time of arrival (completion)"
msgstr "показать примерное абсолютное время завершения"
#: src/main/help.c:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr "показать скорость передачи данных"
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr "показать среднюю скорость передачи данных"
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr "показать объём переданных данных в байтах"
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr "показать использование буфера передачи в процентах"
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr "КОЛ"
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr "показать КОЛ байт, переданных в последний раз"
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr "ФОРМАТ"
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr "указать формат вывода как ФОРМАТ"
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr "показать проценты вместо визуальной информации"
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr "не отображать никакую информацию о передаче"
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr "показать объём переданных данных в битах"
#: src/main/help.c:324
#: src/main/help.c:276
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "считать суффиксы как умножители на 1000, а не на 1024"
#: src/main/help.c:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr "ничего не показывать, пока не будет передан первый байт"
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr "СЕК"
#: src/main/help.c:330
#: src/main/help.c:282
msgid "display nothing until SEC seconds have passed"
msgstr "ничего не показывать, пока не пройдёт СЕК секунд"
#: src/main/help.c:332
#: src/main/help.c:284
msgid "SIZE"
msgstr "РАЗМ"
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr "указать ожидаемый объём данных как РАЗМ байт"
#: src/main/help.c:336
#: src/main/help.c:288
msgid "if size unknown, show rate vs max rate"
msgstr "если объём неизвестен, показать скорость и макс. скорость"
#: src/main/help.c:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr "считать линии вместо байт"
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr "строки прерываются нулями"
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr "обновлять каждые СЕК секунд"
#: src/main/help.c:348
#: src/main/help.c:300
msgid "compute average rate over past SEC seconds (default 30s)"
msgstr "вычислять среднюю скорость за последние СЕК секунд (по умолчанию 30)"
#: src/main/help.c:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr "ШИРИНА"
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr "считать, что в одной строке помещается ШИРИНА символов"
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr "ВЫСОТА"
#: src/main/help.c:354
#: src/main/help.c:306
msgid "assume terminal is HEIGHT rows high"
msgstr "считать, что на экране помещается ВЫСОТА строк"
#: src/main/help.c:356
#: src/main/help.c:308
msgid "NAME"
msgstr "ИМЯ"
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr "писать ИМЯ до визуальной информации"
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr "после завершения показать статистику"
#: src/main/help.c:366
#: src/main/help.c:318
msgid "output even if standard error is not a terminal"
msgstr "вевести, даже если стд. ошибка не является терминалом"
#: src/main/help.c:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr ""
"использовать символьные последовательности для позиционирования курсора"
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr "ФАЙЛ"
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr "направить вывод в ФАЙЛ вместо стд. вывода"
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr "СКОР"
#: src/main/help.c:376
#: src/main/help.c:328
msgid "limit transfer to RATE bytes per second"
msgstr "ограничить скорость передачи до СКОР байт/сек"
#: src/main/help.c:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr "БАЙТ"
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr "использовать буфер размера БАЙТ"
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr "использовать чтение/запись вместо splice()"
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr "пропустить ошибки чтения во вводе"
#: src/main/help.c:388
#: src/main/help.c:340
msgid "skip errors in BYTES blocks at a time"
msgstr "пропускать ошибки в <БАЙТ> блоках за раз"
#: src/main/help.c:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr "остановить после передачи --size байт"
#: src/main/help.c:394
#: src/main/help.c:346
msgid "flush cache to disk after every write"
msgstr "сбрасывать кеш на диск каждый раз"
#: src/main/help.c:397
#: src/main/help.c:349
msgid "use direct I/O to bypass cache"
msgstr "использовать прямой ввод/вывод для обхода кеша"
#: src/main/help.c:400
#: src/main/help.c:352
msgid "discard input instead of writing to output"
msgstr "отбрасывать ввод вместо записи в вывод"
#: src/main/help.c:403
#: src/main/help.c:355
msgid "write all input to FILE before writing to output"
msgstr "записывать весь ввод в ФАЙЛ прежде, чем отправлять на вывод"
#: src/main/help.c:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr "ИДпр[:FD]"
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr "следить за FD файла, открытого процессом ИДпр"
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr "ИДпр"
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr "обновить настройки ИДпр процесса"
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr "сохранить ИД процесса в ФАЙЛ"
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr "показать справку и завершить работу"
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr "показать версию программы и завершить работу"
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr "вести запись отладочного журнала в ФАЙЛ"
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Использование: %s [ОПЦИИ] [ФАЙЛ]..."
#: src/main/help.c:461
#: src/main/help.c:414
msgid ""
"Concatenate FILE(s), or standard input, to standard output, with monitoring."
msgstr ""
#: src/main/help.c:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Сообщайте о проблемах на: %s"
@@ -354,11 +358,11 @@ msgstr "передача файлов невозможна при отслежи
msgid "not available on systems without /proc/self/fdinfo"
msgstr "невозможно на системах без /proc/self/fdinfo"
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr "сообщение не получено"
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr "Этой системой не поддерживается SA_SIGINFO"
@@ -404,40 +408,40 @@ msgstr ""
msgid "yzafpnum KMGTPEZY"
msgstr ""
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr "не удалось выделить память для буфера"
#: src/pv/display.c:810
msgid "b"
msgstr "бит"
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr "байт"
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr "бит/с"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr "/с"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr "байт/с"
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr "ОЖИД"
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr "ЗАВЕРШ"
#: src/pv/display.c:1057
msgid "b"
msgstr "бит"
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr "байт"
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "не удалось выделить память для буфера"
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr ""
@@ -490,47 +494,47 @@ msgstr "не удалось выделить память для структу
msgid "file list allocation failed"
msgstr "не удалось выделить память для списка файлов"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "чтение не удалось"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "внимание: замечены ошибки чтения"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr ""
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr ""
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr ""
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "не выделена память для буфера передачи"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "не удалось задать измеритель временного промежутка"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "не удалось очистить измеритель временного промежутка"
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr ""
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "запись не удалась"
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "запрос выборки не удался"
+98 -94
View File
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pv 1.8.14\n"
"Report-Msgid-Bugs-To: pv@ivarch.com\n"
"POT-Creation-Date: 2024-12-02 17:56+0000\n"
"POT-Creation-Date: 2024-12-08 22:22+0000\n"
"PO-Revision-Date: 2024-10-12 23:51+0000\n"
"Last-Translator: a-j-wood <a-j-wood@users.noreply.translate.codeberg.org>\n"
"Language-Team: Turkish <https://translate.codeberg.org/projects/pv/pv/tr/>\n"
@@ -13,255 +13,259 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.7.2\n"
#: src/main/help.c:284
#: src/main/help.c:236
msgid "show progress bar"
msgstr "ilerleme çubuğunu göster"
#: src/main/help.c:287
#: src/main/help.c:239
msgid "show elapsed time"
msgstr "geçen süreyi göster"
#: src/main/help.c:290
#: src/main/help.c:242
msgid "show estimated time of arrival (completion)"
msgstr "tahmini varış (tamamlanma) zamanını göster"
#: src/main/help.c:293
#: src/main/help.c:245
msgid "show absolute estimated time of arrival (completion)"
msgstr "mutlak tahmini varış (tamamlanma) zamanını göster"
#: src/main/help.c:296
#: src/main/help.c:248
msgid "show data transfer rate counter"
msgstr "veri aktarım oranı sayacını göster"
#: src/main/help.c:299
#: src/main/help.c:251
msgid "show data transfer average rate counter"
msgstr "veri aktarımı ortalama hız sayacını göster"
#: src/main/help.c:302
#: src/main/help.c:254
msgid "show number of bytes transferred"
msgstr "aktarılan bayt sayısını göster"
#: src/main/help.c:305
#: src/main/help.c:257
msgid "show percentage of transfer buffer in use"
msgstr "aktarım tamponunun kullanım yüzdesini göster"
#: src/main/help.c:307
#: src/main/help.c:259
msgid "NUM"
msgstr "NUM"
#: src/main/help.c:308
#: src/main/help.c:260
msgid "show NUM bytes last written"
msgstr "son yazılan NUM baytlarını göster"
#: src/main/help.c:310
#: src/main/help.c:262
msgid "FORMAT"
msgstr "FORMAT"
#: src/main/help.c:311
#: src/main/help.c:263
msgid "set output format to FORMAT"
msgstr "çıktı formatını FORMAT olarak ayarlayın"
#: src/main/help.c:314
#: src/main/help.c:266
msgid "output percentages, not visual information"
msgstr "görsel bilgileri değil, yüzdeleri çıktı olarak yazdır"
#: src/main/help.c:317
#: src/main/help.c:269
msgid "do not output any transfer information at all"
msgstr "hiçbir transfer bilgisini yazdırma"
#: src/main/help.c:321
#: src/main/help.c:273
msgid "show number of bits transferred"
msgstr "aktarılan bit sayısını göster"
#: src/main/help.c:324
#: src/main/help.c:276
msgid "treat suffixes as multiples of 1000 rather than 1024"
msgstr "ekleri 1024 yerine 1000'in katları olarak değerlendir"
#: src/main/help.c:327
#: src/main/help.c:279
msgid "display nothing until first byte transferred"
msgstr "ilk bayt aktarılana kadar hiçbir şey gösterme"
#: src/main/help.c:329 src/main/help.c:344 src/main/help.c:347
#: src/main/help.c:281 src/main/help.c:296 src/main/help.c:299
msgid "SEC"
msgstr "SEC"
#: src/main/help.c:330
#: src/main/help.c:282
msgid "display nothing until SEC seconds have passed"
msgstr "SEC saniye geçene kadar hiçbir şey gösterme"
#: src/main/help.c:332
#: src/main/help.c:284
msgid "SIZE"
msgstr "BOYUT"
#: src/main/help.c:333
#: src/main/help.c:285
msgid "set estimated data size to SIZE bytes"
msgstr "tahmini veri boyutunu BOYUT bayt olarak ayarlayın"
#: src/main/help.c:336
#: src/main/help.c:288
msgid "if size unknown, show rate vs max rate"
msgstr "boyut bilinmiyorsa, oranı maksimum oranla göster"
#: src/main/help.c:339
#: src/main/help.c:291
msgid "count lines instead of bytes"
msgstr "bayt yerine satır say"
#: src/main/help.c:342
#: src/main/help.c:294
msgid "lines are null-terminated"
msgstr "satırlar boş sonlandırılır"
#: src/main/help.c:345
#: src/main/help.c:297
msgid "update every SEC seconds"
msgstr "her SEC saniyede bir güncelleme"
#: src/main/help.c:348
#: src/main/help.c:300
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:350
#: src/main/help.c:302
msgid "WIDTH"
msgstr "GENİŞLİK"
#: src/main/help.c:351
#: src/main/help.c:303
msgid "assume terminal is WIDTH characters wide"
msgstr "terminalin GENİŞLİK karakter genişliğinde olduğunu varsayalım"
#: src/main/help.c:353
#: src/main/help.c:305
msgid "HEIGHT"
msgstr "YÜKSEKLİK"
#: src/main/help.c:354
#: src/main/help.c:306
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:356
#: src/main/help.c:308
msgid "NAME"
msgstr "İSİM"
#: src/main/help.c:357
#: src/main/help.c:309
msgid "prefix visual information with NAME"
msgstr "görsel bilgiyi İSİM ile öne ekle"
#: src/main/help.c:359
#: src/main/help.c:311
msgid "SPEC"
msgstr ""
#: src/main/help.c:360
#: src/main/help.c:312
msgid "also send progress to SPEC"
msgstr ""
#: src/main/help.c:363
#: src/main/help.c:315
msgid "output transfer statistics at the end"
msgstr "transfer istatistiklerini sonda göster"
#: src/main/help.c:366
#: src/main/help.c:318
msgid "output even if standard error is not a terminal"
msgstr "standart hata bir terminal olmasa bile çıktı yazdır"
#: src/main/help.c:369
#: src/main/help.c:321
msgid "use cursor positioning escape sequences"
msgstr "imleç konumlandırma kaçış dizilerini kullan"
#: src/main/help.c:372 src/main/help.c:402 src/main/help.c:414
#: src/main/help.c:424
#: src/main/help.c:324 src/main/help.c:354 src/main/help.c:366
#: src/main/help.c:376
msgid "FILE"
msgstr "DOSYA"
#: src/main/help.c:373
#: src/main/help.c:325
msgid "write output to FILE instead of stdout"
msgstr "çıktıyı stdout yerine DOSYA'ya yaz"
#: src/main/help.c:375
#: src/main/help.c:327
msgid "RATE"
msgstr "ORAN"
#: src/main/help.c:376
#: src/main/help.c:328
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:378 src/main/help.c:387
#: src/main/help.c:330 src/main/help.c:339
msgid "BYTES"
msgstr "BAYTLAR"
#: src/main/help.c:379
#: src/main/help.c:331
msgid "use a buffer size of BYTES"
msgstr "BAYTLAR tampon boyutu kullanın"
#: src/main/help.c:382
#: src/main/help.c:334
msgid "never use splice(), always use read/write"
msgstr "splice() kullanma, her zaman read/write kullan"
#: src/main/help.c:385
#: src/main/help.c:337
msgid "skip read errors in input"
msgstr "girdideki okuma hatalarını atla"
#: src/main/help.c:388
#: src/main/help.c:340
msgid "skip errors in BYTES blocks at a time"
msgstr "BAYTLAR blokları halinde hataları atla"
#: src/main/help.c:391
#: src/main/help.c:343
msgid "stop after --size bytes have been transferred"
msgstr "--size bayt transfer edildikten sonra dur"
#: src/main/help.c:394
#: src/main/help.c:346
msgid "flush cache to disk after every write"
msgstr "her yazmadan sonra önbelleği diske boşalt"
#: src/main/help.c:397
#: src/main/help.c:349
msgid "use direct I/O to bypass cache"
msgstr "Önbelleği atlamak için doğrudan I/O kullan"
#: src/main/help.c:400
#: src/main/help.c:352
msgid "discard input instead of writing to output"
msgstr "Girdiyi çıktıya yazmak yerine yok say"
#: src/main/help.c:403
#: src/main/help.c:355
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:405
#: src/main/help.c:357
msgid "PID[:FD]"
msgstr "PID[:FD]"
#: src/main/help.c:406
#: src/main/help.c:358
msgid "watch file FD opened by process PID"
msgstr "FD izleme dosyası PID işlemi tarafından açıldı"
#: src/main/help.c:409
#: src/main/help.c:361
msgid "PID"
msgstr "PID"
#: src/main/help.c:410
#: src/main/help.c:362
msgid "update settings of process PID"
msgstr "süreç PID ayarlarını güncelle"
#: src/main/help.c:415
#: src/main/help.c:367
msgid "save process ID in FILE"
msgstr "FILE'da işlem kimliğini (ID) kaydet"
#: src/main/help.c:418
#: src/main/help.c:370
msgid "show this help and exit"
msgstr "bu yardımı göster ve çık"
#: src/main/help.c:421
#: src/main/help.c:373
msgid "show version information and exit"
msgstr "sürüm bilgilerini göster ve çık"
#: src/main/help.c:425
#: src/main/help.c:377
msgid "write debug logs to FILE"
msgstr "Hata ayıklama kayıtlarını DOSYA'ya yaz"
#: src/main/help.c:450
#: src/main/help.c:403
#, c-format
msgid "Usage: %s [OPTION] [FILE]..."
msgstr "Kullanım şekli: %s [AYAR] [DOSYA]..."
#: src/main/help.c:461
#: src/main/help.c:414
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:598
#: src/main/help.c:552
msgid "Supported format sequences:"
msgstr ""
#: src/main/help.c:566
#, c-format
msgid "Please report any bugs to: %s"
msgstr "Lütfen hataları şu adrese bildirin: %s"
@@ -356,11 +360,11 @@ msgstr "dosya tanımlayıcıları izlenirken dosya aktarılamıyor"
msgid "not available on systems without /proc/self/fdinfo"
msgstr "/proc/self/fdinfo olmayan sistemlerde kullanılamaz"
#: src/main/remote.c:304
#: src/main/remote.c:309
msgid "message not received"
msgstr "mesaj alınamadı"
#: src/main/remote.c:431
#: src/main/remote.c:440
msgid "SA_SIGINFO not supported on this system"
msgstr "SA_SIGINFO bu sistemde desteklenmiyor"
@@ -405,40 +409,40 @@ msgstr "yzafpnum kMGTPEZY"
msgid "yzafpnum KMGTPEZY"
msgstr "yzafpnum KMGTPEZY"
#: src/pv/display.c:681 src/pv/transfer.c:1011
msgid "buffer allocation failed"
msgstr "arabellek tahsisi başarısız oldu"
#: src/pv/display.c:810
msgid "b"
msgstr "b"
#: src/pv/display.c:813 src/pv/transfer.c:602
msgid "B"
msgstr "B"
#: src/pv/display.c:857 src/pv/display.c:872 src/pv/display.c:1091
#: src/pv/display.c:523 src/pv/display.c:998 src/pv/display.c:1027
#: src/pv/loop.c:549
msgid "b/s"
msgstr "b/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
msgid "/s"
msgstr "/s"
#: src/pv/display.c:861 src/pv/display.c:876 src/pv/display.c:1095
#: src/pv/display.c:527 src/pv/display.c:1002 src/pv/display.c:1031
#: src/pv/loop.c:549
msgid "B/s"
msgstr "B/s"
#: src/pv/display.c:904 src/pv/display.c:908
#: src/pv/display.c:875 src/pv/display.c:879
msgid "ETA"
msgstr "ETA"
#: src/pv/display.c:974
#: src/pv/display.c:961
msgid "FIN"
msgstr "FIN"
#: src/pv/display.c:1057
msgid "b"
msgstr "b"
#: src/pv/display.c:1060 src/pv/transfer.c:594
msgid "B"
msgstr "B"
#: src/pv/display.c:1641 src/pv/transfer.c:1056
msgid "buffer allocation failed"
msgstr "arabellek tahsisi başarısız oldu"
#: src/pv/file.c:149
msgid "failed to seek to start of output"
msgstr "çıktının başlangıcına ulaşılamadı"
@@ -491,47 +495,47 @@ 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"
#: src/pv/transfer.c:464
#: src/pv/transfer.c:463
msgid "read failed"
msgstr "okuma başarısız"
#: src/pv/transfer.c:487
#: src/pv/transfer.c:479
msgid "warning: read errors detected"
msgstr "uyarı: okuma hataları tespit edildi"
#: src/pv/transfer.c:503
#: src/pv/transfer.c:495
msgid "file is not seekable"
msgstr "dosya aranabilir değil"
#: src/pv/transfer.c:581
#: src/pv/transfer.c:573
msgid "failed to seek past error"
msgstr "geçmiş hatayı aramakta başarısız oldu"
#: src/pv/transfer.c:601
#: src/pv/transfer.c:593
msgid "skipped past read error"
msgstr "geçmiş okuma hatası atlandı"
#: src/pv/transfer.c:642
#: src/pv/transfer.c:634
msgid "no transfer buffer allocated"
msgstr "aktarım arabelleği ayrılmamış"
#: src/pv/transfer.c:684
#: src/pv/transfer.c:676
msgid "failed to set interval timer"
msgstr "aralık zamanlayıcısı ayarlanamadı"
#: src/pv/transfer.c:710
#: src/pv/transfer.c:702
msgid "failed to clear interval timer"
msgstr "aralık zamanlayıcısı temizlenemedi"
#: src/pv/transfer.c:740
#: src/pv/transfer.c:744
msgid "line position buffer allocation failed"
msgstr "satır konumu arabellek tahsisi başarısız oldu"
#: src/pv/transfer.c:872
#: src/pv/transfer.c:917
msgid "write failed"
msgstr "yazma başarısız"
#: src/pv/transfer.c:1109
#: src/pv/transfer.c:1154
msgid "select call failed"
msgstr "seçme çağrısı başarısız oldu"
+8
View File
@@ -43,3 +43,11 @@ typedef bool _Bool;
# define true 1
# define __bool_true_false_are_defined 1
#endif
/* Whether "--remote" should be available. */
#undef PV_REMOTE_CONTROL
#if HAVE_DECL_SA_SIGINFO
# if SIGINFO_PROVIDES_PID
#define PV_REMOTE_CONTROL 1
# endif
#endif
+4
View File
@@ -28,6 +28,10 @@
*/
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the declaration of `SA_SIGINFO', and to 0 if you
don't. */
#undef HAVE_DECL_SA_SIGINFO
/* Define to 1 if you have the `dup2' function. */
#undef HAVE_DUP2
+43 -37
View File
@@ -20,26 +20,6 @@
extern "C" {
#endif
/*
* Types of display component that make up an output string.
*/
typedef enum {
PV_COMPONENT_STRING, /* fixed string */
PV_COMPONENT_PROGRESS, /* progress bar, with percentage if known */
PV_COMPONENT_BYTES, /* number of bytes transferred */
PV_COMPONENT_TIMER, /* elapsed time */
PV_COMPONENT_RATE, /* current transfer rate */
PV_COMPONENT_AVERAGERATE, /* average transfer rate */
PV_COMPONENT_ETA, /* estimated time remaining until completion */
PV_COMPONENT_FINETA, /* estimated time of completion */
PV_COMPONENT_NAME, /* name prefix */
PV_COMPONENT_BUFPERCENT, /* percentage of buffer used */
PV_COMPONENT_OUTPUTBUF, /* recent bytes in output buffer */
PV_COMPONENT__MAX
} pv_display_component;
#define PV_SIZEOF_COMPONENT_STR 1024 /* size of buffer for each component */
#define RATE_GRANULARITY 100000000 /* nsec between -L rate chunks */
#define RATE_BURST_WINDOW 5 /* rate burst window (multiples of rate) */
#define REMOTE_INTERVAL 100000000 /* nsec between checks for -R */
@@ -55,7 +35,8 @@ typedef enum {
#define PV_SIZEOF_DEFAULT_FORMAT 512
#define PV_SIZEOF_CWD 4096
#define PV_SIZEOF_LASTOUTPUT_BUFFER 256
#define PV_SIZEOF_LASTWRITTEN_BUFFER 256
#define PV_SIZEOF_PREVLINE_BUFFER 1024
#define PV_FORMAT_ARRAY_MAX 100
#define PV_SIZEOF_CRS_LOCK_FILE 1024
@@ -76,6 +57,15 @@ struct pvcursorstate_s {
bool tty_tostop_added; /* whether any instance had to set TOSTOP 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;
/*
* Structure for holding PV internal state. Opaque outside the PV library.
@@ -159,13 +149,13 @@ struct pvstate_s {
struct sigaction old_sigint;
struct sigaction old_sighup;
struct sigaction old_sigterm;
#ifdef SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
struct sigaction old_sigusr2;
#endif
struct sigaction old_sigalrm;
struct timespec tstp_time; /* see pv_sig_tstp() / __cont() */
struct timespec toffset; /* total time spent stopped */
#ifdef SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
volatile sig_atomic_t rxusr2; /* whether SIGUSR2 was received */
volatile pid_t sender; /* PID of sending process for SIGUSR2 */
#endif
@@ -189,29 +179,44 @@ struct pvstate_s {
*****************/
struct pvdisplay_s {
struct { /* format string broken into display components */
size_t str_start; /* for strings: start offset */
size_t str_length; /* for strings: length */
pv_display_component type; /* type of display component */
struct pvdisplay_segment_s { /* format string broken into segments */
/* See pv__format_init() for more details. */
int type; /* component type, -1 for static string */
size_t chosen_size; /* "n" from %<n>A, or 0 */
size_t offset; /* start offset of this segment */
size_t bytes; /* length of segment in bytes */
size_t width; /* displayed width of segment */
} format[PV_FORMAT_ARRAY_MAX];
struct { /* display components */
char content[PV_SIZEOF_COMPONENT_STR]; /* string to display */
size_t length; /* number of bytes in string */
bool required; /* true if included in format */
} component[PV_COMPONENT__MAX];
/* The last-written "n" bytes. */
char lastwritten_buffer[PV_SIZEOF_LASTWRITTEN_BUFFER];
char lastoutput_buffer[PV_SIZEOF_LASTOUTPUT_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 */
size_t display_buffer_size; /* size allocated to display buffer */
size_t display_string_len; /* length of string in display buffer */
size_t display_string_bytes; /* byte length of string in display buffer */
size_t display_string_width; /* displayed width of string in display buffer */
off_t initial_offset; /* offset when first opened (when watching fds) */
size_t lastoutput_length; /* number of last-output bytes to show */
size_t lastwritten_bytes; /* largest number of last-written bytes to show */
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 */
unsigned int prev_screen_width; /* screen width last time we were called */
bool showing_timer; /* set if showing timer */
bool showing_bytes; /* set if showing byte/line count */
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 final_update; /* set internally on the final update */
bool display_visible; /* set once anything written to terminal */
} display;
@@ -306,7 +311,7 @@ struct pvstate_s {
off_t transferred; /* amount transferred (written - unconsumed) */
/* Keep track of line positions to backtrack written_but_not_consumed. */
/*@null@*/ off_t *line_positions; /* line separator write positions (circular buffer) */
/*@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 */
@@ -367,6 +372,7 @@ struct pvwatchfd_s {
typedef struct pvwatchfd_s *pvwatchfd_t;
typedef struct pvdisplay_s *pvdisplay_t;
typedef struct pvdisplay_segment_s *pvdisplay_segment_t;
void pv_error(pvstate_t, char *, ...);
@@ -376,7 +382,7 @@ bool pv_format(pvstate_t, /*@null@*/ const char *, pvdisplay_t, bool, bool);
void pv_display(pvstate_t, bool);
ssize_t pv_transfer(pvstate_t, int, bool *, bool *, off_t, long *);
int pv_next_file(pvstate_t, unsigned int, int);
/*@out@*/ const char *pv_current_file_name(pvstate_t);
/*@keep@*/ const char *pv_current_file_name(pvstate_t);
void pv_write_retry(int, const char *, size_t);
void pv_tty_write(pvstate_t, const char *, size_t);
+11 -1
View File
@@ -115,6 +115,11 @@ extern size_t pv_strlcat(char *, const char *, size_t);
*/
/*@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);
/*
* Functions relating to elapsed time.
*/
@@ -238,7 +243,7 @@ extern off_t pv_calc_total_size(pvstate_t);
*/
extern void pv_sig_init(pvstate_t);
#ifdef SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
/*
* Return true if SIGUSR2 has been received, and indicate the sender.
*/
@@ -270,6 +275,11 @@ extern void pv_sig_fini(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 *, ...);
+32 -64
View File
@@ -22,77 +22,27 @@
/*
* Return the number of display columns needed to show the given string.
*
* To do this, we convert it to a wide character string, and use the wide
* character display width function "wcswidth()" on it.
* 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 width;
#if defined(ENABLE_NLS) && defined(HAVE_WCHAR_H)
size_t wide_char_count;
size_t wide_string_buffer_size;
wchar_t *wide_string;
size_t bytes;
if (NULL == string)
return 0;
/*@-nullpass@ */
bytes = strlen(string); /* flawfinder: ignore */
/*
* splint note: mbstowcs() manual page on Linux explicitly says it
* takes NULL.
* flawfinder rationale: we have already checked for NULL, and it is
* explicitly required of the caller to provide a null-terminated
* string.
*/
wide_char_count = mbstowcs(NULL, string, 0);
/*@+nullpass@ */
if (wide_char_count == (size_t) -1) {
debug("%s: %s: %s", "mbstowcs", string, strerror(errno));
return strlen(string); /* flawfinder: ignore */
/*
* flawfinder rationale: we have already checked for NULL,
* and we don't know the size of the originating buffer so
* can't use strnlen(); it is up to the caller to provide a
* terminated string.
*/
}
wide_string_buffer_size = sizeof(*wide_string) * (1 + wide_char_count);
wide_string = malloc(wide_string_buffer_size);
if (NULL == wide_string) {
perror("malloc");
return strlen(string); /* flawfinder: ignore */
/* flawfinder rationale: see above. */
}
memset(wide_string, 0, wide_string_buffer_size);
if (mbstowcs(wide_string, string, 1 + wide_char_count) == (size_t) -1) {
debug("%s: %s: %s", "mbstowcs", string, strerror(errno));
width = strlen(string); /* flawfinder: ignore */
/* flawfinder rationale: see above. */
} else if (NULL != wide_string) {
/*@-unrecog @ */
/* splint seems unable to see the prototype. */
width = wcswidth(wide_string, wide_char_count);
/*@+unrecog @ */
} else {
width = 0;
}
free(wide_string);
#else /* ! defined(ENABLE_NLS) && defined(HAVE_WCHAR_H) */
if (NULL == string)
return 0;
width = strlen(string); /* flawfinder: ignore */
/* flawfinder rationale: see above. */
#endif /* defined(ENABLE_NLS) && defined(HAVE_WCHAR_H) */
return width;
return pv_strwidth(string, bytes);
}
@@ -134,9 +84,9 @@ static void display_word_wrap_7bit(const char *string, size_t display_width, siz
/*
* Output a string to standard output, word wrapping to "display_width"
* display character positions, and left-padding any new lines after the
* first one with "left_margin" spaces.
* Output a null-terminated string to standard output, word wrapping to
* "display_width" display character positions, 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.
@@ -153,7 +103,7 @@ static void display_word_wrap(const char *string, size_t display_width, size_t l
return;
/*@-nullpass@ */
/* splint note: see earlier mbstowcs() call. */
/* splint note: see mbstowcs() call in pv_strwidth(). */
wide_char_count = mbstowcs(NULL, string, 0);
/*@+nullpass@ */
if (wide_char_count == (size_t) -1) {
@@ -181,7 +131,9 @@ static void display_word_wrap(const char *string, size_t display_width, size_t l
start_idx = 0;
chars_remaining = wide_char_count;
/*@-unrecog@ *//* splint seems unable to see the prototype for wcswidth(). */
while (chars_remaining > 0 && wcswidth(&(wide_string[start_idx]), chars_remaining) > display_width) {
/*@+unrecog@ */
size_t next_idx;
end_idx = start_idx + display_width;
@@ -405,11 +357,11 @@ void display_help(void)
{ "-d", "--watchfd", N_("PID[:FD]"),
N_("watch file FD opened by process PID"),
{ 0, 0, 0, 0} },
#ifdef SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
{ "-R", "--remote", N_("PID"),
N_("update settings of process PID"),
{ 0, 0, 0, 0} },
#endif /* SIGINFO_PROVIDES_PID */
#endif /* PV_REMOTE_CONTROL */
{ "", NULL, NULL, NULL, { 0, 0, 0, 0} },
{ "-P", "--pidfile", N_("FILE"),
N_("save process ID in FILE"),
@@ -434,6 +386,7 @@ void display_help(void)
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);
@@ -593,6 +546,21 @@ void display_help(void)
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);
printf("\n");
}
printf("\n ");
display_word_wrap(format_sequences, right_margin, 2);
free(format_sequences);
printf("\n");
}
printf("\n");
bug_report_note = _("Please report any bugs to: %s");
+17 -8
View File
@@ -21,7 +21,7 @@
#include <sys/time.h>
#include <sys/stat.h>
#ifdef SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
void pv_error(pvstate_t, char *, ...);
struct remote_msg {
@@ -44,11 +44,13 @@ struct remote_msg {
bool height_set_manually; /* height was set manually, not detected */
char name[256]; /* flawfinder: ignore */
char format[256]; /* flawfinder: ignore */
char extra_display[256]; /* flawfinder: ignore */
};
/*
* flawfinder rationale: name and format are always explicitly zeroed and
* bounded to one less than their size so they are always \0 terminated.
* 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.
*/
@@ -207,11 +209,14 @@ int pv_remote_set(opts_t opts, pvstate_t state)
if (opts->format != NULL) {
strncpy(msgbuf.format, opts->format, sizeof(msgbuf.format) - 1); /* flawfinder: ignore */
}
if (opts->extra_display != NULL) {
strncpy(msgbuf.extra_display, opts->extra_display, sizeof(msgbuf.extra_display) - 1); /* flawfinder: ignore */
}
/*
* flawfinder rationale: both name and format are explicitly bounded
* to 1 less than the size of their buffer and the buffer is \0
* terminated by memset() earlier.
* 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.
*/
/*
@@ -364,9 +369,11 @@ void pv_remote_check(pvstate_t state)
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_set_format(state, msgbuf.progress, msgbuf.timer,
msgbuf.eta, msgbuf.fineta, msgbuf.rate,
@@ -389,6 +396,8 @@ void pv_remote_check(pvstate_t state)
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);
}
@@ -407,10 +416,10 @@ void pv_remote_fini(void)
{
}
#else /* !SIGINFO_PROVIDES_PID */
#else /* !PV_REMOTE_CONTROL */
/*
* Dummy stubs for remote control when we don't have SIGINFO_PROVIDES_PID.
* Dummy stubs for remote control when we don't have PV_REMOTE_CONTROL.
*/
void pv_remote_init(void)
{
+1199 -653
View File
File diff suppressed because it is too large Load Diff
-3
View File
@@ -136,9 +136,6 @@ void pv_elapsedtime_add(struct timespec *return_time, const struct timespec *fir
* large enough and are relying on the compiler to do the casting
* correctly, since the manual for timespec(3) states the types are
* implementation-defined.
*
* TODO: review this to make sure that this isn't just an elaborate
* excuse for "it's hard to fix and I don't know how".
*/
}
+1 -1
View File
@@ -390,7 +390,7 @@ int pv_next_file(pvstate_t state, unsigned int filenum, int oldfd)
* internal state and must not be passed to free() or used after "state" is
* freed.
*/
/*@out@*/ const char *pv_current_file_name(pvstate_t state)
/*@keep@*/ const char *pv_current_file_name(pvstate_t state)
{
static char *str_none = NULL;
static char *str_stdin = NULL;
+3 -3
View File
@@ -226,7 +226,7 @@ static void pv_sig_term( /*@unused@ */ __attribute__((unused))
}
#ifdef SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
/*
* Handle a SIGUSR2 by setting a flag to say we received it, after recording
* the sending PID.
@@ -375,7 +375,7 @@ void pv_sig_init(pvstate_t state)
sa.sa_flags = 0;
(void) sigaction(SIGTERM, &sa, &(pv_sig_state->signal.old_sigterm));
#ifdef SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
/*
* Handle SIGUSR2 by setting a flag to say the signal has been
* received, and storing the sending process's PID.
@@ -431,7 +431,7 @@ void pv_sig_fini( /*@unused@ */ __attribute__((unused)) pvstate_t state)
(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 SIGINFO_PROVIDES_PID
#ifdef PV_REMOTE_CONTROL
(void) sigaction(SIGUSR2, &(pv_sig_state->signal.old_sigusr2), NULL);
#endif
(void) sigaction(SIGALRM, &(pv_sig_state->signal.old_sigalrm), NULL);
+127 -2
View File
@@ -13,6 +13,12 @@
#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
/*
@@ -151,6 +157,7 @@ char *pv_strdup(const char *original)
return duplicate;
}
/*
* Return a pointer to the last matching character in the buffer, or NULL if
* not found.
@@ -160,9 +167,9 @@ char *pv_strdup(const char *original)
void *pv_memrchr(const void *buffer, int match, size_t length)
{
#ifdef HAVE_MEMRCHR
/*@-unrecog @ *//* splint doesn't know of memrchr() */
/*@-unrecog@ *//* splint doesn't know of memrchr() */
return memrchr(buffer, match, length);
/*@+unrecog @ */
/*@+unrecog@ */
#else
unsigned char *ptr;
@@ -179,3 +186,121 @@ void *pv_memrchr(const void *buffer, int match, size_t length)
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.
*
* To do this, we convert it to a wide character string, and use the wide
* character display width function "wcswidth()" on it.
*
* If NLS is disabled, or the string cannot be converted, this just returns
* the value of "bytes".
*
* 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) {
perror("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 seems unable to 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;
}
+80 -35
View File
@@ -113,7 +113,7 @@ static int is_data_ready(int fd_in, /*@null@ */ bool *fd_in_ready, int fd_out, /
* We stop retrying if the time elapsed since this function was entered
* reaches TRANSFER_READ_TIMEOUT seconds.
*/
static ssize_t pv__transfer_read_repeated(int fd, void *buf, size_t count)
static ssize_t pv__transfer_read_repeated(int fd, char *buf, size_t count)
{
struct timespec start_time;
ssize_t total_read;
@@ -193,7 +193,7 @@ static ssize_t pv__transfer_read_repeated(int fd, void *buf, size_t count)
* We stop retrying if the time elapsed since this function was entered
* reaches TRANSFER_WRITE_TIMEOUT seconds.
*/
static ssize_t pv__transfer_write_repeated(int fd, void *buf, size_t count, bool sync_after_write)
static ssize_t pv__transfer_write_repeated(int fd, char *buf, size_t count, bool sync_after_write)
{
struct timespec start_time;
ssize_t total_written;
@@ -460,15 +460,7 @@ static int pv__transfer_read(pvstate_t state, int fd, bool *eof_in, bool *eof_ou
* reached the end of this file.
*/
if (do_not_skip_errors) {
/*@-compdef@ */
pv_error(state, "%s: %s: %s", pv_current_file_name(state), _("read failed"), strerror(errno));
/*@+compdef@ */
/*
* splint says the storage pointed to by the result of
* pv_current_file_name() is not fully defined.
*
* TODO: investigate and fix the reason for this.
*/
*eof_in = true;
if (state->transfer.write_position >= state->transfer.read_position) {
*eof_out = true;
@@ -718,28 +710,42 @@ static int pv__transfer_write(pvstate_t state, bool *eof_in, bool *eof_out, long
}
if (nwritten > 0) {
bool tracking_lines = false;
if ((state->control.linemode) && (lineswritten != NULL))
tracking_lines = true;
else if (state->display.showing_previous_line)
tracking_lines = true;
/*
* Write returned >0 - data successfully written.
*/
if ((state->control.linemode) && (lineswritten != NULL)) {
if (tracking_lines) {
char separator;
char *ptr;
long lines = 0;
/*
* Line mode - look through what we've just written
* to count how many lines there were.
* Tracking lines - either line mode, or we're
* showing the last line in the display, or both.
* So we need to look through what we've just
* written to either count how many lines there
* were, or get the content of the most recent
* complete line, or both.
*/
/* Allocate buffer to remember line positions. */
if (NULL == state->transfer.line_positions) {
if (NULL == state->transfer.line_positions && NULL != lineswritten) {
state->transfer.line_positions_capacity = MAX_LINE_POSITIONS;
/*@-mustfreeonly@ */
state->transfer.line_positions =
calloc((size_t) (state->transfer.line_positions_capacity), sizeof(off_t));
if (NULL == state->transfer.line_positions) {
pv_error(state, "%s: %s", _("line position buffer allocation failed"),
strerror(errno));
}
/*@+mustfreeonly@ */
/* splint doesn't see we only call calloc() when line_positions is NULL. */
}
if (state->control.null_terminated_lines) {
@@ -752,12 +758,50 @@ static int pv__transfer_write(pvstate_t state, bool *eof_in, bool *eof_out, long
for (ptr++;
ptr - (char *) state->transfer.transfer_buffer - state->transfer.write_position <
(size_t) nwritten; ptr++, state->transfer.last_output_position++) {
if (*ptr != separator)
if (*ptr != separator) {
/*
* If we're displaying the previous
* line ("%L"), add to our line
* buffer.
*/
if (state->display.showing_previous_line
&& state->display.next_line_len < PV_SIZEOF_PREVLINE_BUFFER - 1) {
state->display.next_line[state->display.next_line_len] = *ptr;
state->display.next_line_len++;
}
continue;
}
/* Separator found - increment line count. */
++lines;
/*
* If we're displaying the previous line
* ("%L"), update the previous-line buffer
* with the line we just completed, and
* start a new one.
*/
if (state->display.showing_previous_line) {
memset(state->display.previous_line, 0, PV_SIZEOF_PREVLINE_BUFFER);
if (state->display.next_line_len > PV_SIZEOF_PREVLINE_BUFFER - 1)
state->display.next_line_len = PV_SIZEOF_PREVLINE_BUFFER - 1;
if (state->display.next_line_len > 0) {
memcpy(state->display.previous_line, state->display.next_line, /* flawfinder: ignore */
state->display.next_line_len);
debug("%s: [%s]", "updated previous_line",
state->display.previous_line);
}
state->display.next_line_len = 0;
/*
* flawfinder - next_line_len is
* guaranteed to be less than the
* size of the previous_line buffer
* since we check it just before
* memcpy(), and we ensure that the
* last byte in the buffer is \0.
*/
}
if (NULL == state->transfer.line_positions)
continue;
@@ -777,7 +821,8 @@ static int pv__transfer_write(pvstate_t state, bool *eof_in, bool *eof_out, long
}
}
*lineswritten += lines;
if (NULL != lineswritten)
*lineswritten += lines;
}
state->transfer.write_position += nwritten;
@@ -787,39 +832,39 @@ static int pv__transfer_write(pvstate_t state, bool *eof_in, bool *eof_out, long
* If we're monitoring the output, update our copy of the
* last few bytes we've written.
*/
if (state->display.component[PV_COMPONENT_OUTPUTBUF].required && (nwritten > 0)) {
size_t new_portion_length, old_portion_length;
if (state->display.showing_last_written && (nwritten > 0)) {
size_t new_portion_size, old_portion_size;
new_portion_length = (size_t) nwritten;
if (new_portion_length > state->display.lastoutput_length)
new_portion_length = state->display.lastoutput_length;
new_portion_size = (size_t) nwritten;
if (new_portion_size > state->display.lastwritten_bytes)
new_portion_size = state->display.lastwritten_bytes;
old_portion_length = state->display.lastoutput_length - new_portion_length;
old_portion_size = state->display.lastwritten_bytes - new_portion_size;
/*
* Make room for the new portion.
*/
if (old_portion_length > 0) {
memmove(state->display.lastoutput_buffer,
state->display.lastoutput_buffer + new_portion_length, old_portion_length);
if (old_portion_size > 0) {
memmove(state->display.lastwritten_buffer,
state->display.lastwritten_buffer + new_portion_size, old_portion_size);
}
/*
* Copy the new data in.
*/
memcpy(state->display.lastoutput_buffer + /* flawfinder: ignore */
old_portion_length,
state->transfer.transfer_buffer + state->transfer.write_position - new_portion_length,
new_portion_length);
memcpy(state->display.lastwritten_buffer + /* flawfinder: ignore */
old_portion_size,
state->transfer.transfer_buffer + state->transfer.write_position - new_portion_size,
new_portion_size);
/*
* flawfinder rationale: calculations above ensure
* that old_portion_length + new_portion_length is
* always <= lastoutput_length, and
* lastoutput_length is guaranteed by
* that old_portion_size + new_portion_size is
* always <= lastwritten_bytes, and
* lastwritten_bytes is guaranteed by
* pv__format_init() to be no more than
* PV_SIZEOF_LASTOUTPUT_BUFFER, which is the size of
* lastoutput_buffer, so the memcpy() will always
* fit into the buffer.
* PV_SIZEOF_LASTWRITTEN_BUFFER, which is the size
* of lastwritten_buffer, so the memcpy() will
* always fit into the buffer.
*/
}
@@ -4,6 +4,9 @@
# 1MiB, described here:
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586763
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -3,6 +3,9 @@
# This is the same as the other display length at magnitude boundary check,
# but for rate, not bytes transferred.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
# Dummy assignments for "shellcheck".
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+8
View File
@@ -2,9 +2,17 @@
#
# Test that "make install" installs the expected minimum set of files.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
if test "${XCTEST}" = "1"; then
echo "cross-compile flag set - skipping as local make will not run"
exit 77
fi
makeDir="${testSubject%/*}"
if ! test -d "${makeDir}"; then
echo "could not find the directory to run \`make' in"
+3
View File
@@ -3,6 +3,9 @@
# Check that the average transfer rate counter changes, but not more than it
# should.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that the byte counter counts in bits when --bits is selected.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that "--buffer-percent" displays correctly.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that the byte counter counts.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that the estimated time counter counts.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that the estimated time counter can show the end time of day.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that "--last-written" works.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that numeric output outputs some percentages.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -3,6 +3,9 @@
# Check that numeric output gives a byte count instead of a percentage when
# used with -b.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -3,6 +3,9 @@
# Check that numeric output shows line counts instead of percentages, when
# used in line mode together with bytes mode.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that numeric output gives a timer when used with -t.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that the progress bar moves when data is coming in.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that the progress bar increases in size when data is coming in.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that the -q option shuts everything up.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that the transfer rate counter changes.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that the elapsed time counter does count up.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -3,6 +3,9 @@
# Check that the process ID can be written to a file as described in the
# manual.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that size arguments are processed correctly.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
# Pass size argument $1 and check that the last reported number is $2.
+3
View File
@@ -2,6 +2,9 @@
#
# Check that data can be just passed straight through.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
inputString="TESTING"
+3
View File
@@ -3,6 +3,9 @@
# Transfer a large chunk of data through pv and check data correctness
# afterwards.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
@@ -3,6 +3,9 @@
# Transfer a large chunk of data through pv using pipes, sending it in a
# bursty fashion, and check data correctness afterwards.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Make sure that files larger than 2GB are supported.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that there is no SIGPIPE or dropped data on bigger data transfers.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
# We nead GNU head. On some platforms it is named ghead instead of head.
@@ -3,6 +3,9 @@
# Try repeatedly messaging a transfer process, and make sure the data stays
# intact.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
@@ -33,6 +36,8 @@ for loopCount in 1 2 3; do
(usleep 200000 || sleep 1) 2>/dev/null
"${testSubject}" -R "$(cat "${workFile4}")" -F "%e" || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
"${testSubject}" -R "$(cat "${workFile4}")" -x "window:%b" || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
"${testSubject}" -R "$(cat "${workFile4}")" -N "." || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
echo "${loopCount}" >/dev/null # dummy for shellcheck
+3
View File
@@ -3,6 +3,9 @@
# Run valgrind's memory checker against a process using various different
# transfer options.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${sourcePath:?not set - call this from 'make check'}"
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -3,6 +3,9 @@
# Run valgrind's memory checker against a process that sets is process
# title.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${sourcePath:?not set - call this from 'make check'}"
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Run valgrind's memory checker while receiving remote control commands.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${sourcePath:?not set - call this from 'make check'}"
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -34,6 +37,8 @@ for loopCount in 1 2 3; do
(usleep 200000 || sleep 1) 2>/dev/null
"${testSubject}" -R "$(cat "${workFile3}")" -F "%e" || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
"${testSubject}" -R "$(cat "${workFile4}")" -x "window:%b" || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
"${testSubject}" -R "$(cat "${workFile3}")" -N "." || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
echo "${loopCount}" >/dev/null # dummy for shellcheck
@@ -3,6 +3,9 @@
# Run valgrind's memory checker while using remote control to control
# another process.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${sourcePath:?not set - call this from 'make check'}"
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -33,6 +36,8 @@ runWithValgrind -R "$(cat "${workFile3}")" -N "test" 4>&1 || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
runWithValgrind -R "$(cat "${workFile3}")" -F "%e" 4>&1 || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
runWithValgrind -R "$(cat "${workFile3}")" -x "window:%b" 4>&1 || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
runWithValgrind -R "$(cat "${workFile3}")" -N "." 4>&1 || exit 1
(usleep 200000 || sleep 1) 2>/dev/null
runWithValgrind -R "$(cat "${workFile3}")" -L 10M 4>&1 || exit 1
+3
View File
@@ -3,6 +3,9 @@
# Run valgrind's memory checker against a process using the --watchfd
# option.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${sourcePath:?not set - call this from 'make check'}"
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -5,6 +5,9 @@
# doesn't check that O_DIRECT is actually being used, it just checks that
# data is not being corrupted.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+3
View File
@@ -3,6 +3,9 @@
# Check that the progress bar is produced when "--force" is used, and is not
# when it is not, providing stderr is a file.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that the update interval can be set.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that line mode counts lines instead of bytes.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that "--size" affects the percentage shown.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
@@ -3,6 +3,9 @@
# Similar to the "--size" check but, instead, using another file's size with
# "--size @".
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+3
View File
@@ -5,6 +5,9 @@
# check that fdatasync() is actually being called, it just checks that data
# is not being corrupted.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that the terminal width is detected on startup.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# A simple test of rate limiting.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
# Transfer 102 bytes at 100 bytes/sec. It should take at least 1 second.
+3
View File
@@ -2,6 +2,9 @@
#
# Try changing the format of a transfer remotely.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Make sure -S stops at the given size.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
@@ -2,6 +2,9 @@
#
# Check that watching a process's file descriptors works as expected.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+3
View File
@@ -2,6 +2,9 @@
#
# Check that watching a single file descriptor works as expected.
# Allow all tests to be skipped, e.g. during a release build
test "${SKIP_ALL_TESTS}" = "1" && exit 77
true "${testSubject:?not set - call this from 'make check'}"
true "${workFile1:?not set - call this from 'make check'}"
true "${workFile2:?not set - call this from 'make check'}"
+5
View File
@@ -30,6 +30,11 @@ if ! command -v valgrind >/dev/null 2>&1; then
exit 77
fi
if test "${SKIP_VALGRIND_TESTS}" = "1"; then
echo "SKIP_VALGRIND_TESTS is set"
exit 77
fi
valgrindHelp="$(valgrind --help 2>&1)"
for valgrindOption in "verbose" "show-error-list" "error-exitcode" "track-fds" "leak-check"; do
echo "${valgrindHelp}" | grep -Fq "${valgrindOption}" || { echo "test requires \`valgrind --${valgrindOption}'"; exit 77; }