Various changes to stop VC++ choking under Win32.

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

diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index 839dfeb15e69bd48ee6ffa4b679abddb9ae19003..a7cd828978505ca1607cca7f84eb28a15466276f 100644 (file)
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -62,7 +62,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
 
 #include <stdio.h>
 #include "cryptlib.h"

-#include "bio.h"
+#include <openssl/bio.h>

 
 #define TRUNCATE
 #define DUMP_WIDTH     16
 
 #define TRUNCATE
 #define DUMP_WIDTH     16


@@ -102,7 +102,13 @@ int BIO_dump(BIO *bio, const char *s, int len)
       if (((i*DUMP_WIDTH)+j)>=len)
        break;
       ch=((unsigned char)*((char *)(s)+i*DUMP_WIDTH+j)) & 0xff;
       if (((i*DUMP_WIDTH)+j)>=len)
        break;
       ch=((unsigned char)*((char *)(s)+i*DUMP_WIDTH+j)) & 0xff;

+#ifndef CHARSET_EBCDIC

       sprintf(tmp,"%c",((ch>=' ')&&(ch<='~'))?ch:'.');
       sprintf(tmp,"%c",((ch>=' ')&&(ch<='~'))?ch:'.');

+#else
+      sprintf(tmp,"%c",((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
+             ? os_toebcdic[ch]
+             : '.');
+#endif

       strcat(buf,tmp);
     }
     strcat(buf,"\n");
       strcat(buf,tmp);
     }
     strcat(buf,"\n");