CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 882f24742dacce431fdddd2e843af743852e703e..f504d2f7f0cfb0305b3d9d51a07447f4a8694b38 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */
+/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */

 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.


@@ -36,123 +36,179 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
  * POSSIBILITY OF SUCH DAMAGE.
  */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: ASCII packet dump printer */
+
+#include <config.h>
+
+#include "netdissect-stdinc.h"

 
 

-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ascii.c,v 1.4 2000-01-09 21:34:16 fenner Exp $";
-#endif

 #include <stdio.h>
 #include <stdio.h>

-#include <sys/types.h>
-#include <ctype.h>

 
 

-#include "interface.h"
+#include "netdissect-ctype.h"
+
+#include "netdissect.h"
+#include "extract.h"

 
 

+#define ASCII_LINELENGTH 300

 #define HEXDUMP_BYTES_PER_LINE 16
 #define HEXDUMP_SHORTS_PER_LINE (HEXDUMP_BYTES_PER_LINE / 2)
 #define HEXDUMP_HEXSTUFF_PER_SHORT 5 /* 4 hex digits and a space */
 #define HEXDUMP_HEXSTUFF_PER_LINE \
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)
 #define HEXDUMP_BYTES_PER_LINE 16
 #define HEXDUMP_SHORTS_PER_LINE (HEXDUMP_BYTES_PER_LINE / 2)
 #define HEXDUMP_HEXSTUFF_PER_SHORT 5 /* 4 hex digits and a space */
 #define HEXDUMP_HEXSTUFF_PER_LINE \
                (HEXDUMP_HEXSTUFF_PER_SHORT * HEXDUMP_SHORTS_PER_LINE)

-     
+

 void
 void

-ascii_print_with_offset(register const u_char *cp, register u_int length,
-                       register u_int oset)
+ascii_print(netdissect_options *ndo,
+            const u_char *cp, u_int length)
+{
+       u_int caplength;
+       u_char s;
+       int truncated = FALSE;
+
+       ndo->ndo_protocol = "ascii";
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+       if (length > caplength) {
+               length = caplength;
+               truncated = TRUE;
+       }
+       ND_PRINT("\n");
+       while (length != 0) {
+               s = GET_U_1(cp);
+               cp++;
+               length--;
+               if (s == '\r') {
+                       /*
+                        * Don't print CRs at the end of the line; they
+                        * don't belong at the ends of lines on UN*X,
+                        * and the standard I/O library will give us one
+                        * on Windows so we don't need to print one
+                        * ourselves.
+                        *
+                        * In the middle of a line, just print a '.'.
+                        */
+                       if (length > 1 && GET_U_1(cp) != '\n')
+                               ND_PRINT(".");
+               } else {
+                       if (!ND_ASCII_ISGRAPH(s) &&
+                           (s != '\t' && s != ' ' && s != '\n'))
+                               ND_PRINT(".");
+                       else
+                               ND_PRINT("%c", s);
+               }
+       }
+       if (truncated)
+               nd_trunc_longjmp(ndo);
+}
+
+static void
+hex_and_ascii_print_with_offset(netdissect_options *ndo, const char *indent,
+                               const u_char *cp, u_int length, u_int offset)

 {
 {

-       register u_int i;
-       register int s1, s2;
-       register int nshorts;
+       u_int caplength;
+       u_int i;
+       u_int s1, s2;
+       u_int nshorts;
+       int truncated = FALSE;

        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;

-       char asciistuff[HEXDUMP_BYTES_PER_LINE+1], *asp;
+       char asciistuff[ASCII_LINELENGTH+1], *asp;

 
 

+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+       if (length > caplength) {
+               length = caplength;
+               truncated = TRUE;
+       }

        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;
        nshorts = length / sizeof(u_short);
        i = 0;
        hsp = hexstuff; asp = asciistuff;

-       while (--nshorts >= 0) {
-               s1 = *cp++;
-               s2 = *cp++;
-               (void)sprintf(hsp, " %02x%02x", s1, s2);
+       while (nshorts != 0) {
+               s1 = GET_U_1(cp);
+               cp++;
+               s2 = GET_U_1(cp);
+               cp++;
+               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+                   " %02x%02x", s1, s2);

                hsp += HEXDUMP_HEXSTUFF_PER_SHORT;
                hsp += HEXDUMP_HEXSTUFF_PER_SHORT;

-               *(asp++) = (isgraph(s1) ? s1 : '.');
-               *(asp++) = (isgraph(s2) ? s2 : '.');
-               if (++i >= HEXDUMP_SHORTS_PER_LINE) {
-                   *hsp = *asp = '\0';
-                   (void)printf("\n0x%04x\t%-*s\t%s",
-                                oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                                hexstuff, asciistuff);
-                   i = 0; hsp = hexstuff; asp = asciistuff;
-                   oset += HEXDUMP_BYTES_PER_LINE;
+               *(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.');
+               *(asp++) = (char)(ND_ASCII_ISGRAPH(s2) ? s2 : '.');
+               i++;
+               if (i >= HEXDUMP_SHORTS_PER_LINE) {
+                       *hsp = *asp = '\0';
+                       ND_PRINT("%s0x%04x: %-*s  %s",
+                           indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
+                           hexstuff, asciistuff);
+                       i = 0; hsp = hexstuff; asp = asciistuff;
+                       offset += HEXDUMP_BYTES_PER_LINE;

                }
                }

+               nshorts--;

        }
        if (length & 1) {
        }
        if (length & 1) {

-               s1 = *cp++;
-               (void)sprintf(hsp, " %02x", s1);
+               s1 = GET_U_1(cp);
+               cp++;
+               (void)snprintf(hsp, sizeof(hexstuff) - (hsp - hexstuff),
+                   " %02x", s1);

                hsp += 3;
                hsp += 3;

-               *(asp++) = (isgraph(s1) ? s1 : '.');
+               *(asp++) = (char)(ND_ASCII_ISGRAPH(s1) ? s1 : '.');

                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';
                ++i;
        }
        if (i > 0) {
                *hsp = *asp = '\0';

-               (void)printf("\n0x%04x\t%-*s\t%s",
-                            oset, HEXDUMP_HEXSTUFF_PER_LINE,
-                            hexstuff, asciistuff);
+               ND_PRINT("%s0x%04x: %-*s  %s",
+                    indent, offset, HEXDUMP_HEXSTUFF_PER_LINE,
+                    hexstuff, asciistuff);

        }
        }

+       if (truncated)
+               nd_trunc_longjmp(ndo);

 }
 
 void
 }
 
 void

