From 836ed5271edc5d5657255662acea01dc2d9939c2 Mon Sep 17 00:00:00 2001 From: David Seal Date: Wed, 20 Aug 2025 22:24:56 +0200 Subject: [PATCH] patch 9.1.1663: xxd: 9.1.0023 introduced additional dependency Problem: xxd: 9.1.0023 introduced additional dependency Solution: remove non-native z/OS library call (David Seal) Commit 48a75f3dfb906a2d333a7b1c3545e2eb359596db (Patch 9.1.0023) introduces a call to __disableautocvt() which can only be found in a non-native z/OS library. This requires installing the external zoslib library in order to work, which is not present on all z/OS systems So remove the call to __disableautocvt() and rely on library routines that are available to all z/OS users See https://ibmruntimes.github.io/zoslib/zos-io_8cc.html for more details closes: #18059 Signed-off-by: David Seal Signed-off-by: Christian Brabandt --- src/version.c | 2 ++ src/xxd/xxd.c | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/version.c b/src/version.c index d343e117c4..8bd7eab0a9 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1663, /**/ 1662, /**/ diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index 36a5a88ec9..0c70b5a95d 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -68,6 +68,8 @@ * 11.11.2024 improve end-of-options argument parser #9285 * 07.12.2024 fix overflow with xxd --autoskip and large sparse files #16175 * 15.06.2025 improve color code logic + * 08.08.2025 fix overflow with bitwise output + * 20.08.2025 remove external library call for autoconversion on z/OS (MVS) * * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com) * @@ -148,7 +150,7 @@ extern void perror __P((char *)); # endif #endif -char version[] = "xxd 2025-08-08 by Juergen Weigert et al."; +char version[] = "xxd 2025-08-20 by Juergen Weigert et al."; #ifdef WIN32 char osver[] = " (Win32)"; #else @@ -1008,10 +1010,6 @@ main(int argc, char *argv[]) } rewind(fpo); } -#ifdef __MVS__ - // Disable auto-conversion on input file descriptors - __disableautocvt(fileno(fp)); -#endif if (revert) switch (hextype)