diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xxd/xxd.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/version.c b/src/version.c index 1b6e997bfa..8048f8e995 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3523, +/**/ 3522, /**/ 3521, diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index 94cc220bfb..698971a864 100644 --- a/src/xxd/xxd.c +++ b/src/xxd/xxd.c @@ -346,16 +346,12 @@ huntype( n1 = -1; if ((++p >= cols) && !hextype) { - /* skip rest of line as garbage */ - want_off = 0; - while ((c = getc(fpi)) != '\n' && c != EOF) - ; - if (c == EOF && ferror(fpi)) - die(2); - ign_garb = 1; + /* skip the rest of the line as garbage */ + n2 = -1; + n3 = -1; } } - else if (n1 < 0 && n2 < 0 && n3 < 0) + if (n1 < 0 && n2 < 0 && n3 < 0) { /* already stumbled into garbage, skip line, wait and see */ if (!hextype) |