-ascii_print(register const u_char *cp, register u_int length)
+hex_and_ascii_print(netdissect_options *ndo, const char *indent,
+                   const u_char *cp, u_int length)

 {
 {

-       ascii_print_with_offset(cp, length, 0);
+       hex_and_ascii_print_with_offset(ndo, indent, cp, length, 0);

 }
 }

-       
+

 /*
  * telnet_print() wants this.  It is essentially default_print_unaligned()
  */
 void
 /*
  * telnet_print() wants this.  It is essentially default_print_unaligned()
  */
 void

-hex_print_with_offset(register const u_char *cp, register u_int length,
-                     register u_int oset)
+hex_print_with_offset(netdissect_options *ndo,
+                      const char *indent, const u_char *cp, u_int length,
+                     u_int offset)

 {
 {

-       register u_int i, s;
-       register int nshorts;
+       u_int caplength;
+       u_int i, s;
+       u_int nshorts;
+       int truncated = FALSE;

 
 

-       nshorts = (u_int) length / sizeof(u_short);
+       caplength = ND_BYTES_AVAILABLE_AFTER(cp);
+       if (length > caplength) {
+               length = caplength;
+               truncated = TRUE;
+       }
+       nshorts = length / sizeof(u_short);

        i = 0;
        i = 0;

-       while (--nshorts >= 0) {
+       while (nshorts != 0) {

                if ((i++ % 8) == 0) {
                if ((i++ % 8) == 0) {

-                       (void)printf("\n0x%04x\t", oset);
-                       oset += HEXDUMP_BYTES_PER_LINE;
+                       ND_PRINT("%s0x%04x: ", indent, offset);
+                       offset += HEXDUMP_BYTES_PER_LINE;

                }
                }

-               s = *cp++;
-               (void)printf(" %02x%02x", s, *cp++);
+               s = GET_U_1(cp);
+               cp++;
+               ND_PRINT(" %02x%02x", s, GET_U_1(cp));
+               cp++;
+               nshorts--;

        }
        if (length & 1) {
                if ((i % 8) == 0)
        }
        if (length & 1) {
                if ((i % 8) == 0)

-                       (void)printf("\n0x%04x\t", oset);
-               (void)printf(" %02x", *cp);
+                       ND_PRINT("%s0x%04x: ", indent, offset);
+               ND_PRINT(" %02x", GET_U_1(cp));

        }
        }

+       if (truncated)
+               nd_trunc_longjmp(ndo);

 }
 
 }
 

-/*
- * just for completeness
- */

 void
 void

-hex_print(register const u_char *cp, register u_int length)
-{
-       hex_print_with_offset(cp, length, 0);
-}
-
-#ifdef MAIN
-int
-main(int argc, char *argv[])
+hex_print(netdissect_options *ndo,
+         const char *indent, const u_char *cp, u_int length)

 {
 {

-       hex_print("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);
-       printf("\n");
-       exit(0);
+       hex_print_with_offset(ndo, indent, cp, length, 0);

 }
 }

-#endif /* MAIN */