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)