more consistent use of the length: output;

[tcpdump] / util.c

diff --git a/util.c b/util.c
index 1e451fea3c0fda01f7f804dedab2ebd513a475c4..9595dc10d10c13b75b30b0654fe00ba55d0923d4 100644 (file)
--- a/util.c
+++ b/util.c
@@ -21,19 +21,17 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.74 2002-07-16 03:58:16 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.79 2002-08-06 04:42:07 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/file.h>
+#include <tcpdump-stdinc.h>
+
 #include <sys/stat.h>
 
-#include <ctype.h>
 #include <errno.h>
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
@@ -43,10 +41,6 @@ static const char rcsid[] =
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <time.h>
-#endif
-#include <unistd.h>
 
 #include "interface.h"
 
@@ -201,6 +195,34 @@ relts_print(int secs)
        }
 }
 
+/*
+ *  this is a generic routine for printing unknown data;
+ *  we pass on the linefeed plus indentation string to
+ *  get a proper output - returns 0 on error
+ */
+
+int
+print_unknown_data(const u_char *cp,const char *lf,int len)
+{
+        int i;
+
+       printf("%s0x0000: ",lf);
+       for(i=0;i<len;i++) {
+           if (!TTEST2(*(cp+i), 1)) {
+              printf("%spacket exceeded snapshot",lf);
+              return(0);
+            }
+           printf("%02x",*(cp+i));
+           if (i%2)
+               printf(" ");
+           if (i/16!=(i+1)/16) {
+               if (i<(len-1))
+                   printf("%s0x%04x: ",lf,i);
+           }
+       }
+       return(1); /* everything is ok */
+}
+
 /*
  * Convert a token value to a string; use "fmt" if not found.
  */
@@ -333,7 +355,16 @@ read_infile(char *fname)
        if (cc < 0)
                error("read %s: %s", fname, pcap_strerror(errno));
        if (cc != buf.st_size)
+#ifndef WIN32
                error("short read %s (%d != %d)", fname, cc, (int)buf.st_size);
+#else
+/* Windows seems not to like the final \xa character */
+       {
+               char *pdest;
+               pdest=strchr( cp, '\xa');
+               *pdest=0;
+       }
+#endif /* WIN32 */
        cp[(int)buf.st_size] = '\0';
 
        return (cp);
@@ -355,7 +386,7 @@ safeputchar(int c)
 
        ch = (unsigned char)(c & 0xff);
        if (ch < 0x80 && isprint(ch))
-               printf("%c", ch & 0xff);
+               printf("%c", ch);
        else
-               printf("\\%03o", ch & 0xff);
+               printf("\\%03o", ch);
 }