Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index fc6c6361f9adef506bdcf38c6cdfe0f6446cd067..65815bde54bb676bbbd4870fc476f1137f379ad0 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.12 2003-11-16 09:36:12 guy Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.17 2005-07-06 20:53:32 guy Exp $";
 #endif
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
@@ -57,95 +57,103 @@ static const char rcsid[] _U_ =
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 
 void
-ascii_print_with_offset(register const u_char *cp, register u_int length,
-                       register u_int oset)
+ascii_print(register const u_char *cp, register u_int length)
+{
+       u_int caplength;
+       register int s;
+
+       caplength = (snapend >= cp) ? snapend - cp : 0;
+       if (length > caplength)
+               length = caplength;
+       putchar('\n');
+       while (length > 0) {
+               s = *cp++;
+               length--;
+               if (!isgraph(s) &&
+                   (s != '\t' && s != ' ' && s != '\n' && s != '\r'))
+                       putchar('.');
+               else
+                       putchar(s);
+       }
+}
+
+void
+hex_and_ascii_print_with_offset(register const char *ident,
+    register const u_char *cp, register u_int length, register u_int oset)
 {
+       u_int caplength;
        register u_int i;
        register int s1, s2;
        register int nshorts;
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char asciistuff[ASCII_LINELENGTH+1], *asp;
-       u_int maxlength = (Aflag ? ASCII_LINELENGTH : HEXDUMP_SHORTS_PER_LINE);
 
+       caplength = (snapend >= cp) ? snapend - cp : 0;
+       if (length > caplength)
+               length = caplength;
        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;
-       if (Aflag) *(asp++) = '\n';
        while (--nshorts >= 0) {
                s1 = *cp++;
                s2 = *cp++;
-               if (Aflag) {
-                       i += 2;
-                       *(asp++) = (isgraph(s1) ? s1 : (s1 != '\t' && s1 != ' ' && s1 != '\n' && s1 != '\r' ? '.' : s1) );
-                       *(asp++) = (isgraph(s2) ? s2 : (s2 != '\t' && s2 != ' ' && s2 != '\n' && s2 != '\r' ? '.' : s2) );
-                       if (s1 == '\n' || s2 == '\n') i = maxlength;
-
-               } else {
-                       (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
-                           " %02x%02x", s1, s2);
-                       hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
-                       *(asp++) = (isgraph(s1) ? s1 : '.');
-                       *(asp++) = (isgraph(s2) ? s2 : '.');
-                       i++;
-               }
-               if (i >= maxlength) {
+               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+                   " %02x%02x", s1, s2);
+               hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
+               *(asp++) = (isgraph(s1) ? s1 : '.');
+               *(asp++) = (isgraph(s2) ? s2 : '.');
+               i++;
+               if (i >= HEXDUMP_SHORTS_PER_LINE) {
                        *hsp = *asp = '\0';
-                       if (Aflag) {
-                               (void)printf("%s", asciistuff);
-                       } else {
-                               (void)printf("\n0x%04x\t%-*s\t%s",
-                                   oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                                   hexstuff, asciistuff);
-                       }
+                       (void)printf("%s0x%04x: %-*s  %s",
+                           ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                           hexstuff, asciistuff);
                        i = 0; hsp = hexstuff; asp = asciistuff;
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
        }
        if (length & 1) {
                s1 = *cp++;
-               if (Aflag) {
-                       *(asp++) = (isgraph(s1) ? s1 : (s1 != '\t' && s1 != ' ' && s1 != '\n' && s1 != '\r' ? '.' : s1) );
-               } else {
-                       (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
-                           " %02x", s1);
-                       hsp += 3;
-                       *(asp++) = (isgraph(s1) ? s1 : '.');
-               }
+               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+                   " %02x", s1);
+               hsp += 3;
+               *(asp++) = (isgraph(s1) ? s1 : '.');
                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';
-               if (Aflag) {
-                       (void)printf("\n%s", asciistuff);
-               } else {
-                       (void)printf("\n0x%04x\t%-*s\t%s",
-                            oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                            hexstuff, asciistuff);
-               }
+               (void)printf("%s0x%04x: %-*s  %s",
+                    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                    hexstuff, asciistuff);
        }
 }
 
 void
-ascii_print(register const u_char *cp, register u_int length)
+hex_and_ascii_print(register const char *ident, register const u_char *cp,
+    register u_int length)
 {
-       ascii_print_with_offset(cp, length, 0);
+       hex_and_ascii_print_with_offset(ident, cp, length, 0);
 }
 
 /*
  * telnet_print() wants this.  It is essentially default_print_unaligned()
  */
 void
-hex_print_with_offset(register const u_char *cp, register u_int length,
+hex_print_with_offset(register const char *ident, register const u_char *cp, register u_int length,
                      register u_int oset)
 {
+       u_int caplength;
        register u_int i, s;
        register int nshorts;
 
+       caplength = (snapend >= cp) ? snapend - cp : 0;
+       if (length > caplength)
+               length = caplength;
        nshorts = (u_int) length / sizeof(u_short);
        i = 0;
        while (--nshorts >= 0) {
                if ((i++ % 8) == 0) {
-                       (void)printf("\n0x%04x\t", oset);
+                       (void)printf("%s0x%04x: ", ident, oset);
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
                s = *cp++;
@@ -153,7 +161,7 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
        }
        if (length & 1) {
                if ((i % 8) == 0)
-                       (void)printf("\n0x%04x\t", oset);
+                       (void)printf("%s0x%04x: ", ident, oset);
                (void)printf(" %02x", *cp);
        }
 }
@@ -162,21 +170,25 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
  * just for completeness
  */
 void
-hex_print(register const u_char *cp, register u_int length)
+hex_print(register const char *ident, register const u_char *cp, register u_int length)
 {
-       hex_print_with_offset(cp, length, 0);
+       hex_print_with_offset(ident, cp, length, 0);
 }
 
 #ifdef MAIN
 int
 main(int argc, char *argv[])
 {
-       hex_print("Hello, World!\n", 14);
+       hex_print("\n\t", "Hello, World!\n", 14);
+       printf("\n");
+       hex_and_ascii_print("\n\t", "Hello, World!\n", 14);
        printf("\n");
        ascii_print("Hello, World!\n", 14);
        printf("\n");
 #define TMSG "Now is the winter of our discontent...\n"
-       ascii_print_with_offset(TMSG, sizeof(TMSG) - 1, 0x100);
+       hex_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
+       printf("\n");
+       hex_and_ascii_print_with_offset("\n\t", TMSG, sizeof(TMSG) - 1, 0x100);
        printf("\n");
        exit(0);
 }