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 48a75f3dfb (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 <dseal@rocketsoftware.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
David Seal
2025-08-20 22:24:56 +02:00
committed by Christian Brabandt
parent 014d50df80
commit 836ed5271e
2 changed files with 5 additions and 5 deletions

View File

@ -724,6 +724,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1663,
/**/ /**/
1662, 1662,
/**/ /**/

View File

@ -68,6 +68,8 @@
* 11.11.2024 improve end-of-options argument parser #9285 * 11.11.2024 improve end-of-options argument parser #9285
* 07.12.2024 fix overflow with xxd --autoskip and large sparse files #16175 * 07.12.2024 fix overflow with xxd --autoskip and large sparse files #16175
* 15.06.2025 improve color code logic * 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) * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com)
* *
@ -148,7 +150,7 @@ extern void perror __P((char *));
# endif # endif
#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 #ifdef WIN32
char osver[] = " (Win32)"; char osver[] = " (Win32)";
#else #else
@ -1008,10 +1010,6 @@ main(int argc, char *argv[])
} }
rewind(fpo); rewind(fpo);
} }
#ifdef __MVS__
// Disable auto-conversion on input file descriptors
__disableautocvt(fileno(fp));
#endif
if (revert) if (revert)
switch (hextype) switch (hextype)