Mercurial > vim
changeset 1452:1bc46149d919 v7.1.167
updated for version 7.1-167
author | vimboss |
---|---|
date | Mon, 03 Dec 2007 20:32:43 +0000 |
parents | 71bd485d8fa5 |
children | 159d87361e4b |
files | src/version.c src/xxd/xxd.c |
diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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,
--- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -212,7 +212,7 @@ static void xxdline __P((FILE *, char *, #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)