From c89c91cafd91fbf17f431d800bbf4cafcffffe7a Mon Sep 17 00:00:00 2001 From: DungSaga Date: Sat, 16 Oct 2021 19:07:46 +0100 Subject: patch 8.2.3523: duplicated code in xxd Problem: Duplicated code in xxd. Solution: Remove duplicated lines. (closes #8972) --- src/version.c | 2 ++ src/xxd/xxd.c | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/version.c b/src/version.c index 1b6e997bf..8048f8e99 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3523, /**/ 3522, /**/ diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c index 94cc220bf..698971a86 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) -- cgit v1.2.1