<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1b1341e89f166ea554f767ecc19ab85fc59972ee">https://github.com/macports/macports-ports/commit/1b1341e89f166ea554f767ecc19ab85fc59972ee</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1b1341e89f1 pv: update to 1.7.18 (#19649)
</span>1b1341e89f1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1b1341e89f166ea554f767ecc19ab85fc59972ee
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Fri Jul 28 16:39:18 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> pv: update to 1.7.18 (#19649)
</span>---
sysutils/pv/Portfile | 18 +-
sysutils/pv/files/remove_64_suffixed_calls.patch | 373 -----------------------
2 files changed, 11 insertions(+), 380 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/pv/Portfile b/sysutils/pv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 89d13b4d5ab..770a05e0a50 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/pv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/pv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup a-j-wood pv 1.7.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup a-j-wood pv 1.7.18 v
</span>
revision 0
categories sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,12 +24,9 @@ long_description pv - Pipe Viewer - is a terminal-based tool for monitoring \
</span> homepage http://www.ivarch.com/programs/pv.shtml
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 96081 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fb6e1655e9b65d55325686575375b4b87ea20fd3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b1f3e39841182999b963c3a11b645efe79b7c006c5da491858088a4ad924fc4c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We patch the build to drop all the *64 (stat64, etc.) calls now. Just cleaner.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles remove_64_suffixed_calls.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 111730 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 feeb90f8c2b8ee8178711baa4ff2086797e2e2be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5589d010d979ded664b179a620a285c2ff525ba5f9813a3c1e65167d709e007d
</span>
configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +41,13 @@ if {${os.platform} eq "darwin" && ${os.major} < 10 } {
</span> configure.cppflags-append -Dfstat=fstat64 -Dlstat=lstat64 -Dstat=stat64
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E {s^[[:<:]]cksum[[:>:]] ("[^"]+"|-) \| awk[^)]+^md5 -q \1^g} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tests/Modifiers_-_--direct-io.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s/-q -/-q/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/tests/Modifiers_-_--direct-io.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
system -W ${worksrcpath} './generate.sh'
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/pv/files/remove_64_suffixed_calls.patch b/sysutils/pv/files/remove_64_suffixed_calls.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 941ae5c6c36..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/pv/files/remove_64_suffixed_calls.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,373 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru autoconf/configure.in autoconf/configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autoconf/configure.in 2023-07-16 05:09:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autoconf/configure.in 2023-07-25 10:55:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,13 +41,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-pg $CFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LFS_SUPPORT="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_ARG_ENABLE(lfs, [ --disable-lfs disable LFS support],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "$enable_lfs" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFS_SUPPORT="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LFS_SUPPORT="yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATIC_NLS="no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE(static-nls, [ --enable-static-nls hardcode NLS with no support files],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$enable_static_nls" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,23 +138,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS(getopt_long getopt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADERS(getopt.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl LFS checks.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "$LFS_SUPPORT" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_FUNCS(open64, AC_DEFINE(ENABLE_LARGEFILE))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Check for various header files and set various other macros.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(HAVE_CONFIG_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_HEADER_STDC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_HEADER_STDBOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_FUNCS(memcpy basename snprintf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl OSX 11 (apple silicon) lets you link stat64() but fails to compile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl so use a compile test for stat64() instead of a link test.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main() { stat64(); }])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [AC_DEFINE([HAVE_STAT64], [1], [Is stat64() available])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADERS(limits.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$IPC_SUPPORT" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru autoconf/header.in autoconf/header.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autoconf/header.in 2021-09-04 14:59:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autoconf/header.in 2023-07-25 10:52:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_MEMCPY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_BASENAME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_SNPRINTF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#undef HAVE_STAT64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_SPLICE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_SPLICE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,33 +52,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PROJECT_HOMEPAGE "http://www.ivarch.com/programs/" PROGRAM_NAME ".shtml"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define BUG_REPORTS_TO _("<pv@ivarch.com>")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* LFS support. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#undef ENABLE_LARGEFILE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef ENABLE_LARGEFILE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define __USE_LARGEFILE64 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define _LARGEFILE64_SOURCE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Some Macs have stat64 despite not having open64 while others don't have
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * either, so here even if we don't have open64 or LFS is disabled, we have
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * to check whether stat64 exists and only redefine it if it doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * otherwise some Macs fail to compile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifndef HAVE_STAT64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define stat64 stat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define fstat64 fstat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define lstat64 lstat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define stat64 stat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define fstat64 fstat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define lstat64 lstat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define open64 open
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define lseek64 lseek
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_IPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_SYS_IPC_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HAVE_IPC 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru src/include/pv-internal.h src/include/pv-internal.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/include/pv-internal.h 2023-07-17 15:30:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/include/pv-internal.h 2023-07-25 10:54:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,16 +18,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * Since macOS 10.6, stat64 variants are equivalent to plain stat, and the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * suffixed versions have been removed in macOS 11. See stat(2).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__) || defined(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define stat64 stat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define fstat64 fstat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define lstat64 lstat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,8 +237,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char file_fdpath[4096]; /* path to file that was opened */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char display_name[512]; /* name to show on progress bar */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 sb_fd; /* stat of fd symlink */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 sb_fd_link; /* lstat of fd symlink */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sb_fd; /* stat of fd symlink */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sb_fd_link; /* lstat of fd symlink */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned long long size; /* size of whole file, 0 if unknown */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long long position; /* position last seen at */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timeval start_time; /* time we started watching the fd */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru src/main/options.c src/main/options.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main/options.c 2023-07-17 15:52:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main/options.c 2023-07-25 10:57:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,12 +274,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Permit "@<filename>" as well as just a number. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ('@' == *optarg) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char *size_file = 1 + optarg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memset(&sb, 0, sizeof(sb));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = stat64(size_file, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = stat(size_file, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == rc) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opts->size = sb.st_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru src/pv/file.c src/pv/file.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pv/file.c 2023-07-17 15:52:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pv/file.c 2023-07-25 10:53:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned long long pv_calc_total_size(pvstate_t state)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned long long total;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc, i, j, fd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- total = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,20 +42,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * No files specified - check stdin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state->input_file_count < 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (0 == fstat64(STDIN_FILENO, &sb))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (0 == fstat(STDIN_FILENO, &sb))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- total = sb.st_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return total;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < state->input_file_count; i++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == strcmp(state->input_files[i], "-")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = fstat64(STDIN_FILENO, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = fstat(STDIN_FILENO, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rc != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- total = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return total;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = stat64(state->input_files[i], &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = stat(state->input_files[i], &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == rc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rc = access(state->input_files[i], R_OK);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,13 +79,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * them and seeking to the end.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == strcmp(state->input_files[i], "-")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = open64("/dev/stdin", O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd = open("/dev/stdin", O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = open64(state->input_files[i],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd = open(state->input_files[i],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd >= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- total += lseek64(fd, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ total += lseek(fd, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pv_error(state, "%s: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,11 +109,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * and that we can seek back to the start after getting the size.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (total <= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = fstat64(STDOUT_FILENO, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = fstat(STDOUT_FILENO, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((0 == rc) && S_ISBLK(sb.st_mode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && (0 == (fcntl(STDOUT_FILENO, F_GETFL) & O_APPEND))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- total = lseek64(STDOUT_FILENO, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (lseek64(STDOUT_FILENO, 0, SEEK_SET) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ total = lseek(STDOUT_FILENO, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (lseek(STDOUT_FILENO, 0, SEEK_SET) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pv_error(state, "%s: %s: %s", "(stdout)",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("failed to seek to start of output"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,19 +144,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == strcmp(state->input_files[i], "-")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = fstat64(STDIN_FILENO, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = fstat(STDIN_FILENO, &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- total = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return total;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd = dup(STDIN_FILENO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = stat64(state->input_files[i], &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc = stat(state->input_files[i], &sb);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((rc != 0) || (!S_ISREG(sb.st_mode))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- total = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return total;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = open64(state->input_files[i], O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd = open(state->input_files[i], O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,7 +187,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lseek64(fd, 0, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lseek(fd, 0, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -205,8 +205,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int pv_next_file(pvstate_t state, int filenum, int oldfd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 isb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 osb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat isb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat osb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int fd, input_file_is_stdout;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (oldfd > 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -232,7 +232,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (0 == strcmp(state->input_files[filenum], "-")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fd = STDIN_FILENO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = open64(state->input_files[filenum], O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd = open(state->input_files[filenum], O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pv_error(state, "%s: %s: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _("failed to read file"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -243,7 +243,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (fstat64(fd, &isb)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fstat(fd, &isb)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pv_error(state, "%s: %s: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _("failed to stat file"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->input_files[filenum], strerror(errno));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (fstat64(STDOUT_FILENO, &osb)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fstat(STDOUT_FILENO, &osb)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pv_error(state, "%s: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _("failed to stat output file"), strerror(errno));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru src/pv/loop.c src/pv/loop.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pv/loop.c 2023-07-17 15:52:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pv/loop.c 2023-07-25 10:52:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timeval start_time, next_update, next_ratecheck, cur_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timeval init_time, next_remotecheck;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long double elapsed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int fd, n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,7 +116,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Set target buffer size if the initial file's block size can be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * read and we weren't given a target buffer size.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((0 == fstat64(fd, &sb)) && (0 == state->target_buffer_size)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((0 == fstat(fd, &sb)) && (0 == state->target_buffer_size)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned long long sz;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sz = sb.st_blksize * 32;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sz > BUFFER_SIZE_MAX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru src/pv/transfer.c src/pv/transfer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pv/transfer.c 2023-07-17 15:52:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pv/transfer.c 2023-07-25 10:58:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -361,7 +361,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->read_error_warning_shown = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- orig_offset = lseek64(fd, 0, SEEK_CUR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ orig_offset = lseek(fd, 0, SEEK_CUR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * If the file is not seekable, we can't skip past the error, so we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -406,7 +406,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (amount_to_skip > bytes_can_read)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- amount_to_skip = bytes_can_read;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- skip_offset = lseek64(fd, orig_offset + amount_to_skip, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ skip_offset = lseek(fd, orig_offset + amount_to_skip, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * If the skip we just tried didn't work, try only skipping 1 byte
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -415,7 +415,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (skip_offset < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- amount_to_skip = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- skip_offset =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- lseek64(fd, orig_offset + amount_to_skip, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lseek(fd, orig_offset + amount_to_skip, SEEK_SET);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (skip_offset < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru src/pv/watchpid.c src/pv/watchpid.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pv/watchpid.c 2023-07-17 15:52:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pv/watchpid.c 2023-07-25 10:57:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,9 +34,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Get the size of block devices by opening
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * them and seeking to the end.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = open64(info->file_fdpath, O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd = open(info->file_fdpath, O_RDONLY);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd >= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info->size = lseek64(fd, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info->size = lseek(fd, 0, SEEK_END);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info->size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,7 +87,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- info->size = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(0 == stat64(info->file_fdpath, &(info->sb_fd)))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(0 == stat(info->file_fdpath, &(info->sb_fd)))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!automatic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pv_error(state, "%s %u: %s %d: %s: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _("pid"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,8 +171,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!((0 == stat64(info->file_fd, &(info->sb_fd)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && (0 == lstat64(info->file_fd, &(info->sb_fd_link))))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!((0 == stat(info->file_fd, &(info->sb_fd)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && (0 == lstat(info->file_fd, &(info->sb_fd_link))))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!automatic)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pv_error(state, "%s %u: %s %d: %s: %s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _("pid"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,10 +214,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int pv_watchfd_changed(pvwatchfd_t info)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct stat64 sb_fd, sb_fd_link;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ struct stat sb_fd, sb_fd_link;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((0 == stat64(info->file_fd, &sb_fd))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && (0 == lstat64(info->file_fd, &sb_fd_link))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((0 == stat(info->file_fd, &sb_fd))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && (0 == lstat(info->file_fd, &sb_fd_link))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((sb_fd.st_dev != info->sb_fd.st_dev)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (sb_fd.st_ino != info->sb_fd.st_ino)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || (sb_fd_link.st_mode != info->sb_fd_link.st_mode)
</span></pre><pre style='margin:0'>
</pre>