libpst: src/vbuf.c annotate

annotate src/vbuf.c @ 146:0695de3b5a98 stable-0-6-29

fix for 64bit on Fedora 11

author	Carl Byington <carl@five-ten-sg.com>
date	Tue, 24 Feb 2009 15:32:56 -0800
parents	2189a6b8134e
children	cda7c812ec01

rev	line source
73 3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	1
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	2 #include "define.h"
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	3
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	4
73 3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	5 #define ASSERT(x,...) { if( !(x) ) DIE(( __VA_ARGS__)); }
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	6
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	7
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	8 int skip_nl(char *s)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	9 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	10 if (s[0] == '\n')
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	11 return 1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	12 if (s[0] == '\r' && s[1] == '\n')
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	13 return 2;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	14 if (s[0] == '\0')
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	15 return 0;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	16 return -1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	17 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	18
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	19
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	20 int find_nl(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	21 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	22 char nextr, nextn;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	23
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	24 nextr = memchr(vs->b, '\r', vs->dlen);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	25 nextn = memchr(vs->b, '\n', vs->dlen);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	26
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	27 //case 1: UNIX, we find \n first
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	28 if (nextn && (!nextr \|\| (nextr > nextn))) {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	29 return nextn - vs->b;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	30 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	31 //case 2: DOS, we find \r\n
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	32 if (nextr && nextn && (nextn-nextr == 1)) {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	33 return nextr - vs->b;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	34 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	35 //case 3: we find nothing
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	36
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	37 return -1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	38 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	39
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	40
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	41 // UTF8 <-> UTF16 <-> ISO8859 Character set conversion functions and (ack) their globals
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	42
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	43 static int unicode_up = 0;
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	44 static iconv_t i16to8;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	45 static const char *target_charset = NULL;
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	46 static int target_open = 0;
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	47 static iconv_t i8totarget;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	48
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	49
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	50 void unicode_init()
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	51 {
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	52 if (unicode_up) unicode_close();
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	53 i16to8 = iconv_open("UTF-8", "UTF-16LE");
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	54 if (i16to8 == (iconv_t)-1) {
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	55 fprintf(stderr, "Couldn't open iconv descriptor for UTF-16LE to UTF-8.\n");
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	56 exit(1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	57 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	58 unicode_up = 1;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	59 }
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	60
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	61
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	62 void unicode_close()
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	63 {
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	64 iconv_close(i16to8);
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	65 if (target_open) {
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	66 iconv_close(i8totarget);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	67 free((char *)target_charset);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	68 target_charset = NULL;
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	69 target_open = 0;
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	70 }
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	71 unicode_up = 0;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	72 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	73
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	74
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	75 int utf16_is_terminated(const char *str, int length)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	76 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	77 VSTR_STATIC(errbuf, 100);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	78 int len = -1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	79 int i;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	80 for (i = 0; i < length; i += 2) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	81 if (str[i] == 0 && str[i + 1] == 0) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	82 len = i;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	83 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	84 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	85
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	86 if (-1 == len) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	87 vshexdump(errbuf, str, 0, length, 1);
120 6395ced2b8b2 disable building pst2dii on cygwin Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	88 DEBUG_WARN(("String is not zero terminated (probably broken data from registry) %s.\n", errbuf->b));
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	89 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	90
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	91 return (-1 == len) ? 0 : 1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	92 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	93
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	94
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	95 size_t vb_utf16to8(vbuf dest, const char inbuf, int iblen)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	96 {
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	97 size_t inbytesleft = iblen;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	98 size_t icresult = (size_t)-1;
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	99 size_t outbytesleft = 0;
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	100 char *outbuf = NULL;
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	101
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	102 ASSERT(unicode_up, "vb_utf16to8() called before unicode started.");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	103
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	104 if (2 > dest->blen) vbresize(dest, 2);
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	105 dest->dlen = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	106
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	107 //Bad Things can happen if a non-zero-terminated utf16 string comes through here
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	108 if (!utf16_is_terminated(inbuf, iblen))
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	109 return (size_t)-1;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	110
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	111 do {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	112 outbytesleft = dest->blen - dest->dlen;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	113 outbuf = dest->b + dest->dlen;
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	114 icresult = iconv(i16to8, (ICONV_CONST char**)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	115 dest->dlen = outbuf - dest->b;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	116 vbgrow(dest, inbytesleft);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	117 } while ((size_t)-1 == icresult && E2BIG == errno);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	118
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	119 if (icresult == (size_t)-1) {
120 6395ced2b8b2 disable building pst2dii on cygwin Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	120 DEBUG_WARN(("iconv failure: %s\n", strerror(errno)));
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	121 unicode_init();
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	122 return (size_t)-1;
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	123 }
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	124 return (icresult) ? (size_t)-1 : 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	125 }
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	126
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	127
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	128 size_t vb_utf8to8bit(vbuf dest, const char inbuf, int iblen, const char* charset)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	129 {
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	130 size_t inbytesleft = iblen;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	131 size_t icresult = (size_t)-1;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	132 size_t outbytesleft = 0;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	133 char *outbuf = NULL;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	134
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	135 if (!target_charset \|\| strcasecmp(target_charset, charset)) {
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	136 if (target_open) {
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	137 iconv_close(i8totarget);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	138 free((char *)target_charset);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	139 }
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	140 target_charset = strdup(charset);
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	141 target_open = 1;
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	142 i8totarget = iconv_open(target_charset, "UTF-8");
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	143 if (i8totarget == (iconv_t)-1) {
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	144 target_open = 0;
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	145 fprintf(stderr, "Couldn't open iconv descriptor for UTF-8 to %s.\n", target_charset);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	146 return (size_t)-1;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	147 }
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	148 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	149
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	150 if (!target_open) return (size_t)-1; // previous failure to open the target
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	151
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	152 if (2 > dest->blen) vbresize(dest, 2);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	153 dest->dlen = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	154
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	155 do {
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	156 outbytesleft = dest->blen - dest->dlen;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	157 outbuf = dest->b + dest->dlen;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	158 icresult = iconv(i8totarget, (ICONV_CONST char**)&inbuf, &inbytesleft, &outbuf, &outbytesleft);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	159 dest->dlen = outbuf - dest->b;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	160 vbgrow(dest, 20);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	161 } while ((size_t)-1 == icresult && E2BIG == errno);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	162
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	163 if (icresult == (size_t)-1) {
120 6395ced2b8b2 disable building pst2dii on cygwin Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	164 WARN(("iconv failure: %s\n", strerror(errno)));
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	165 unicode_init();
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	166 return (size_t)-1;
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	167 }
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	168 return (icresult) ? (size_t)-1 : 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	169 }
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	170
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	171
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	172 vbuf *vballoc(size_t len)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	173 {
73 3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	174 struct varbuf *result = malloc(sizeof(struct varbuf));
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	175 if (result) {
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	176 result->dlen = 0;
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	177 result->blen = 0;
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	178 result->buf = NULL;
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	179 vbresize(result, len);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	180 }
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	181 else DIE(("malloc() failure"));
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	182 return result;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	183 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	184
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	185
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	186 void vbcheck(vbuf * vb)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	187 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	188 ASSERT(vb->b >= vb->buf, "vbcheck(): data not inside buffer");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	189 ASSERT((size_t)(vb->b - vb->buf) <= vb->blen, "vbcheck(): vb->b outside of buffer range.");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	190 ASSERT(vb->dlen <= vb->blen, "vbcheck(): data length > buffer length.");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	191 ASSERT(vb->blen < 1024 * 1024, "vbcheck(): blen is a bit large...hmmm.");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	192 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	193
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	194
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	195 void vbfree(vbuf * vb)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	196 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	197 free(vb->buf);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	198 free(vb);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	199 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	200
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	201
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	202 void vbclear(struct varbuf *vb) // ditch the data, keep the buffer
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	203 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	204 vbresize(vb, 0);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	205 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	206
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	207
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	208 void vbresize(struct varbuf *vb, size_t len) // DESTRUCTIVELY grow or shrink buffer
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	209 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	210 vb->dlen = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	211
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	212 if (vb->blen >= len) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	213 vb->b = vb->buf;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	214 return;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	215 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	216
73 3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	217 vb->buf = realloc(vb->buf, len);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	218 vb->b = vb->buf;
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	219 vb->blen = len;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	220 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	221
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	222
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	223 size_t vbavail(vbuf * vb)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	224 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	225 return vb->blen - vb->dlen - (size_t)(vb->b - vb->buf);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	226 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	227
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	228
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	229 //void vbdump( vbuf *vb ) // TODO: to stdout? Yuck
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	230 //{
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	231 // printf("vb dump-------------\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	232 // printf("dlen: %d\n", vb->dlen );
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	233 // printf("blen: %d\n", vb->blen );
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	234 // printf("b - buf: %d\n", vb->b - vb->buf );
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	235 // printf("buf:\n");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	236 // hexdump( vb->buf, 0, vb->blen, 1 );
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	237 // printf("b:\n");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	238 // hexdump( vb->b, 0, vb->dlen, 1 );
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	239 // printf("^^^^^^^^^^^^^^^^^^^^\n");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	240 //}
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	241
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	242
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	243 void vbgrow(struct varbuf *vb, size_t len) // out: vbavail(vb) >= len, data are preserved
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	244 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	245 if (0 == len)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	246 return;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	247
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	248 if (0 == vb->blen) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	249 vbresize(vb, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	250 return;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	251 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	252
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	253 if (vb->dlen + len > vb->blen) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	254 if (vb->dlen + len < vb->blen * 1.5)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	255 len = vb->blen * 1.5;
73 3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	256 char *nb = malloc(vb->blen + len);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	257 if (!nb) DIE(("malloc() failure"));
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	258 vb->blen = vb->blen + len;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	259 memcpy(nb, vb->b, vb->dlen);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	260
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	261 free(vb->buf);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	262 vb->buf = nb;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	263 vb->b = vb->buf;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	264 } else {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	265 if (vb->b != vb->buf)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	266 memcpy(vb->buf, vb->b, vb->dlen);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	267 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	268
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	269 vb->b = vb->buf;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	270
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	271 ASSERT(vbavail(vb) >= len, "vbgrow(): I have failed in my mission.");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	272 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	273
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	274
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	275 void vbset(vbuf * vb, void *b, size_t len) // set vbuf b size=len, resize if necessary, relen = how much to over-allocate
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	276 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	277 vbresize(vb, len);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	278
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	279 memcpy(vb->b, b, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	280 vb->dlen = len;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	281 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	282
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	283
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	284 void vsskipws(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	285 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	286 char *p = vs->b;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	287 while ((size_t)(p - vs->b) < vs->dlen && isspace(p[0]))
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	288 p++;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	289
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	290 vbskip((vbuf *) vs, p - vs->b);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	291 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	292
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	293
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	294 // append len bytes of b to vbuf, resize if necessary
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	295 void vbappend(struct varbuf vb, void b, size_t len)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	296 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	297 if (0 == vb->dlen) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	298 vbset(vb, b, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	299 return;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	300 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	301 vbgrow(vb, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	302 memcpy(vb->b + vb->dlen, b, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	303 vb->dlen += len;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	304 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	305
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	306
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	307 // dumps the first skip bytes from vbuf
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	308 void vbskip(struct varbuf *vb, size_t skip)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	309 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	310 ASSERT(skip <= vb->dlen, "vbskip(): Attempt to seek past end of buffer.");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	311 vb->b += skip;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	312 vb->dlen -= skip;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	313 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	314
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	315
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	316 // overwrite vbdest with vbsrc
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	317 void vboverwrite(struct varbuf vbdest, struct varbuf vbsrc)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	318 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	319 vbresize(vbdest, vbsrc->blen);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	320 memcpy(vbdest->b, vbsrc->b, vbsrc->dlen);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	321 vbdest->blen = vbsrc->blen;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	322 vbdest->dlen = vbsrc->dlen;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	323 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	324
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	325
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	326 vstr *vsalloc(size_t len)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	327 {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	328 vstr result = (vstr ) vballoc(len + 1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	329 vsset(result, "");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	330 return result;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	331 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	332
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	333
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	334 char vsstr(vstr vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	335 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	336 return vs->b;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	337 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	338
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	339
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	340 size_t vslen(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	341 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	342 return strlen(vsstr(vs));
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	343 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	344
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	345
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	346 void vsfree(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	347 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	348 vbfree((vbuf *) vs);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	349 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	350
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	351
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	352 void vscharcat(vstr * vb, int ch)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	353 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	354 vbgrow((vbuf *) vb, 1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	355 vb->b[vb->dlen - 1] = ch;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	356 vb->b[vb->dlen] = '\0';
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	357 vb->dlen++;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	358 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	359
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	360
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	361 // prependappend string str to vbuf, vbuf must already contain a valid string
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	362 void vsnprepend(vstr * vb, char *str, size_t len)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	363 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	364 ASSERT(vb->b[vb->dlen - 1] == '\0', "vsncat(): attempt to append string to non-string.");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	365 size_t sl = strlen(str);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	366 size_t n = (sl < len) ? sl : len;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	367 vbgrow((vbuf *) vb, n + 1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	368 memmove(vb->b + n, vb->b, vb->dlen - 1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	369 memcpy(vb->b, str, n);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	370 vb->dlen += n;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	371 vb->b[vb->dlen - 1] = '\0';
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	372 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	373
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	374
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	375 // len < dlen-1 -> skip len chars, else DIE
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	376 void vsskip(vstr * vs, size_t len)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	377 {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	378 ASSERT(len < vs->dlen - 1, "Attempt to skip past end of string");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	379 vbskip((vbuf *) vs, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	380 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	381
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	382
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	383 // in: vb->b == "stuff\nmore_stuff"; out: vb->b == "more_stuff"
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	384 int vsskipline(vstr * vs)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	385 {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	386 int nloff = find_nl(vs);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	387 int nll = skip_nl(vs->b + nloff);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	388
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	389 if (nloff < 0) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	390 //TODO: error
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	391 printf("vb_skipline(): there seems to be no newline here.\n");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	392 return -1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	393 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	394 if (nll < 0) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	395 //TODO: error
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	396 printf("vb_skipline(): there seems to be no newline here...except there should be. :P\n");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	397 return -1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	398 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	399
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	400 memmove(vs->b, vs->b + nloff + nll, vs->dlen - nloff - nll);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	401
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	402 vs->dlen -= nloff + nll;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	403
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	404 return 0;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	405 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	406
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	407
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	408 int vscatprintf(vstr * vs, char *fmt, ...)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	409 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	410 int size;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	411 va_list ap;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	412
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	413 /* Guess we need no more than 100 bytes. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	414 //vsresize( vb, 100 );
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	415 if (!vs->b \|\| vs->dlen == 0) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	416 vsset(vs, "");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	417 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	418
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	419 while (1) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	420 /* Try to print in the allocated space. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	421 va_start(ap, fmt);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	422 size = vsnprintf(vs->b + vs->dlen - 1, vs->blen - vs->dlen, fmt, ap);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	423 va_end(ap);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	424
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	425 /* If that worked, return the string. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	426 if ((size > -1) && ((size_t)size < vs->blen - vs->dlen)) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	427 vs->dlen += size;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	428 return size;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	429 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	430 /* Else try again with more space. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	431 if (size >= 0) /* glibc 2.1 */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	432 vbgrow((vbuf ) vs, size + 1); / precisely what is needed */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	433 else /* glibc 2.0 */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	434 vbgrow((vbuf *) vs, vs->blen);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	435 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	436 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	437
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	438
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	439 // returns the last character stored in a vstr
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	440 int vslast(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	441 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	442 if (vs->dlen < 1)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	443 return -1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	444 if (vs->b[vs->dlen - 1] != '\0')
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	445 return -1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	446 if (vs->dlen == 1)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	447 return '\0';
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	448 return vs->b[vs->dlen - 2];
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	449 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	450
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	451
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	452 // print over vb
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	453 void vs_printf(vstr * vs, char *fmt, ...)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	454 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	455 int size;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	456 va_list ap;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	457
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	458 /* Guess we need no more than 100 bytes. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	459 vbresize((vbuf *) vs, 100);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	460
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	461 while (1) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	462 /* Try to print in the allocated space. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	463 va_start(ap, fmt);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	464 size = vsnprintf(vs->b, vs->blen, fmt, ap);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	465 va_end(ap);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	466
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	467 /* If that worked, return the string. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	468 if ((size > -1) && ((size_t)size < vs->blen)) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	469 vs->dlen = size + 1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	470 return;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	471 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	472 /* Else try again with more space. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	473 if (size >= 0) /* glibc 2.1 */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	474 vbresize((vbuf ) vs, size + 1); / precisely what is needed */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	475 else /* glibc 2.0 */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	476 vbresize((vbuf ) vs, vs->blen 2);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	477 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	478 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	479
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	480
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	481 // printf append to vs
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	482 void vs_printfa(vstr * vs, char *fmt, ...)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	483 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	484 int size;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	485 va_list ap;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	486
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	487 if (vs->blen - vs->dlen < 50)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	488 vbgrow((vbuf *) vs, 100);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	489
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	490 while (1) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	491 /* Try to print in the allocated space. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	492 va_start(ap, fmt);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	493 size = vsnprintf(vs->b + vs->dlen - 1, vs->blen - vs->dlen + 1, fmt, ap);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	494 va_end(ap);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	495
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	496 /* If that worked, return the string. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	497 if ((size > -1) && ((size_t)size < vs->blen)) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	498 vs->dlen += size;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	499 return;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	500 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	501 /* Else try again with more space. */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	502 if (size >= 0) /* glibc 2.1 */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	503 vbgrow((vbuf ) vs, size + 1 - vs->dlen); / precisely what is needed */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	504 else /* glibc 2.0 */
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	505 vbgrow((vbuf *) vs, size);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	506 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	507 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	508
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	509
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	510 void vshexdump(vstr * vs, const char *b, size_t start, size_t stop, int ascii)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	511 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	512 char c;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	513 int diff, i;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	514
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	515 while (start < stop) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	516 diff = stop - start;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	517 if (diff > 16)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	518 diff = 16;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	519
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	520 vs_printfa(vs, ":%08X ", start);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	521
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	522 for (i = 0; i < diff; i++) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	523 if (8 == i)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	524 vs_printfa(vs, " ");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	525 vs_printfa(vs, "%02X ", (unsigned char) *(b + start + i));
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	526 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	527 if (ascii) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	528 for (i = diff; i < 16; i++)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	529 vs_printfa(vs, " ");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	530 for (i = 0; i < diff; i++) {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	531 c = *(b + start + i);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	532 vs_printfa(vs, "%c", isprint(c) ? c : '.');
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	533 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	534 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	535 vs_printfa(vs, "\n");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	536 start += 16;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	537 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	538 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	539
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	540
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	541 void vsset(vstr * vs, char *s) // Store string s in vs
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	542 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	543 vsnset(vs, s, strlen(s));
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	544 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	545
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	546
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	547 void vsnset(vstr * vs, char *s, size_t n) // Store string s in vs
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	548 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	549 vbresize((vbuf *) vs, n + 1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	550 memcpy(vs->b, s, n);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	551 vs->b[n] = '\0';
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	552 vs->dlen = n + 1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	553 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	554
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	555
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	556 void vsgrow(vstr * vs, size_t len) // grow buffer by len bytes, data are preserved
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	557 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	558 vbgrow((vbuf *) vs, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	559 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	560
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	561
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	562 size_t vsavail(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	563 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	564 return vbavail((vbuf *) vs);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	565 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	566
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	567
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	568 void vsnset16(vstr * vs, char *s, size_t len) // Like vbstrnset, but for UTF16
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	569 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	570 vbresize((vbuf *) vs, len + 1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	571 memcpy(vs->b, s, len);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	572
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	573 vs->b[len] = '\0';
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	574 vs->dlen = len + 1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	575 vs->b[len] = '\0';
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	576 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	577
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	578
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	579 void vscat(vstr * vs, char *str)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	580 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	581 vsncat(vs, str, strlen(str));
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	582 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	583
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	584
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	585 int vscmp(vstr * vs, char *str)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	586 {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	587 return strcmp(vs->b, str);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	588 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	589
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	590
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	591 void vsncat(vstr * vs, char *str, size_t len) // append string str to vstr, vstr must already contain a valid string
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	592 {
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	593 ASSERT(vs->b[vs->dlen - 1] == '\0', "vsncat(): attempt to append string to non-string.");
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	594 size_t sl = strlen(str);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	595 size_t n = (sl < len) ? sl : len;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	596 //string append
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	597 vbgrow((vbuf *) vs, n + 1);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	598 memcpy(vs->b + vs->dlen - 1, str, n);
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	599 vs->dlen += n;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	600 vs->b[vs->dlen - 1] = '\0';
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	601 }
70 b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	602
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	603
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	604 void vstrunc(vstr * v, size_t off) // Drop chars [off..dlen]
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	605 {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	606 if (off >= v->dlen - 1)
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	607 return; //nothing to do
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	608 v->b[off] = '\0';
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	609 v->dlen = off + 1;
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	610 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	611
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	612

Mercurial > libpst

annotate src/vbuf.c @ 146:0695de3b5a98 stable-0-6-29