diff options
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/version.c b/src/version.c index 3f1aa85f0..975b4bb6d 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 167, +/**/ 166, /**/ 165, diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index e42b8f74b..b9e42f6a7 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -212,7 +212,7 @@ static void xxdline __P((FILE *, char *, int)); #define TRY_SEEK /* attempt to use lseek, or skip forward by reading */ #define COLS 256 /* change here, if you ever need more columns */ -#define LLEN (9 + (5*COLS-1)/2 + 2 + COLS) +#define LLEN (11 + (9*COLS-1)/1 + COLS + 2) char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa; @@ -590,7 +590,8 @@ char *argv[]; default: octspergrp = 0; break; } - if (cols < 1 || (!hextype && (cols > COLS))) + if (cols < 1 || ((hextype == HEX_NORMAL || hextype == HEX_BITS) + && (cols > COLS))) { fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS); exit(1); @@ -750,6 +751,7 @@ char *argv[]; } if (ebcdic) e = (e < 64) ? '.' : etoa64[e-64]; + /* When changing this update definition of LLEN above. */ l[11 + (grplen * cols - 1)/octspergrp + p] = #ifdef __MVS__ (e >= 64) |