b_sock.c: fix compiler warning.

[openssl.git] / crypto / bio / b_dump.c

diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index 287aff2a5e6710b703d5306477455e3a5c3385a3..c80ecc4295322fe8872f940c2d88b4fb82bcf4c3 100644 (file)
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -1,5 +1,5 @@
 /* crypto/bio/b_dump.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -62,64 +62,126 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bio.h"
+#include "bio_lcl.h"
 
 #define TRUNCATE
 #define DUMP_WIDTH     16
+#define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH-((i-(i>6?6:i)+3)/4))
 
-int BIO_dump(bio,s,len)
-BIO *bio;
-char *s;
-int len;
-{
-  int ret=0;
-  char buf[160+1],tmp[20];
-  int i,j,rows,trunc;
-  unsigned char ch;
+int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
+       void *u, const char *s, int len)
+       {
+       return BIO_dump_indent_cb(cb, u, s, len, 0);
+       }
 
-  trunc=0;
+int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
+       void *u, const char *s, int len, int indent)
+       {
+       int ret=0;
+       char buf[288+1],tmp[20],str[128+1];
+       int i,j,rows,trc;
+       unsigned char ch;
+       int dump_width;
+
+       trc=0;
 
 #ifdef TRUNCATE
-  for(; (len > 0) && ((s[len-1] == ' ') || (s[len-1] == '\0')); len--) 
-    trunc++;
+       for(; (len > 0) && ((s[len-1] == ' ') || (s[len-1] == '\0')); len--)
+               trc++;
 #endif
 
-  rows=(len/DUMP_WIDTH);
-  if ((rows*DUMP_WIDTH)<len)
-    rows++;
-  for(i=0;i<rows;i++) {
-    buf[0]='\0';       /* start with empty string */
-    sprintf(tmp,"%04x - ",i*DUMP_WIDTH);
-    strcpy(buf,tmp);
-    for(j=0;j<DUMP_WIDTH;j++) {
-      if (((i*DUMP_WIDTH)+j)>=len) {
-       strcat(buf,"   ");
-      } else {
-        ch=((unsigned char)*((char *)(s)+i*DUMP_WIDTH+j)) & 0xff;
-       sprintf(tmp,"%02x%c",ch,j==7?'-':' ');
-        strcat(buf,tmp);
-      }
-    }
-    strcat(buf,"  ");
-    for(j=0;j<DUMP_WIDTH;j++) {
-      if (((i*DUMP_WIDTH)+j)>=len)
-       break;
-      ch=((unsigned char)*((char *)(s)+i*DUMP_WIDTH+j)) & 0xff;
-      sprintf(tmp,"%c",((ch>=' ')&&(ch<='~'))?ch:'.');
-      strcat(buf,tmp);
-    }
-    strcat(buf,"\n");
-    /* if this is the last call then update the ddt_dump thing so that
-     * we will move the selection point in the debug window 
-     */
-    ret+=BIO_write(bio,(char *)buf,strlen(buf));
-  }
+       if (indent < 0)
+               indent = 0;
+       if (indent)
+               {
+               if (indent > 128) indent=128;
+               memset(str,' ',indent);
+               }
+       str[indent]='\0';
+
+       dump_width=DUMP_WIDTH_LESS_INDENT(indent);
+       rows=(len/dump_width);
+       if ((rows*dump_width)<len)
+               rows++;
+       for(i=0;i<rows;i++)
+               {
+               buf[0]='\0';    /* start with empty string */
+               BUF_strlcpy(buf,str,sizeof buf);
+               BIO_snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width);
+               BUF_strlcat(buf,tmp,sizeof buf);
+               for(j=0;j<dump_width;j++)
+                       {
+                       if (((i*dump_width)+j)>=len)
+                               {
+                               BUF_strlcat(buf,"   ",sizeof buf);
+                               }
+                       else
+                               {
+                               ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
+                               BIO_snprintf(tmp,sizeof tmp,"%02x%c",ch,
+                                       j==7?'-':' ');
+                               BUF_strlcat(buf,tmp,sizeof buf);
+                               }
+                       }
+               BUF_strlcat(buf,"  ",sizeof buf);
+               for(j=0;j<dump_width;j++)
+                       {
+                       if (((i*dump_width)+j)>=len)
+                               break;
+                       ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
+#ifndef CHARSET_EBCDIC
+                       BIO_snprintf(tmp,sizeof tmp,"%c",
+                               ((ch>=' ')&&(ch<='~'))?ch:'.');
+#else
+                       BIO_snprintf(tmp,sizeof tmp,"%c",
+                               ((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
+                               ? os_toebcdic[ch]
+                               : '.');
+#endif
+                       BUF_strlcat(buf,tmp,sizeof buf);
+                       }
+               BUF_strlcat(buf,"\n",sizeof buf);
+               /* if this is the last call then update the ddt_dump thing so
+                * that we will move the selection point in the debug window
+                */
+               ret+=cb((void *)buf,strlen(buf),u);
+               }
 #ifdef TRUNCATE
-  if (trunc > 0) {
-    sprintf(buf,"%04x - <SPACES/NULS>\n",len+trunc);
-    ret+=BIO_write(bio,(char *)buf,strlen(buf));
-  }
+       if (trc > 0)
+               {
+               BIO_snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
+                       len+trc);
+               ret+=cb((void *)buf,strlen(buf),u);
+               }
 #endif
-  return(ret);
-}
+       return(ret);
+       }
+
+#ifndef OPENSSL_NO_FP_API
+static int write_fp(const void *data, size_t len, void *fp)
+       {
+       return UP_fwrite(data, len, 1, fp);
+       }
+int BIO_dump_fp(FILE *fp, const char *s, int len)
+       {
+       return BIO_dump_cb(write_fp, fp, s, len);
+       }
+int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent)
+       {
+       return BIO_dump_indent_cb(write_fp, fp, s, len, indent);
+       }
+#endif
+
+static int write_bio(const void *data, size_t len, void *bp)
+       {
+       return BIO_write((BIO *)bp, (const char *)data, len);
+       }
+int BIO_dump(BIO *bp, const char *s, int len)
+       {
+       return BIO_dump_cb(write_bio, bp, s, len);
+       }
+int BIO_dump_indent(BIO *bp, const char *s, int len, int indent)
+       {
+       return BIO_dump_indent_cb(write_bio, bp, s, len, indent);
+       }