diff options
Diffstat (limited to 'print-ascii.c')
| -rw-r--r-- | print-ascii.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/print-ascii.c b/print-ascii.c index 56efc84a..237cf636 100644 --- a/print-ascii.c +++ b/print-ascii.c @@ -43,8 +43,11 @@ #endif #include "netdissect-stdinc.h" + #include <stdio.h> +#include "netdissect-ctype.h" + #include "netdissect.h" #include "extract.h" @@ -86,7 +89,7 @@ ascii_print(netdissect_options *ndo, if (length > 1 && GET_U_1(cp) != '\n') ND_PRINT("."); } else { - if (!ND_ISGRAPH(s) && + if (!ND_ASCII_ISGRAPH(s) && (s != '\t' && s != ' ' && s != '\n')) ND_PRINT("."); else @@ -120,8 +123,8 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident, (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff), " %02x%02x", s1, s2); hsp += HEXDUMP_HEXSTUFF_PER_SHORT; - *(asp++) = (char)(ND_ISGRAPH(s1) ? s1 : '.'); - *(asp++) = (char)(ND_ISGRAPH(s2) ? s2 : '.'); + *(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.'); + *(asp++) = (char)(ND_ASCII_ISGRAPH(s2) ? s2 : '.'); i++; if (i >= HEXDUMP_SHORTS_PER_LINE) { *hsp = *asp = '\0'; @@ -139,7 +142,7 @@ hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *ident, (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff), " %02x", s1); hsp += 3; - *(asp++) = (char)(ND_ISGRAPH(s1) ? s1 : '.'); + *(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.'); ++i; } if (i > 0) { |