libpst: src/pst2ldif.cpp annotate

annotate src/pst2ldif.cpp @ 97:57bc6251f8dd stable-0-6-19

fix an installed unpackaged file code cleanup from compiler warnings

author	Carl Byington <carl@five-ten-sg.com>
date	Sun, 14 Sep 2008 15:55:11 -0700
parents	56fa05fd5271
children	b7f456946c5b

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>
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	15
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	16 extern "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	17 #include "define.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	18 #include "libstrfunc.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	19 #include "libpst.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	20 #include "common.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	21 #include "timeconv.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	22 #include "lzfu.h"
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	23 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	24
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	25 int32_t usage();
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	26 int32_t version();
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	27 char my_stristr(char haystack, char *needle);
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	28 char check_filename(char 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	29 const char single(char str);
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	30 const char folded(char str);
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	31 void multi(const char fmt, char str);
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	32 char rfc2426_escape(char str);
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	33 int32_t chr_count(char *str, char x);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	34
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	35 char *prog_name;
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	36 pst_file pstfile;
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	37 char *ldap_base = NULL; // 'o=some.domain.tld, c=US'
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	38 char *ldap_class = NULL; // 'newPerson'
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	39 char *ldap_org = NULL; // 'o=some.domain.tld', computed from ldap_base
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	40
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	41
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	42 ////////////////////////////////////////////////
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	43 // define our ordering
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	44 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	45 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	46 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	47 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	48 };
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	49 // 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	50 typedef set<const char *, ltstr> string_set;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	51 // make a static set to hold the cn values
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	52 static string_set all_strings;
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	53
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	54
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	55 ////////////////////////////////////////////////
41 183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	56 // helper to free all the strings in a set
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	57 //
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	58 static void free_strings(string_set &s);
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	59 static void free_strings(string_set &s)
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	60 {
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	61 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	62 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	63 }
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 s.clear();
41 183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	65 }
183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 38 diff changeset	66
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 ////////////////////////////////////////////////
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	69 // helper to register a string in a string set
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	70 //
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	71 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	72 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	73 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	74 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	75 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	76 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	77 return x;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	78 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	79
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	80 ////////////////////////////////////////////////
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	81 // register a global string
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	82 //
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	83 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	84 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	85 return register_string(all_strings, name);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	86 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	87
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	88
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	89 ////////////////////////////////////////////////
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	90 // make a unique string
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	91 //
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	92 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	93 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	94 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	95 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	96 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	97 while (true) {
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 char n[strlen(name)+10];
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 snprintf(n, sizeof(n), "%s %d", name, unique++);
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 string_set::iterator i = all_strings.find(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	101 if (i == all_strings.end()) return register_string(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	102 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	103 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	104
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	105
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	106 ////////////////////////////////////////////////
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	107 // remove leading and trailing blanks
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	108 //
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	109 static char trim(char name);
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	110 static char trim(char name) {
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 char *p;
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 (*name == ' ') 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	113 p = name + strlen(name) - 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	114 while ((p >= name) && (p == ' ')) p-- = '\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	115 return name;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	116 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	117
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	118
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	119 static void process(pst_desc_ll *d_ptr);
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	120 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	121 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	122 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	123 if (d_ptr->desc) {
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	124 item = pst_parse_item(&pstfile, 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	125 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	126 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	127 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	128 //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	129 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	130 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	131
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	132 } 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	133 // 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	134 char cn[1000];
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	135 snprintf(cn, sizeof(cn), "%s %s %s %s",
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	136 single(item->contact->display_name_prefix),
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	137 single(item->contact->first_name),
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	138 single(item->contact->surname),
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	139 single(item->contact->suffix));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	140 if (strcmp(cn, " ")) {
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	141 // have a valid cn
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	142 const char *ucn = unique_string(folded(trim(cn)));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	143 printf("dn: cn=%s, %s\n", ucn, ldap_base);
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	144 printf("cn: %s\n", ucn);
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	145 if (item->contact->first_name) {
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	146 snprintf(cn, sizeof(cn), "%s %s",
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	147 single(item->contact->display_name_prefix),
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	148 single(item->contact->first_name));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	149 printf("givenName: %s\n", trim(cn));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	150 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	151 if (item->contact->surname) {
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	152 snprintf(cn, sizeof(cn), "%s %s",
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	153 single(item->contact->surname),
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	154 single(item->contact->suffix));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	155 printf("sn: %s\n", trim(cn));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	156 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	157 else if (item->contact->company_name) {
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	158 printf("sn: %s\n", single(item->contact->company_name));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	159 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	160 else
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	161 printf("sn: %s\n", ucn); // use cn as sn if we cannot find something better
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	162
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	163 if (item->contact->job_title)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	164 printf("personalTitle: %s\n", single(item->contact->job_title));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	165 if (item->contact->company_name)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	166 printf("company: %s\n", single(item->contact->company_name));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	167 if (item->contact->address1 && *item->contact->address1)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	168 printf("mail: %s\n", single(item->contact->address1));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	169 if (item->contact->address2 && *item->contact->address2)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	170 printf("mail: %s\n", single(item->contact->address2));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	171 if (item->contact->address3 && *item->contact->address3)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	172 printf("mail: %s\n", single(item->contact->address3));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	173 if (item->contact->address1a && *item->contact->address1a)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	174 printf("mail: %s\n", single(item->contact->address1a));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	175 if (item->contact->address2a && *item->contact->address2a)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	176 printf("mail: %s\n", single(item->contact->address2a));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	177 if (item->contact->address3a && *item->contact->address3a)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	178 printf("mail: %s\n", single(item->contact->address3a));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	179 if (item->contact->business_address) {
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	180 if (item->contact->business_po_box)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	181 printf("postalAddress: %s\n", single(item->contact->business_po_box));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	182 if (item->contact->business_street)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	183 multi("postalAddress: %s\n", item->contact->business_street);
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	184 if (item->contact->business_city)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	185 printf("l: %s\n", single(item->contact->business_city));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	186 if (item->contact->business_state)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	187 printf("st: %s\n", single(item->contact->business_state));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	188 if (item->contact->business_postal_code)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	189 printf("postalCode: %s\n", single(item->contact->business_postal_code));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	190 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	191 else if (item->contact->home_address) {
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	192 if (item->contact->home_po_box)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	193 printf("postalAddress: %s\n", single(item->contact->home_po_box));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	194 if (item->contact->home_street)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	195 multi("postalAddress: %s\n", item->contact->home_street);
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	196 if (item->contact->home_city)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	197 printf("l: %s\n", single(item->contact->home_city));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	198 if (item->contact->home_state)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	199 printf("st: %s\n", single(item->contact->home_state));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	200 if (item->contact->home_postal_code)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	201 printf("postalCode: %s\n", single(item->contact->home_postal_code));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	202 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	203 else if (item->contact->other_address) {
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	204 if (item->contact->other_po_box)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	205 printf("postalAddress: %s\n", single(item->contact->other_po_box));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	206 if (item->contact->other_street)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	207 multi("postalAddress: %s\n", item->contact->other_street);
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	208 if (item->contact->other_city)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	209 printf("l: %s\n", single(item->contact->other_city));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	210 if (item->contact->other_state)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	211 printf("st: %s\n", single(item->contact->other_state));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	212 if (item->contact->other_postal_code)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	213 printf("postalCode: %s\n", single(item->contact->other_postal_code));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	214 }
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	215 if (item->contact->business_fax)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	216 printf("facsimileTelephoneNumber: %s\n", single(item->contact->business_fax));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	217 else if (item->contact->home_fax)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	218 printf("facsimileTelephoneNumber: %s\n", single(item->contact->home_fax));
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	219
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	220 if (item->contact->business_phone)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	221 printf("telephoneNumber: %s\n", single(item->contact->business_phone));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	222 if (item->contact->home_phone)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	223 printf("homePhone: %s\n", single(item->contact->home_phone));
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	224
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	225 if (item->contact->car_phone)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	226 printf("mobile: %s\n", single(item->contact->car_phone));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	227 else if (item->contact->mobile_phone)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	228 printf("mobile: %s\n", single(item->contact->mobile_phone));
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	229 else if (item->contact->other_phone)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	230 printf("mobile: %s\n", single(item->contact->other_phone));
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	231
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	232
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	233 if (item->comment)
56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	234 printf("description: %s\n", single(item->comment));
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	235
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 73 diff changeset	236 printf("objectClass: %s\n\n", ldap_class);
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	237 }
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	238 }
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	239 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	240 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	241 }
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	242 }
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	243 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	244 }
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	245 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	246 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	247 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	248
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	249
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	250 int main(int argc, char** 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	251 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	252 char *fname = 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	253 char *temp = NULL; //temporary char pointer
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	254 char 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	255 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	256 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	257 pst_item *item = NULL;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	258
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	259 while ((c = getopt(argc, argv, "b:c:d:Vh"))!= -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	260 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	261 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	262 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	263 temp = strchr(ldap_base, ',');
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	264 if (temp) {
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	265 *temp = '\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	266 ldap_org = strdup(ldap_base+2); // assume first 2 chars are o=
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	267 *temp = ',';
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	268 }
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	269 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	270 case '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	271 ldap_class = 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	272 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	273 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	274 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	275 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	276 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	277 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	278 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	279 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	280 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	281 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	282 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	283 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	284 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	285 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	286 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	287 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	288 }
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	289 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	290
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	291 if ((argc > optind) && (ldap_base) && (ldap_class) && (ldap_org)) {
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	292 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	293 } 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	294 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	295 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	296 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	297
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 #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	299 // 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	300 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	301 #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	302 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	303 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	304 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	305 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	306 RET_DERROR(pst_load_index(&pstfile), 2, ("Index Error\n"));
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	307
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	308 pst_load_extended_attributes(&pstfile);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	309
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	310 d_ptr = pstfile.d_head; // first record is main record
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	311 item = (pst_item*)pst_parse_item(&pstfile, 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	312 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	313 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	314 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	315 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	316
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	317 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	318 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	319 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	320 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	321 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	322
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	323 pst_freeItem(item);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	324
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	325 // write the ldap header
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	326 printf("dn: %s\n", ldap_base);
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	327 printf("o: %s\n", ldap_org);
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	328 printf("objectClass: organization\n\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	329 printf("dn: cn=root, %s\n", ldap_base);
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	330 printf("cn: root\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	331 printf("objectClass: %s\n\n", ldap_class);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	332
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	333 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	334 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	335 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	336 free_strings(all_strings);
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	337 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	338 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	339
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	340
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	341 int usage() {
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	342 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	343 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	344 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	345 printf("\t-h\t- Help. This screen\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	346 printf("\t-V\t- Version. Display program version\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	347 printf("\t-b ldapbase\t- set the ldap base value\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	348 printf("\t-c class \t- set the class of the ldap objects\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	349 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	350 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	351
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	352
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	353 int version() {
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	354 printf("pst2ldif v%s\n", VERSION);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	355 #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	356 printf("Big Endian implementation being used.\n");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	357 #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	358 printf("Little Endian implementation being used.\n");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	359 #else
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	360 # error "Byte order not supported by this library"
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	361 #endif
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	362 #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	363 printf("GCC %d.%d : %s %s\n", __GNUC__, __GNUC_MINOR__, __DATE__, __TIME__);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	364 #endif
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	365 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	366 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	367
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	368
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	369 // my_stristr varies from strstr in that its searches are case-insensitive
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	370 char * my_stristr(char haystack, char needle) {
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	371 char x=haystack, y=needle, *z = 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	372 if (haystack == NULL \|\| needle == 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	373 return 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	374 while (y != '\0' && x != '\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	375 if (tolower(y) == tolower(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	376 // move y on one
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	377 y++;
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	378 if (z == 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	379 z = x; // store first position in haystack where a match is made
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	380 }
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	381 } 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	382 y = needle; // reset y to the beginning of the needle
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	383 z = NULL; // reset the haystack storage point
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	384 }
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	385 x++; // advance the search in the haystack
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	386 }
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	387 return z;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	388 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	389
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	390
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	391 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	392 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	393 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	394 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	395 }
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	396 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	397 // 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	398 *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	399 }
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	400 return fname;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	401 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	402
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	403
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	404 const char single(char str) {
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	405 if (!str) return "";
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	406 char *ret = rfc2426_escape(str);
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	407 char *n = strchr(ret, '\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	408 if (n) *n = '\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	409 return ret;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	410 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	411
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	412
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	413 const char folded(char str) {
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	414 if (!str) return "";
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	415 char *ret = rfc2426_escape(str);
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	416 char *n = 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	417 while ((n = strchr(n, '\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	418 *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	419 }
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	420 n = 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	421 while ((n = strchr(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	422 *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	423 }
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	424 return ret;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	425 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	426
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	427
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	428 void multi(const char fmt, char str) {
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	429 if (!str) return;
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	430 char *ret = rfc2426_escape(str);
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	431 char *n = 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	432 while ((n = strchr(ret, '\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	433 *n = '\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	434 printf(fmt, 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	435 ret = n+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	436 }
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	437 if (*ret) printf(fmt, ret);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	438 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	439
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	440
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	441 char rfc2426_escape(char str) {
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	442 static char* buf = NULL;
3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 59 diff changeset	443 char ret, a, *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	444 int x = 0, y, z;
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	445 if (str == 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	446 ret = str;
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	447 else {
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	448
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	449 // calculate space required to escape all the following characters
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	450 y = chr_count(str, '\\')
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	451 + chr_count(str, ';');
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	452 z = chr_count(str, '\r');
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	453 if (y == 0 && z == 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	454 // there isn't any extra space required
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	455 ret = str;
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	456 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	457 x = strlen(str) + y - z + 1; // don't forget room for the NUL
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	458 buf = (char*) realloc(buf, 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	459 a = str;
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	460 b = buf;
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	461 while (*a != '\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	462 switch(*a) {
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	463 case '\\':
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	464 case ';' :
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	465 *(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	466 b=a;
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	467 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	468 case '\r': // skip cr
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	469 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	470 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	471 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	472 b=a;
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	473 }
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	474 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	475 a++;
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	476 }
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	477 *b = '\0'; // NUL-terminate the string (buf)
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	478 ret = buf;
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	479 }
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	480 }
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	481 return ret;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	482 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	483
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	484
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	485 int chr_count(char *str, char x) {
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	486 int r = 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	487 while (*str != '\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	488 if (*str == 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	489 r++;
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	490 str++;
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	491 }
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	492 return r;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	493 }
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	494

Mercurial > libpst

annotate src/pst2ldif.cpp @ 97:57bc6251f8dd stable-0-6-19