libpst: src/pst2ldif.cpp annotate

annotate src/pst2ldif.cpp @ 143:fdc58ad2c758 stable-0-6-28

fix embedded rfc822 messages with attachments

author	Carl Byington <carl@five-ten-sg.com>
date	Tue, 24 Feb 2009 12:33:49 -0800
parents	fc11b1d1ad34
children	cda7c812ec01

rev	line source
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	1 /*
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	2
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	3 Copyright (c) 2004 Carl Byington - 510 Software Group, released under
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	4 the GPL version 2 or any later version at your choice available at
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	5 http://www.fsf.org/licenses/gpl.txt
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	6
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	7 Based on readpst.c by David Smith
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	8
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	9 */
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	10
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	11 using namespace std;
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	12
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	13 // needed for std c++ collections
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	14 #include <set>
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	15 #include <vector>
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	16 #include <string>
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	17
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	18 extern "C" {
122 bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	19 #include "define.h"
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	20 #include "lzfu.h"
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	21 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	22
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 114 diff changeset	23 void usage(void);
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 114 diff changeset	24 void version(void);
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: 59 diff changeset	25 char check_filename(char fname);
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	26 void print_ldif_single(const char attr, const char value);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	27 void print_ldif_address(const char attr, int nvalues, char value, ...);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	28 void print_ldif_dn(const char attr, const char value, const char *base);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	29 void print_ldif_multi(const char dn, const char value);
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	30 void print_ldif_two(const char attr, const char value1, const char *value2);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	31 void print_escaped_dn(const char *value);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	32 void build_cn(char cn, size_t len, int nvalues, char value, ...);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	33
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	34 char *prog_name;
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	35 pst_file pstfile;
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	36 bool old_schema = false;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	37 char *ldap_base = NULL; // 'o=some.domain.tld,c=US'
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	38 int ldif_extra_line_count = 0;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	39 iconv_t cd = 0; // Character set conversion descriptor
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	40 vector<string> ldap_class; // 'newPerson' or 'inetOrgPerson'
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	41 vector<string> ldif_extra_line; // 'o: myorg'
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	42
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	43
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	44 ////////////////////////////////////////////////
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	45 // define our ordering
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	46 struct ltstr {
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: 59 diff changeset	47 bool operator()(const char* s1, const char* s2) const {
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: 59 diff changeset	48 return strcasecmp(s1, s2) < 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: 59 diff changeset	49 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	50 };
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	51 // define our set
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: 59 diff changeset	52 typedef set<const char *, ltstr> string_set;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	53 // make a static set to hold the cn values
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	54 static string_set all_strings;
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	55
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	56
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	57 ////////////////////////////////////////////////
41 183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	58 // helper to free all the strings in a set
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	59 //
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	60 static void free_strings(string_set &s);
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	61 static void free_strings(string_set &s)
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	62 {
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: 59 diff changeset	63 for (string_set::iterator i=s.begin(); i!=s.end(); i++) {
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: 59 diff changeset	64 free((void)i);
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: 59 diff changeset	65 }
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: 59 diff changeset	66 s.clear();
41 183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	67 }
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	68
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	69
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	70 ////////////////////////////////////////////////
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	71 // helper to register a string in a string set
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	72 //
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: 59 diff changeset	73 static const char* register_string(string_set &s, const char *name);
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: 59 diff changeset	74 static const char* register_string(string_set &s, const char *name) {
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: 59 diff changeset	75 string_set::const_iterator i = s.find(name);
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: 59 diff changeset	76 if (i != s.end()) return *i;
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: 59 diff changeset	77 char *x = strdup(name);
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: 59 diff changeset	78 s.insert(x);
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: 59 diff changeset	79 return x;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	80 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	81
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	82
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	83 ////////////////////////////////////////////////
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	84 // register a global string
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	85 //
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: 59 diff changeset	86 static const char* register_string(const char *name);
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: 59 diff changeset	87 static const char* register_string(const char *name) {
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: 59 diff changeset	88 return register_string(all_strings, name);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	89 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	90
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	91
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	92 ////////////////////////////////////////////////
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	93 // make a unique string
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	94 //
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: 59 diff changeset	95 static const char* unique_string(const char *name);
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: 59 diff changeset	96 static const char* unique_string(const char *name) {
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: 59 diff changeset	97 int unique = 2;
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: 59 diff changeset	98 string_set::iterator i = all_strings.find(name);
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: 59 diff changeset	99 if (i == all_strings.end()) return register_string(name);
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: 59 diff changeset	100 while (true) {
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	101 vector<char> n(strlen(name)+10);
7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	102 snprintf(&n[0], n.size(), "%s %d", name, unique++);
7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	103 string_set::iterator i = all_strings.find(&n[0]);
7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	104 if (i == all_strings.end()) return register_string(&n[0]);
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: 59 diff changeset	105 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	106 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	107
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	108
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	109 static void process(pst_desc_ll *d_ptr);
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	110 static void process(pst_desc_ll *d_ptr) {
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: 59 diff changeset	111 pst_item *item = 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: 59 diff changeset	112 while (d_ptr) {
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: 59 diff changeset	113 if (d_ptr->desc) {
143 fdc58ad2c758 fix embedded rfc822 messages with attachments Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	114 item = pst_parse_item(&pstfile, d_ptr, NULL);
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: 59 diff changeset	115 DEBUG_INFO(("item pointer is %p\n", item));
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: 59 diff changeset	116 if (item) {
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: 59 diff changeset	117 if (item->folder && d_ptr->child && strcasecmp(item->file_as, "Deleted Items")) {
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: 59 diff changeset	118 //if this is a non-empty folder other than deleted items, we want to recurse into it
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: 59 diff changeset	119 fprintf(stderr, "entering folder %s\n", item->file_as);
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: 59 diff changeset	120 process(d_ptr->child);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	121
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	122 } else if (item->contact && (item->type == PST_TYPE_CONTACT)) {
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: 59 diff changeset	123 // deal with a contact
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	124 char cn[1000];
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	125
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	126 build_cn(cn, sizeof(cn), 4,
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	127 item->contact->display_name_prefix,
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	128 item->contact->first_name,
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	129 item->contact->surname,
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	130 item->contact->suffix);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	131 if (cn[0] != 0) {
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	132 // have a valid cn
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	133 const char *ucn = unique_string(cn);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	134
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	135 print_ldif_dn("dn", ucn, ldap_base);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	136 print_ldif_single("cn", ucn);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	137 if (item->contact->first_name) {
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	138 print_ldif_two("givenName",
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	139 item->contact->display_name_prefix,
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	140 item->contact->first_name);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	141 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	142 if (item->contact->surname) {
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	143 print_ldif_two("sn",
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	144 item->contact->surname,
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	145 item->contact->suffix);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	146 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	147 else if (item->contact->company_name) {
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	148 print_ldif_single("sn", item->contact->company_name);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	149 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	150 else
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	151 print_ldif_single("sn", ucn); // use cn as sn if we cannot find something better
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	152
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	153 if (old_schema) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	154 if (item->contact->job_title)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	155 print_ldif_single("personalTitle", item->contact->job_title);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	156 if (item->contact->company_name)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	157 print_ldif_single("company", item->contact->company_name);
108 1b2a4fac1303 fix title bug with old schema in pst2ldif, also escape commas in distinguished names per rfc4514. Carl Byington <carl@five-ten-sg.com> parents: 106 diff changeset	158 }
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	159 else {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	160 // new schema
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	161 if (item->contact->job_title)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	162 print_ldif_single("title", item->contact->job_title);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	163 if (item->contact->company_name)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	164 print_ldif_single("o", item->contact->company_name);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	165 }
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	166 if (item->contact->address1 && *item->contact->address1)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	167 print_ldif_single("mail", item->contact->address1);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	168 if (item->contact->address2 && *item->contact->address2)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	169 print_ldif_single("mail", item->contact->address2);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	170 if (item->contact->address3 && *item->contact->address3)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	171 print_ldif_single("mail", item->contact->address3);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	172 if (item->contact->address1a && *item->contact->address1a)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	173 print_ldif_single("mail", item->contact->address1a);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	174 if (item->contact->address2a && *item->contact->address2a)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	175 print_ldif_single("mail", item->contact->address2a);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	176 if (item->contact->address3a && *item->contact->address3a)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	177 print_ldif_single("mail", item->contact->address3a);
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	178
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	179 if (old_schema) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	180 if (item->contact->business_address) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	181 if (item->contact->business_po_box)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	182 print_ldif_single("postalAddress", item->contact->business_po_box);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	183 if (item->contact->business_street)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	184 print_ldif_multi("postalAddress", item->contact->business_street);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	185 if (item->contact->business_city)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	186 print_ldif_single("l", item->contact->business_city);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	187 if (item->contact->business_state)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	188 print_ldif_single("st", item->contact->business_state);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	189 if (item->contact->business_postal_code)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	190 print_ldif_single("postalCode", item->contact->business_postal_code);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	191 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	192 else if (item->contact->home_address) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	193 if (item->contact->home_po_box)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	194 print_ldif_single("postalAddress", item->contact->home_po_box);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	195 if (item->contact->home_street)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	196 print_ldif_multi("postalAddress", item->contact->home_street);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	197 if (item->contact->home_city)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	198 print_ldif_single("l", item->contact->home_city);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	199 if (item->contact->home_state)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	200 print_ldif_single("st", item->contact->home_state);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	201 if (item->contact->home_postal_code)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	202 print_ldif_single("postalCode", item->contact->home_postal_code);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	203 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	204 else if (item->contact->other_address) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	205 if (item->contact->other_po_box)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	206 print_ldif_single("postalAddress", item->contact->other_po_box);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	207 if (item->contact->other_street)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	208 print_ldif_multi("postalAddress", item->contact->other_street);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	209 if (item->contact->other_city)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	210 print_ldif_single("l", item->contact->other_city);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	211 if (item->contact->other_state)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	212 print_ldif_single("st", item->contact->other_state);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	213 if (item->contact->other_postal_code)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	214 print_ldif_single("postalCode", item->contact->other_postal_code);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	215 }
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	216 }
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	217 else {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	218 // new schema, with proper RFC4517 postal addresses
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	219 if (item->contact->business_address) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	220 print_ldif_address("postalAddress", 6,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	221 item->contact->business_po_box,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	222 item->contact->business_street,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	223 item->contact->business_city,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	224 item->contact->business_state,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	225 item->contact->business_postal_code,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	226 item->contact->business_country);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	227 if (item->contact->business_city)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	228 print_ldif_single("l", item->contact->business_city);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	229 if (item->contact->business_state)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	230 print_ldif_single("st", item->contact->business_state);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	231 if (item->contact->business_postal_code)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	232 print_ldif_single("postalCode", item->contact->business_postal_code);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	233 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	234 else if (item->contact->home_address) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	235 if (item->contact->home_city)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	236 print_ldif_single("l", item->contact->home_city);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	237 if (item->contact->home_state)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	238 print_ldif_single("st", item->contact->home_state);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	239 if (item->contact->home_postal_code)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	240 print_ldif_single("postalCode", item->contact->home_postal_code);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	241 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	242 else if (item->contact->other_address) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	243 print_ldif_address("postalAddress", 6,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	244 item->contact->other_po_box,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	245 item->contact->other_street,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	246 item->contact->other_city,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	247 item->contact->other_state,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	248 item->contact->other_postal_code,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	249 item->contact->other_country);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	250 if (item->contact->other_city)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	251 print_ldif_single("l", item->contact->other_city);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	252 if (item->contact->other_state)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	253 print_ldif_single("st", item->contact->other_state);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	254 if (item->contact->other_postal_code)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	255 print_ldif_single("postalCode", item->contact->other_postal_code);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	256 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	257 if (item->contact->home_address) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	258 print_ldif_address("homePostalAddress", 6,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	259 item->contact->home_po_box,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	260 item->contact->home_street,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	261 item->contact->home_city,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	262 item->contact->home_state,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	263 item->contact->home_postal_code,
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	264 item->contact->home_country);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	265 }
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	266 }
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	267
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	268 if (item->contact->business_fax)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	269 print_ldif_single("facsimileTelephoneNumber", item->contact->business_fax);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	270 else if (item->contact->home_fax)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	271 print_ldif_single("facsimileTelephoneNumber", item->contact->home_fax);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	272
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	273 if (item->contact->business_phone)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	274 print_ldif_single("telephoneNumber", item->contact->business_phone);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	275 if (item->contact->home_phone)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	276 print_ldif_single("homePhone", item->contact->home_phone);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	277
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	278 if (item->contact->car_phone)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	279 print_ldif_single("mobile", item->contact->car_phone);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	280 else if (item->contact->mobile_phone)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	281 print_ldif_single("mobile", item->contact->mobile_phone);
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	282 else if (item->contact->other_phone)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	283 print_ldif_single("mobile", item->contact->other_phone);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	284
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	285 if (!old_schema) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	286 if (item->contact->business_homepage)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	287 print_ldif_single("labeledURI", item->contact->business_homepage);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	288 if (item->contact->personal_homepage)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	289 print_ldif_single("labeledURI", item->contact->personal_homepage);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	290 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	291
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	292 if (item->comment)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	293 print_ldif_single("description", item->comment);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	294
106 07d090676ce9 cleanup fedora9 compile warnings Carl Byington <carl@five-ten-sg.com> parents: 105 diff changeset	295 for (vector<string>::size_type i=0; i<ldap_class.size(); i++)
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	296 print_ldif_single("objectClass", ldap_class[i].c_str());
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	297 printf("\n");
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: 59 diff changeset	298 }
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: 59 diff changeset	299 }
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: 59 diff changeset	300 else {
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: 59 diff changeset	301 DEBUG_INFO(("item is not a contact\n"));
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: 59 diff changeset	302 }
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: 59 diff changeset	303 }
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: 59 diff changeset	304 pst_freeItem(item);
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: 59 diff changeset	305 }
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: 59 diff changeset	306 d_ptr = d_ptr->next;
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: 59 diff changeset	307 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	308 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	309
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	310
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	311 // Prints an attribute together with its value.
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	312 // If the value isn't a "SAFE STRING" (as defined in RFC2849),
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	313 // then it is output as a BASE-64 encoded value
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	314 void print_ldif_single(const char attr, const char value)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	315 {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	316 size_t len;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	317 bool is_safe_string = true;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	318 bool needs_code_conversion = false;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	319 bool space_flag = false;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	320
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	321 // Strip leading spaces
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	322 while (*value == ' ') value++;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	323 len = strlen(value) + 1;
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	324 vector<char> buffer(len);
7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	325 char *p = &buffer[0];
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	326
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	327 // See if "value" is a "SAFE STRING"
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	328 // First check characters that are safe but not safe as initial characters
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	329 if (value == ':' \|\| value == '<')
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	330 is_safe_string = false;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	331 for (;;) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	332 char ch = *value++;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	333
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	334 if (ch == 0 \|\| ch == '\n')
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	335 break;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	336 else if (ch == '\r')
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	337 continue;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	338 else if (ch == ' ') {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	339 space_flag = true;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	340 continue;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	341 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	342 else {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	343 if ((ch & 0x80) == 0x80) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	344 needs_code_conversion = true;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	345 is_safe_string = false;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	346 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	347 if (space_flag) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	348 *p++ = ' ';
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	349 space_flag = false;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	350 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	351 *p++ = ch;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	352 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	353 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	354 *p = 0;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	355 if (is_safe_string) {
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	356 printf("%s: %s\n", attr, &buffer[0]);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	357 return;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	358 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	359
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	360 if (needs_code_conversion && cd != 0) {
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	361 size_t inlen = p - &buffer[0];
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	362 size_t utf8_len = 2 * inlen + 1;
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	363 vector<char> utf8_buffer(utf8_len);
7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	364 char *utf8_p = &utf8_buffer[0];
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	365
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	366 iconv(cd, NULL, NULL, NULL, NULL);
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	367 p = &buffer[0];
114 e213bfcf9aa7 patch from Chris Eagle to build on cygwin Carl Byington <carl@five-ten-sg.com> parents: 108 diff changeset	368 int ret = iconv(cd, (ICONV_CONST char**)&p, &inlen, &utf8_p, &utf8_len);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	369
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	370 if (ret >= 0) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	371 *utf8_p = 0;
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	372 p = base64_encode(&utf8_buffer[0], utf8_p - &utf8_buffer[0]);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	373 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	374 else
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	375 p = base64_encode(&buffer[0], buffer.size());
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	376 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	377 else
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	378 p = base64_encode(&buffer[0], buffer.size());
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	379 printf("%s:: %s\n", attr, p);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	380 free(p);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	381 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	382
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	383
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	384 // Combines values representing address lines into an address,i
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	385 // lines separated with "$" as per PostalAddress syntax in RFC4517
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	386 void print_ldif_address(const char attr, int nvalues, char value, ...)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	387 {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	388 bool space_flag = false;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	389 bool newline_flag = false;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	390 char *address = NULL; // Buffer where address is built up
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	391 int len = 0; // Length of buffer
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	392 int i = 0; // Index of next character position in buffer
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	393 va_list ap;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	394
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	395 va_start(ap, value);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	396
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	397 while (!value) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	398 nvalues--;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	399 if (nvalues == 0) { // Nothing at all to do!
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	400 va_end(ap);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	401 return;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	402 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	403 value = va_arg(ap, char *);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	404 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	405 for (;;) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	406 char ch = *value++;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	407
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	408 if (ch == 0 \|\| ch == '\n') {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	409 do {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	410 value = NULL;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	411 nvalues--;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	412 if (nvalues == 0) break;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	413 value = va_arg(ap, char *);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	414 } while (!value);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	415 if (!value) break;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	416 space_flag = true;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	417 newline_flag = true;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	418 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	419 else if (ch == '\r')
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	420 continue;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	421 else if (ch == '\n') {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	422 newline_flag = true;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	423 continue;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	424 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	425 else if (ch == ' ') {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	426 space_flag = true;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	427 continue;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	428 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	429 else {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	430 if (i > (len-5)) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	431 len += 256;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	432 address = (char *)realloc(address, len);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	433 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	434 if (newline_flag) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	435 address[i++] = '$';
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	436 newline_flag = false;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	437 space_flag = false;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	438 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	439 else if (space_flag) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	440 address[i++] = ' ';
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	441 space_flag = false;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	442 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	443 if (ch == '$' \|\| ch == '\\') address[i++] = '\\';
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	444 address[i++] = ch;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	445 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	446 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	447 va_end(ap);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	448 if (i == 0) return; // Nothing to do
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	449 address[i] = 0;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	450 print_ldif_single(attr, address);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	451 free(address);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	452 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	453
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	454
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	455 void print_ldif_multi(const char dn, const char value)
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	456 {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	457 const char *n;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	458 while ((n = strchr(value, '\n'))) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	459 print_ldif_single(dn, value);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	460 value = n + 1;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	461 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	462 print_ldif_single(dn, value);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	463 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	464
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	465
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	466 void print_ldif_two(const char attr, const char value1, const char *value2)
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	467 {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	468 size_t len1, len2;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	469 if (value1 && *value1)
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	470 len1 = strlen(value1);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	471 else {
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	472 print_ldif_single(attr, value2);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	473 return;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	474 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	475
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	476 if (value2 && *value2)
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	477 len2 = strlen(value2);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	478 else {
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	479 print_ldif_single(attr, value1);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	480 return;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	481 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	482
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	483 vector<char> value(len1 + len2 + 2);
7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	484 memcpy(&value[0], value1, len1);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	485 value[len1] = ' ';
128 7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	486 memcpy(&value[0] + len1 + 1, value2, len2 + 1);
7f747c8c9d02 cleanup installed headers Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	487 print_ldif_single(attr, &value[0]);
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	488 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	489
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	490
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	491 void build_cn(char cn, size_t len, int nvalues, char value, ...)
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	492 {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	493 bool space_flag = false;
105 4703d622e95b cleanup fedora9 compile warnings Carl Byington <carl@five-ten-sg.com> parents: 104 diff changeset	494 size_t i = 0;
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	495 va_list ap;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	496
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	497 va_start(ap, value);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	498
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	499 while (!value) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	500 nvalues--;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	501 if (nvalues == 0) {
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	502 cn[0] = 0; // Just a terminating NUL
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	503 va_end(ap);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	504 return;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	505 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	506 value = va_arg(ap, char *);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	507 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	508 for (;;) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	509 char ch = *value++;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	510
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	511 if (ch == 0 \|\| ch == '\n') {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	512 do {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	513 value = NULL;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	514 nvalues--;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	515 if (nvalues == 0) break;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	516 value = va_arg(ap, char *);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	517 } while (!value);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	518 if (!value) break;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	519 space_flag = true;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	520 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	521 else if (ch == '\r')
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	522 continue;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	523 else if (ch == ' ') {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	524 space_flag = true;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	525 continue;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	526 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	527 else {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	528 if (space_flag) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	529 if (i > 0) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	530 if (i < (len - 2)) cn[i++] = ' ';
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	531 else break;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	532 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	533 space_flag = false;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	534 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	535 if (i < (len - 1)) cn[i++] = ch;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	536 else break;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	537 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	538 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	539 cn[i] = 0;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	540 va_end(ap);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	541 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	542
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	543
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 114 diff changeset	544 int main(int argc, char* const* argv) {
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: 59 diff changeset	545 pst_desc_ll *d_ptr;
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: 59 diff changeset	546 char *fname = NULL;
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	547 int c;
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: 59 diff changeset	548 char *d_log = 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: 59 diff changeset	549 prog_name = argv[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: 59 diff changeset	550 pst_item *item = NULL;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	551
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	552 while ((c = getopt(argc, argv, "b:c:C:d:l:oVh"))!= -1) {
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: 59 diff changeset	553 switch (c) {
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: 59 diff changeset	554 case 'b':
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: 59 diff changeset	555 ldap_base = optarg;
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: 59 diff changeset	556 break;
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: 59 diff changeset	557 case 'c':
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	558 ldap_class.push_back(string(optarg));
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: 59 diff changeset	559 break;
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	560 case 'C':
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	561 cd = iconv_open("UTF-8", optarg);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	562 if (cd == (iconv_t)(-1)) {
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	563 fprintf(stderr, "I don't know character set \"%s\"!\n\n", optarg);
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	564 fprintf(stderr, "Type: \"iconv --list\" to get list of known character sets\n");
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	565 return 1;
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	566 }
b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	567 break;
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: 59 diff changeset	568 case 'd':
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: 59 diff changeset	569 d_log = optarg;
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: 59 diff changeset	570 break;
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: 59 diff changeset	571 case 'h':
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: 59 diff changeset	572 usage();
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: 59 diff changeset	573 exit(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: 59 diff changeset	574 break;
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	575 case 'l':
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	576 ldif_extra_line.push_back(string(optarg));
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	577 break;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	578 case 'o':
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	579 old_schema = true;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	580 break;
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: 59 diff changeset	581 case 'V':
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: 59 diff changeset	582 version();
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: 59 diff changeset	583 exit(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: 59 diff changeset	584 break;
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: 59 diff changeset	585 default:
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: 59 diff changeset	586 usage();
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: 59 diff changeset	587 exit(1);
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 59 diff changeset	588 break;
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: 59 diff changeset	589 }
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: 59 diff changeset	590 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	591
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	592 if ((argc > optind) && (ldap_base)) {
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: 59 diff changeset	593 fname = argv[optind];
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: 59 diff changeset	594 } else {
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: 59 diff changeset	595 usage();
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: 59 diff changeset	596 exit(2);
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: 59 diff changeset	597 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	598
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: 59 diff changeset	599 #ifdef DEBUG_ALL
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: 59 diff changeset	600 // force a log file
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: 59 diff changeset	601 if (!d_log) d_log = "pst2ldif.log";
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: 59 diff changeset	602 #endif
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: 59 diff changeset	603 DEBUG_INIT(d_log);
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: 59 diff changeset	604 DEBUG_REGISTER_CLOSE();
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: 59 diff changeset	605 DEBUG_ENT("main");
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: 59 diff changeset	606 RET_DERROR(pst_open(&pstfile, fname), 1, ("Error opening File\n"));
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: 59 diff changeset	607 RET_DERROR(pst_load_index(&pstfile), 2, ("Index Error\n"));
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	608
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: 59 diff changeset	609 pst_load_extended_attributes(&pstfile);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	610
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: 59 diff changeset	611 d_ptr = pstfile.d_head; // first record is main record
143 fdc58ad2c758 fix embedded rfc822 messages with attachments Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	612 item = (pst_item*)pst_parse_item(&pstfile, d_ptr, NULL);
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: 59 diff changeset	613 if (!item \|\| !item->message_store) {
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: 59 diff changeset	614 DEBUG_RET();
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: 59 diff changeset	615 DIE(("main: Could not get root record\n"));
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: 59 diff changeset	616 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	617
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: 59 diff changeset	618 d_ptr = pst_getTopOfFolders(&pstfile, item);
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: 59 diff changeset	619 if (!d_ptr) {
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: 59 diff changeset	620 DEBUG_RET();
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: 59 diff changeset	621 DIE(("Top of folders record not found. Cannot continue\n"));
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: 59 diff changeset	622 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	623
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: 59 diff changeset	624 pst_freeItem(item);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	625
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	626 if (old_schema && (strlen(ldap_base) > 2)) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	627 char *ldap_org = strdup(ldap_base+2); // assume first 2 chars are o=
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	628 char *temp = strchr(ldap_org, ',');
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	629 if (temp) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	630 *temp = '\0';
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	631 // write the ldap header
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	632 printf("dn: %s\n", ldap_base);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	633 printf("o: %s\n", ldap_org);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	634 printf("objectClass: organization\n\n");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	635 printf("dn: cn=root, %s\n", ldap_base);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	636 printf("cn: root\n");
108 1b2a4fac1303 fix title bug with old schema in pst2ldif, also escape commas in distinguished names per rfc4514. Carl Byington <carl@five-ten-sg.com> parents: 106 diff changeset	637 printf("sn: root\n");
106 07d090676ce9 cleanup fedora9 compile warnings Carl Byington <carl@five-ten-sg.com> parents: 105 diff changeset	638 for (vector<string>::size_type i=0; i<ldap_class.size(); i++)
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	639 print_ldif_single("objectClass", ldap_class[i].c_str());
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	640 printf("\n");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	641 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	642 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	643
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: 59 diff changeset	644 process(d_ptr->child); // do the children of TOPF
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: 59 diff changeset	645 pst_close(&pstfile);
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: 59 diff changeset	646 DEBUG_RET();
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: 59 diff changeset	647 free_strings(all_strings);
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	648 if (cd) iconv_close(cd);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	649
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: 59 diff changeset	650 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	651 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	652
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	653
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 114 diff changeset	654 void usage(void) {
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: 59 diff changeset	655 version();
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: 59 diff changeset	656 printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name);
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: 59 diff changeset	657 printf("OPTIONS:\n");
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: 59 diff changeset	658 printf("\t-V\t- Version. Display program version\n");
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	659 printf("\t-C charset\t- assumed character set of non-ASCII characters\n");
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	660 printf("\t-b ldapbase\t- set the LDAP base value\n");
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	661 printf("\t-c class\t- set the class of the LDAP objects (may contain more than one)\n");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	662 printf("\t-d <filename>\t- Debug to file. This is a binary log. Use readpstlog to print it\n");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	663 printf("\t-h\t- Help. This screen\n");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	664 printf("\t-l line\t- extra line to insert in the LDIF file for each contact\n");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	665 printf("\t-o\t- use old schema, default is new schema\n");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	666 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	667
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	668
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 114 diff changeset	669 void version(void) {
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: 59 diff changeset	670 printf("pst2ldif v%s\n", VERSION);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	671 #if BYTE_ORDER == BIG_ENDIAN
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: 59 diff changeset	672 printf("Big Endian implementation being used.\n");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	673 #elif BYTE_ORDER == LITTLE_ENDIAN
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: 59 diff changeset	674 printf("Little Endian implementation being used.\n");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	675 #else
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	676 # error "Byte order not supported by this library"
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	677 #endif
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	678 #ifdef __GNUC__
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: 59 diff changeset	679 printf("GCC %d.%d : %s %s\n", __GNUC__, __GNUC_MINOR__, __DATE__, __TIME__);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	680 #endif
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	681 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	682
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	683
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	684 char check_filename(char fname) {
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: 59 diff changeset	685 char *t = fname;
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: 59 diff changeset	686 if (t == 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: 59 diff changeset	687 return fname;
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: 59 diff changeset	688 }
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: 59 diff changeset	689 while ((t = strpbrk(t, "/\\:"))) {
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: 59 diff changeset	690 // while there are characters in the second string that we don't want
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: 59 diff changeset	691 *t = '_'; //replace them with an underscore
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: 59 diff changeset	692 }
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: 59 diff changeset	693 return fname;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	694 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	695
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	696
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	697 // This function escapes Distinguished Names (as per RFC4514)
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	698 void print_ldif_dn(const char attr, const char value, const char *base)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	699 {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	700 printf("dn: cn=");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	701 // remove leading spaces (RFC says escape them)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	702 while (*value == ' ')
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	703 value++;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	704
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	705 print_escaped_dn(value);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	706 if (base && base[0]) {
108 1b2a4fac1303 fix title bug with old schema in pst2ldif, also escape commas in distinguished names per rfc4514. Carl Byington <carl@five-ten-sg.com> parents: 106 diff changeset	707 printf(", %s", base);
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	708 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	709 printf("\n");
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	710 return;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	711 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	712
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	713
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	714 void print_escaped_dn(const char *value)
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	715 {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	716 char ch;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	717 bool needs_code_conversion = false;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	718 char *utf8_buffer = NULL;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	719
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	720 // First do a quick scan to see if any code conversion is required
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	721 if (cd) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	722 const char *p = value;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	723 while (*p) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	724 if (*p++ & 0x80) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	725 needs_code_conversion = true;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	726 break;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	727 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	728 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	729 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	730
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	731 if (needs_code_conversion) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	732 size_t inlen = strlen(value);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	733 size_t utf8_len = 2 * inlen + 1;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	734 char p = (char )value;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	735 char *utf8_p = utf8_buffer;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	736
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	737 utf8_buffer = (char *)malloc(utf8_len);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	738 utf8_p = utf8_buffer;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	739 iconv(cd, NULL, NULL, NULL, NULL);
114 e213bfcf9aa7 patch from Chris Eagle to build on cygwin Carl Byington <carl@five-ten-sg.com> parents: 108 diff changeset	740 if (iconv(cd, (ICONV_CONST char**)&p, &inlen, &utf8_p, &utf8_len) >= 0) {
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	741 *utf8_p = 0;
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	742 value = utf8_buffer;
99 b7f456946c5b add configure option --enable-dii=no to remove dependency on libgd. Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	743 }
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: 59 diff changeset	744 }
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	745
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	746 // escape initial '#' and space
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	747 if (value == '#' \|\| value == ' ')
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	748 putchar('\\');
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	749
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	750 while ((ch = *value++) != 0) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	751 if (((ch & 0x80) != 0) \|\| (ch <= 0x1F))
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	752 // Print as escaped hex digits
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	753 printf("\\%2.2X", ch & 0xFF);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	754 else switch (ch) {
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	755 case '\\':
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	756 case '"' :
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	757 case '+' :
108 1b2a4fac1303 fix title bug with old schema in pst2ldif, also escape commas in distinguished names per rfc4514. Carl Byington <carl@five-ten-sg.com> parents: 106 diff changeset	758 case ',' :
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	759 case ';' :
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	760 case '<' :
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	761 case '>' :
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	762 putchar('\\');
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	763 // Fall through
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	764 default:
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	765 putchar(ch);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	766 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	767 }
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	768 if (utf8_buffer) free((void *)utf8_buffer);
39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 99 diff changeset	769 return;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	770 }

Mercurial > libpst

annotate src/pst2ldif.cpp @ 143:fdc58ad2c758 stable-0-6-28