From 58334b0ea2bcc56bbc17475ad67df1561e80ad67 Mon Sep 17 00:00:00 2001 From: leitner Date: Tue, 14 May 2002 20:02:33 +0000 Subject: [PATCH] new hexdump fmt and scan routines for textcode --- textcode.h | 2 ++ textcode/fmt_hexdump.c | 19 +++++++++++++++++++ textcode/scan_hexdump.c | 27 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 textcode/fmt_hexdump.c create mode 100644 textcode/scan_hexdump.c diff --git a/textcode.h b/textcode.h index 2896440..1e66bfe 100644 --- a/textcode.h +++ b/textcode.h @@ -8,6 +8,7 @@ unsigned int fmt_base64(char* dest,const char* src,unsigned int len); unsigned int fmt_quotedprintable(char* dest,const char* src,unsigned int len); unsigned int fmt_urlencoded(char* dest,const char* src,unsigned int len); unsigned int fmt_yenc(char* dest,const char* src,unsigned int len); +unsigned int fmt_hexdump(char* dest,const char* src,unsigned int len); /* These read one line from src, decoded it, and write the result to * dest. The number of decoded bytes is written to destlen. dest @@ -17,6 +18,7 @@ unsigned int scan_base64(const char *src,char *dest,unsigned int *destlen); unsigned int scan_quotedprintable(const char *src,char *dest,unsigned int *destlen); unsigned int scan_urlencoded(const char *src,char *dest,unsigned int *destlen); unsigned int scan_yenc(const char *src,char *dest,unsigned int *destlen); +unsigned int scan_hexdump(const char *src,char *dest,unsigned int *destlen); extern const char base64[64]; diff --git a/textcode/fmt_hexdump.c b/textcode/fmt_hexdump.c new file mode 100644 index 0000000..2638400 --- /dev/null +++ b/textcode/fmt_hexdump.c @@ -0,0 +1,19 @@ +#include "fmt.h" +#include "textcode.h" +#include "str.h" +#include "haveinline.h" + +static inline int tohex(char c) { + return c>9?c-10+'A':c+'0'; +} + +unsigned int fmt_hexdump(char* dest,const char* src,unsigned int len) { + register const unsigned char* s=(const unsigned char*) src; + unsigned long written=0,i; + for (i=0; i>4); + dest[written+1]=tohex(s[i]&15); + written+=2; + } + return written; +} diff --git a/textcode/scan_hexdump.c b/textcode/scan_hexdump.c new file mode 100644 index 0000000..828a775 --- /dev/null +++ b/textcode/scan_hexdump.c @@ -0,0 +1,27 @@ +#include "fmt.h" +#include "textcode.h" +#include "haveinline.h" + +static inline int fromhex(char c) { + if (c>='0' && c<='9') return c-'0'; + if (c>='A' && c<='F') return c-'A'+10; + if (c>='a' && c<='f') return c-'a'+10; + return -1; +} + +unsigned int scan_hexdump(const char *src,char *dest,unsigned int *destlen) { + register const unsigned char* s=(const unsigned char*) src; + unsigned long written=0,i; + for (i=0; s[i]; ++i) { + int j=fromhex(s[i]); + if (j<0) break; + dest[written]=j<<4; + j=fromhex(s[i+1]); + if (j<0) break; + dest[written]|=j; + i+=2; + ++written; + } + *destlen=written; + return i; +}