libpst: src/vbuf.c annotate

annotate src/vbuf.c @ 126:f01d6163acba

remove obsolete win32 directory since msvc builds are not directly supported

author	Carl Byington <carl@five-ten-sg.com>
date	Wed, 04 Feb 2009 20:59:06 -0800
parents	ab2a11e72250
children	fc11b1d1ad34

rev	line source
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	1
123 ab2a11e72250 more cleanup of #include files. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	2 #include "common.h"
ab2a11e72250 more cleanup of #include files. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	3 #include "vbuf.h"
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	4
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 #include "define.h"
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	6
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	7
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	8 #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	9
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	10
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	11 int skip_nl(char *s)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	12 {
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	13 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	14 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	15 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	16 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	17 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	18 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	19 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	20 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	21
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
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	23 int find_nl(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	24 {
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	25 char nextr, nextn;
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 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	28 nextn = memchr(vs->b, '\n', vs->dlen);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	29
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	30 //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	31 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	32 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	33 }
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 //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	35 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	36 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	37 }
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 //case 3: we find nothing
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	39
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	40 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	41 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	42
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	43
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	44 // UTF8 <-> UTF16 <-> ISO8859 Character set conversion functions and (ack) their globals
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	45
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	46 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	47 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	48 static const char *target_charset = NULL;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	49 static iconv_t i8totarget;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	50
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	51
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	52 void unicode_init()
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	53 {
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	54 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	55 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	56 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	57 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	58 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	59 }
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 unicode_up = 1;
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
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	63
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	64 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	65 {
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(i16to8);
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	67 if (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 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	69 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	70 target_charset = NULL;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	71 }
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	72 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	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
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	75
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	76 int utf16_is_terminated(const char *str, int length)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	77 {
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	78 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	79 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	80 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	81 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	82 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	83 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	84 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	85 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	86
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	87 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	88 vshexdump(errbuf, str, 0, length, 1);
120 6395ced2b8b2 disable building pst2dii on cygwin Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	89 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	90 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	91
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	92 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	93 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	94
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	95
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	96 size_t vb_utf16to8(vbuf dest, const char inbuf, int iblen)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	97 {
116 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 inbytesleft = iblen;
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	99 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	100 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	101 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	102
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	103 ASSERT(unicode_up, "vb_utf16to8() called before unicode started.");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	104
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	105 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	106 dest->dlen = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	107
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	108 //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	109 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	110 return (size_t)-1;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	111
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	112 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	113 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	114 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	115 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	116 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	117 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	118 } while ((size_t)-1 == icresult && E2BIG == errno);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	119
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	120 if (icresult == (size_t)-1) {
120 6395ced2b8b2 disable building pst2dii on cygwin Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	121 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	122 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	123 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	124 }
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	125 return (icresult) ? (size_t)-1 : 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	126 }
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	127
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	128
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	129 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	130 {
116 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 inbytesleft = iblen;
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 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	133 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	134 char *outbuf = NULL;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	135
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	136 if (!target_charset \|\| (target_charset && strcasecmp(target_charset, charset))) {
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	137 if (target_charset) {
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	138 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	139 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	140 }
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	141 target_charset = strdup(charset);
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) {
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	144 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	145 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	146 }
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	147 }
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
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	149 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	150 dest->dlen = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 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 do {
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	153 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	154 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	155 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	156 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	157 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	158 } while ((size_t)-1 == icresult && E2BIG == errno);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	159
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	160 if (icresult == (size_t)-1) {
120 6395ced2b8b2 disable building pst2dii on cygwin Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	161 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	162 unicode_init();
ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	163 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	164 }
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	165 return (icresult) ? (size_t)-1 : 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	166 }
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
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	168
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	169 vbuf *vballoc(size_t len)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	170 {
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	171 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	172 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	173 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	174 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	175 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	176 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	177 }
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 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	179 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	180 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	181
f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	182
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	183 void vbcheck(vbuf * vb)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	184 {
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	185 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	186 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	187 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	188 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	189 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	190
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	191
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 void vbfree(vbuf * vb)
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 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	195 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	196 }
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
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
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 void vbclear(struct varbuf *vb) // ditch the data, keep the buffer
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	200 {
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	201 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	202 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	203
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
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 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	206 {
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	207 vb->dlen = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	208
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	209 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	210 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	211 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	212 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	213
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	214 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	215 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	216 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	217 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	218
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
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 size_t vbavail(vbuf * vb)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	221 {
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	222 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	223 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	224
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
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 //void vbdump( vbuf *vb ) // TODO: to stdout? Yuck
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	227 //{
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	228 // printf("vb dump-------------\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	229 // 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	230 // 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	231 // 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	232 // 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	233 // 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	234 // 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	235 // 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	236 // 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	237 //}
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
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
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 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	241 {
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	242 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	243 return;
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 == 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	246 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	247 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	248 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	249
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	250 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	251 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	252 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	253 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	254 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	255 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	256 memcpy(nb, vb->b, vb->dlen);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	257
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 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	259 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	260 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	261 } 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	262 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	263 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	264 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	265
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	266 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	267
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	268 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	269 }
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
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	271
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	272 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	273 {
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	274 vbresize(vb, len);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	275
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	276 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	277 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	278 }
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
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
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 void vsskipws(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	282 {
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	283 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	284 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	285 p++;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	286
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	287 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	288 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	289
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	290
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	291 // 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	292 void vbappend(struct varbuf vb, void b, size_t len)
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 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	295 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	296 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	297 }
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 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	299 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	300 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	301 }
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
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
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 // 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	305 void vbskip(struct varbuf *vb, size_t skip)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	306 {
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	307 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	308 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	309 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	310 }
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
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
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 // 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	314 void vboverwrite(struct varbuf vbdest, struct varbuf vbsrc)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	315 {
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	316 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	317 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	318 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	319 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	320 }
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
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
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 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	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 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	326 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	327 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	328 }
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
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
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 char vsstr(vstr vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	332 {
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	333 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	334 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	335
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
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 size_t vslen(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	338 {
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	339 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	340 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	341
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
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 void vsfree(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	344 {
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	345 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	346 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	347
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
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 void vscharcat(vstr * vb, int ch)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	350 {
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	351 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	352 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	353 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	354 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	355 }
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
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	357
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	358 // 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	359 void vsnprepend(vstr * vb, char *str, size_t len)
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 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	362 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	363 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	364 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	365 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	366 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	367 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	368 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	369 }
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
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	371
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	372 // 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	373 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	374 {
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 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	376 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	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
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	379
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	380 // 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	381 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	382 {
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 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	384 int nll = skip_nl(vs->b + nloff);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	385
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	386 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	387 //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	388 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	389 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	390 }
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 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	392 //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	393 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	394 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	395 }
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
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 memmove(vs->b, vs->b + nloff + nll, vs->dlen - nloff - nll);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	398
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	399 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	400
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	401 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	402 }
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
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 int vscatprintf(vstr * vs, char *fmt, ...)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	406 {
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	407 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	408 va_list ap;
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 /* 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	411 //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	412 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	413 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	414 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	415
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	416 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	417 /* 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	418 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	419 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	420 va_end(ap);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	421
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	422 /* 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	423 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	424 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	425 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	426 }
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 /* 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	428 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	429 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	430 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	431 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	432 }
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 }
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
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 // 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	437 int vslast(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	438 {
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	439 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	440 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	441 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	442 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	443 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	444 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	445 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	446 }
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
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
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 // 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	450 void vs_printf(vstr * vs, char *fmt, ...)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	451 {
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	452 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	453 va_list ap;
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 /* 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	456 vbresize((vbuf *) vs, 100);
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 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	459 /* 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	460 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	461 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	462 va_end(ap);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	463
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	464 /* 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	465 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	466 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	467 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	468 }
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 /* 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	470 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	471 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	472 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	473 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	474 }
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 }
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
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 // 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	479 void vs_printfa(vstr * vs, char *fmt, ...)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	480 {
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	481 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	482 va_list ap;
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 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	485 vbgrow((vbuf *) vs, 100);
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 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	488 /* 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	489 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	490 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	491 va_end(ap);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	492
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	493 /* 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	494 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	495 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	496 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	497 }
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 /* 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	499 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	500 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	501 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	502 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	503 }
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 }
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
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
116 ed2a260bbb98 improve handling of content-type charset values in mime parts Carl Byington <carl@five-ten-sg.com> parents: 93 diff changeset	507 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	508 {
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	509 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	510 int diff, i;
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 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	513 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	514 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	515 diff = 16;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	516
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	517 vs_printfa(vs, ":%08X ", start);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	518
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	519 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	520 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	521 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	522 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	523 }
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 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	525 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	526 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	527 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	528 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	529 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	530 }
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 }
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, "\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	533 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	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 }
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
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 void vsset(vstr * vs, char *s) // Store string s in vs
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	539 {
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	540 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	541 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	542
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
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 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	545 {
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	546 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	547 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	548 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	549 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	550 }
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
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
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 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	554 {
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	555 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	556 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	557
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
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 size_t vsavail(vstr * vs)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	560 {
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	561 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	562 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	563
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
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 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	566 {
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	567 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	568 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	569
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 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	571 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	572 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	573 }
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
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
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 void vscat(vstr * vs, char *str)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	577 {
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	578 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	579 }
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	580
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	581
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	582 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	583 {
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	584 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	585 }
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
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 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	589 {
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	590 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	591 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	592 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	593 //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	594 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	595 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	596 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	597 vs->b[vs->dlen - 1] = '\0';
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: diff changeset	598 }
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	599
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
b12f4e50e2e8 Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile. Carl Byington <carl@five-ten-sg.com> parents: 43 diff changeset	601 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	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 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	604 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	605 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	606 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	607 }
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
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

Mercurial > libpst

annotate src/vbuf.c @ 126:f01d6163acba