BOOTP: try to fix 2 newly added compile warnings

[tcpdump] / print-ascii.c

diff --git a/print-ascii.c b/print-ascii.c
index 6a6b845a95f9428b6b947f44891953fdbe61561d..2f05c3873d210423c7e61d6b6b4ea92a00e7543c 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -40,33 +40,59 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#include <sys/cdefs.h>
-#if 0
-#ifndef lint
-__RCSID("$NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $");
-#endif
-#endif
+#include <tcpdump-stdinc.h>

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

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

 
 

+#include "netdissect.h"

 #include "interface.h"
 
 #include "interface.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(register const u_char *cp, register u_int length)
+{
+       register int s;
+
+       putchar('\n');
+       while (length > 0) {
+               s = *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 && *cp != '\n')
+                               putchar('.');
+               } else {
+                       if (!ND_ISGRAPH(s) &&
+                           (s != '\t' && s != ' ' && s != '\n'))
+                               putchar('.');
+                       else
+                               putchar(s);
+               }
+       }
+}
+
+void
+hex_and_ascii_print_with_offset(netdissect_options *ndo, register const char *ident,
+    register const u_char *cp, register u_int length, register u_int oset)

 {
        register u_int i;
        register int s1, s2;
        register int nshorts;
        char hexstuff[HEXDUMP_SHORTS_PER_LINE*HEXDUMP_HEXSTUFF_PER_SHORT+1], *hsp;
 {
        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[HEXDUMP_BYTES_PER_LINE+1], *asp;
+       char asciistuff[ASCII_LINELENGTH+1], *asp;

 
        nshorts = length / sizeof(u_short);
        i = 0;
 
        nshorts = length / sizeof(u_short);
        i = 0;


@@ -74,46 +100,51 @@ ascii_print_with_offset(register const u_char *cp, register u_int length,
        while (--nshorts >= 0) {
                s1 = *cp++;
                s2 = *cp++;
        while (--nshorts >= 0) {
                s1 = *cp++;
                s2 = *cp++;

-               (void)sprintf(hsp, " %02x%02x", s1, s2);
+               (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++) = (ND_ISGRAPH(s1) ? s1 : '.');
+               *(asp++) = (ND_ISGRAPH(s2) ? s2 : '.');
+               i++;
+               if (i >= HEXDUMP_SHORTS_PER_LINE) {
+                       *hsp = *asp = '\0';
+                       ND_PRINT((ndo, "%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 (length & 1) {
                s1 = *cp++;

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

                hsp += 3;
                hsp += 3;

-               *(asp++) = (isgraph(s1) ? s1 : '.');
+               *(asp++) = (ND_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((ndo, "%s0x%04x: %-*s  %s",
+                    ident, oset, HEXDUMP_HEXSTUFF_PER_LINE,
+                    hexstuff, asciistuff));

        }
 }
 
 void
        }
 }
 
 void

-ascii_print(register const u_char *cp, register u_int length)
+hex_and_ascii_print(netdissect_options *ndo, 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(ndo, ident, 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 *ident, const u_char *cp, u_int length,
+                     u_int oset)

 {
        register u_int i, s;
        register int nshorts;
 {
        register u_int i, s;
        register int nshorts;


@@ -122,16 +153,16 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
        i = 0;
        while (--nshorts >= 0) {
                if ((i++ % 8) == 0) {
        i = 0;
        while (--nshorts >= 0) {
                if ((i++ % 8) == 0) {

-                       (void)printf("\n0x%04x\t", oset);
+                       ND_PRINT((ndo,"%s0x%04x: ", ident, oset));

                        oset += HEXDUMP_BYTES_PER_LINE;
                }
                s = *cp++;
                        oset += HEXDUMP_BYTES_PER_LINE;
                }
                s = *cp++;

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

        }
        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((ndo,"%s0x%04x: ", ident, oset));
+               ND_PRINT((ndo," %02x", *cp));

        }
 }
 
        }
 }
 


@@ -139,21 +170,25 @@ hex_print_with_offset(register const u_char *cp, register u_int length,
  * just for completeness
  */
 void
  * just for completeness
  */
 void

-hex_print(register const u_char *cp, register u_int length)
+hex_print(netdissect_options *ndo,const char *ident, const u_char *cp, u_int length)

 {
 {

-       hex_print_with_offset(cp, length, 0);
+  hex_print_with_offset(ndo, ident, cp, length, 0);

 }
 
 #ifdef MAIN
 int
 main(int argc, char *argv[])
 {
 }
 
 #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"
        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);
 }
        printf("\n");
        exit(0);
 }