diff options
| author | Igor Todorovski <itodorov@ca.ibm.com> | 2024-01-09 21:05:48 +0000 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-01-12 17:53:18 +0100 |
| commit | 48a75f3dfb906a2d333a7b1c3545e2eb359596db (patch) | |
| tree | 394cb051e7ad0ab512776e41d389bf7cfd3550f8 /src | |
| parent | 49471963fefbdf78239d9066d84e14e1876fb177 (diff) | |
patch 9.1.0023: xxd: few problems with EBCDIC for z/OS (MVS)v9.1.0023
Problem: xxd: few problems with EBCDIC for z/OS (MVS)
Solution: Fix xxd build and support ASCII and UTF-8 on z/OS (MVS)
natively, add MVS guard checks with __CHARSET_LIB,
support $LIBS in the Makefile
(Igor Todorovski)
related: #13821
Signed-off-by: Igor Todorovski <itodorov@ca.ibm.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/Makefile | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 13 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/version.c b/src/version.c index 562ba1317d..0099da595f 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 23, +/**/ 22, /**/ 21, diff --git a/src/xxd/Makefile b/src/xxd/Makefile index 97bbcc77bc..d08af7aa01 100644 --- a/src/xxd/Makefile +++ b/src/xxd/Makefile @@ -1,7 +1,7 @@ # The most simplistic Makefile xxd: xxd.c - $(CC) $(CFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DUNIX -o xxd xxd.c $(LIBS) clean: rm -f xxd xxd.o diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index 26f8d8365d..20023e0ee1 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -58,6 +58,7 @@ * 20.06.2022 Permit setting the variable names used by -i by David Gow * 31.08.2023 -R never/auto/always prints colored output * 06.10.2023 enable -r -b to reverse bit dumps + * 12.01.2024 disable auto-conversion for z/OS (MVS) * * (c) 1990-1998 by Juergen Weigert (jnweiger@gmail.com) * @@ -138,7 +139,7 @@ extern void perror __P((char *)); # endif #endif -char version[] = "xxd 2023-10-25 by Juergen Weigert et al."; +char version[] = "xxd 2024-01-12 by Juergen Weigert et al."; #ifdef WIN32 char osver[] = " (Win32)"; #else @@ -587,7 +588,7 @@ begin_coloring_char (char *l, int *c, int e, int ebcdic) } else /* ASCII */ { - #ifdef __MVS__ + #if defined(__MVS__) && __CHARSET_LIB == 0 if (e >= 64) l[(*c)++] = COLOR_GREEN; #else @@ -905,6 +906,10 @@ main(int argc, char *argv[]) } rewind(fpo); } +#ifdef __MVS__ + // Disable auto-conversion on input file descriptors + __disableautocvt(fileno(fp)); +#endif if (revert) switch (hextype) @@ -1066,7 +1071,7 @@ main(int argc, char *argv[]) COLOR_PROLOGUE begin_coloring_char(l,&c,e,ebcdic); -#ifdef __MVS__ +#if defined(__MVS__) && __CHARSET_LIB == 0 if (e >= 64) l[c++] = e; else @@ -1094,7 +1099,7 @@ main(int argc, char *argv[]) c += addrlen + 3 + p; l[c++] = -#ifdef __MVS__ +#if defined(__MVS__) && __CHARSET_LIB == 0 (e >= 64) #else (e > 31 && e < 127) |