author | eilers <eilers> | 2003-03-27 16:17:48 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-03-27 16:17:48 (UTC) |
commit | 390a5a0c332c8c6fb380c1ed4cd6adae3e544a08 (patch) (unidiff) | |
tree | 7ad6266be3d78d25ae061a0be067f82f8d666246 /library/backend/vobject.cpp | |
parent | ff43585778968407bb08473e45ddd1d942f8d8c8 (diff) | |
download | opie-390a5a0c332c8c6fb380c1ed4cd6adae3e544a08.zip opie-390a5a0c332c8c6fb380c1ed4cd6adae3e544a08.tar.gz opie-390a5a0c332c8c6fb380c1ed4cd6adae3e544a08.tar.bz2 |
using releases from qtopia-free-1.6.0-snapshot-20030324 which fixes the
following bugs #776 and #490:
Now, we could successfully parse vcards from palm 4 + 5 and
quoted-printable encoded lines .. !
-rw-r--r-- | library/backend/vobject.cpp | 163 |
1 files changed, 91 insertions, 72 deletions
diff --git a/library/backend/vobject.cpp b/library/backend/vobject.cpp index 2c5b577..b6d17dc 100644 --- a/library/backend/vobject.cpp +++ b/library/backend/vobject.cpp | |||
@@ -37,65 +37,70 @@ DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable. | |||
37 | ***************************************************************************/ | 37 | ***************************************************************************/ |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * src: vobject.c | 40 | * src: vobject.c |
41 | * doc: vobject and APIs to construct vobject, APIs pretty print | 41 | * doc: vobject and APIs to construct vobject, APIs pretty print |
42 | * vobject, and convert a vobject into its textual representation. | 42 | * vobject, and convert a vobject into its textual representation. |
43 | */ | 43 | */ |
44 | 44 | ||
45 | #ifndef MWERKS | 45 | #ifndef MWERKS |
46 | #include <malloc.h> | 46 | #include <malloc.h> |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #include <qtopia/private/vobject_p.h> | 49 | #include <qtopia/config.h> |
50 | #include <qtopia/private/qfiledirect_p.h> | 50 | #include "vobject_p.h" |
51 | #include "qfiledirect_p.h" | ||
51 | #include <string.h> | 52 | #include <string.h> |
52 | #include <stdio.h> | 53 | #include <stdio.h> |
53 | #include <fcntl.h> | 54 | #include <fcntl.h> |
54 | //#include <io.h> | 55 | //#include <io.h> |
55 | 56 | ||
56 | 57 | ||
57 | #define NAME_OF(o) o->id | 58 | #define NAME_OF(o) o->id |
58 | #define VALUE_TYPE(o) o->valType | 59 | #define VALUE_TYPE(o) o->valType |
59 | #define STRINGZ_VALUE_OF(o) o->val.strs | 60 | #define STRINGZ_VALUE_OF(o) o->val.strs |
60 | #define INTEGER_VALUE_OF(o) o->val.i | 61 | #define INTEGER_VALUE_OF(o) o->val.i |
61 | #define LONG_VALUE_OF(o) o->val.l | 62 | #define LONG_VALUE_OF(o) o->val.l |
62 | #define ANY_VALUE_OF(o) o->val.any | 63 | #define ANY_VALUE_OF(o) o->val.any |
63 | #define VOBJECT_VALUE_OF(o) o->val.vobj | 64 | #define VOBJECT_VALUE_OF(o) o->val.vobj |
64 | 65 | ||
66 | static char vobj_cs[10]; | ||
67 | static enum { EightBit, QuotedPrintable, Base64 } vobj_enc=EightBit; | ||
68 | static const char *vobj_enc_s=0; | ||
69 | |||
65 | typedef union ValueItem { | 70 | typedef union ValueItem { |
66 | const char *strs; | 71 | const char *strs; |
67 | unsigned int i; | 72 | unsigned int i; |
68 | unsigned long l; | 73 | unsigned long l; |
69 | void *any; | 74 | void *any; |
70 | VObject *vobj; | 75 | VObject *vobj; |
71 | } ValueItem; | 76 | } ValueItem; |
72 | 77 | ||
73 | struct VObject { | 78 | struct VObject { |
74 | VObject *next; | 79 | VObject *next; |
75 | const char *id; | 80 | const char *id; |
76 | VObject *prop; | 81 | VObject *prop; |
77 | unsigned short valType; | 82 | unsigned short valType; |
78 | ValueItem val; | 83 | ValueItem val; |
79 | }; | 84 | }; |
80 | 85 | ||
81 | typedef struct StrItem StrItem; | 86 | typedef struct StrItem StrItem; |
82 | 87 | ||
83 | struct StrItem { | 88 | struct StrItem { |
84 | StrItem *next; | 89 | StrItem *next; |
85 | const char *s; | 90 | const char *s; |
86 | unsigned int refCnt; | 91 | unsigned int refCnt; |
87 | }; | 92 | }; |
88 | 93 | ||
89 | const char** fieldedProp; | 94 | DLLEXPORT(const char**) fieldedProp; |
90 | 95 | ||
91 | 96 | ||
92 | 97 | ||
93 | /*---------------------------------------------------------------------- | 98 | /*---------------------------------------------------------------------- |
94 | The following functions involve with memory allocation: | 99 | The following functions involve with memory allocation: |
95 | newVObject | 100 | newVObject |
96 | deleteVObject | 101 | deleteVObject |
97 | dupStr | 102 | dupStr |
98 | deleteStr | 103 | deleteStr |
99 | newStrItem | 104 | newStrItem |
100 | deleteStrItem | 105 | deleteStrItem |
101 | ----------------------------------------------------------------------*/ | 106 | ----------------------------------------------------------------------*/ |
@@ -944,24 +949,35 @@ static void appendcOFile(OFile *fp, char c) | |||
944 | 949 | ||
945 | static void appendsOFile(OFile *fp, const char *s) | 950 | static void appendsOFile(OFile *fp, const char *s) |
946 | { | 951 | { |
947 | int i, slen; | 952 | int i, slen; |
948 | slen = strlen(s); | 953 | slen = strlen(s); |
949 | for (i=0; i<slen; i++) { | 954 | for (i=0; i<slen; i++) { |
950 | appendcOFile(fp,s[i]); | 955 | appendcOFile(fp,s[i]); |
951 | } | 956 | } |
952 | } | 957 | } |
953 | 958 | ||
954 | #endif | 959 | #endif |
955 | 960 | ||
961 | static void appendsOFileEncCs(OFile *fp) | ||
962 | { | ||
963 | if ( vobj_enc_s ) { | ||
964 | appendsOFile(fp, ";" VCEncodingProp "="); | ||
965 | appendsOFile(fp, vobj_enc_s); | ||
966 | } | ||
967 | appendsOFile(fp, ";" VCCharSetProp "="); | ||
968 | appendsOFile(fp, vobj_cs); | ||
969 | } | ||
970 | |||
971 | |||
956 | static void initOFile(OFile *fp, FILE *ofp) | 972 | static void initOFile(OFile *fp, FILE *ofp) |
957 | { | 973 | { |
958 | fp->fp = ofp; | 974 | fp->fp = ofp; |
959 | fp->s = 0; | 975 | fp->s = 0; |
960 | fp->len = 0; | 976 | fp->len = 0; |
961 | fp->limit = 0; | 977 | fp->limit = 0; |
962 | fp->alloc = 0; | 978 | fp->alloc = 0; |
963 | fp->fail = 0; | 979 | fp->fail = 0; |
964 | } | 980 | } |
965 | 981 | ||
966 | static int writeBase64(OFile *fp, unsigned char *s, long len) | 982 | static int writeBase64(OFile *fp, unsigned char *s, long len) |
967 | { | 983 | { |
@@ -996,147 +1012,134 @@ static int writeBase64(OFile *fp, unsigned char *s, long len) | |||
996 | } | 1012 | } |
997 | // now output 'quad' with appropriate whitespace and line ending | 1013 | // now output 'quad' with appropriate whitespace and line ending |
998 | appendsOFile(fp, (numQuads == 0 ? " " : "")); | 1014 | appendsOFile(fp, (numQuads == 0 ? " " : "")); |
999 | appendsOFile(fp, quad); | 1015 | appendsOFile(fp, quad); |
1000 | appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : ""))); | 1016 | appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : ""))); |
1001 | numQuads = (numQuads + 1) % MAXQUADS; | 1017 | numQuads = (numQuads + 1) % MAXQUADS; |
1002 | } | 1018 | } |
1003 | appendcOFile(fp,'\n'); | 1019 | appendcOFile(fp,'\n'); |
1004 | 1020 | ||
1005 | return 1; | 1021 | return 1; |
1006 | } | 1022 | } |
1007 | 1023 | ||
1008 | static const char *replaceChar(unsigned char c) | 1024 | static const char *qpReplaceChar(unsigned char c) |
1009 | { | 1025 | { |
1010 | if (c == '\n') { | 1026 | if (c == '\n') { |
1011 | return "=0A=\n"; | 1027 | return "=0A=\n"; |
1012 | } else if ( | 1028 | } else if ( |
1013 | (c >= 'A' && c <= 'Z') | 1029 | // RFC 1521 |
1014 | || | 1030 | (c >= 32 && c <= 60) // Note: " " not allowed at EOL |
1015 | (c >= 'a' && c <= 'z') | ||
1016 | || | 1031 | || |
1017 | (c >= '0' && c <= '9') | 1032 | (c >= 62 && c <= 126) |
1018 | || | 1033 | ) |
1019 | (c >= '\'' && c <= ')') | ||
1020 | || | ||
1021 | (c >= '+' && c <= '-') | ||
1022 | || | ||
1023 | (c == '/') | ||
1024 | || | ||
1025 | (c == '?') | ||
1026 | || | ||
1027 | (c == ' ')) | ||
1028 | { | 1034 | { |
1029 | return 0; | 1035 | return 0; |
1030 | } | 1036 | } |
1031 | 1037 | ||
1032 | #warning "Bug-Workaround must be fixed !" | ||
1033 | // IF THIS FUNCTION RETURNES TRUE, THE DATA IS EXPORTED | ||
1034 | // AS QUOTED PRINTABLE. | ||
1035 | // BUT THE PARSER IS UNABLE TO IMPORT THIS, THEREFORE | ||
1036 | // I DECIDED TO DISABLE IT UNTIL TROLLTECH FIXES THIS BUG | ||
1037 | // SEE ALSO includesUnprintable(VObject *o) | ||
1038 | // (se) | ||
1039 | |||
1040 | return 0; | ||
1041 | |||
1042 | #if 0 | ||
1043 | static char trans[4]; | 1038 | static char trans[4]; |
1044 | trans[0] = '='; | 1039 | trans[0] = '='; |
1045 | trans[3] = '\0'; | 1040 | trans[3] = '\0'; |
1046 | int rem = c % 16; | 1041 | int rem = c % 16; |
1047 | int div = c / 16; | 1042 | int div = c / 16; |
1048 | 1043 | ||
1049 | if (div < 10) | 1044 | if (div < 10) |
1050 | trans[1] = '0' + div; | 1045 | trans[1] = '0' + div; |
1051 | else | 1046 | else |
1052 | trans[1] = 'A' + (div - 10); | 1047 | trans[1] = 'A' + (div - 10); |
1053 | 1048 | ||
1054 | if (rem < 10) | 1049 | if (rem < 10) |
1055 | trans[2] = '0' + rem; | 1050 | trans[2] = '0' + rem; |
1056 | else | 1051 | else |
1057 | trans[2] = 'A' + (rem - 10); | 1052 | trans[2] = 'A' + (rem - 10); |
1058 | 1053 | ||
1059 | return trans; | 1054 | return trans; |
1060 | #endif | ||
1061 | } | 1055 | } |
1062 | 1056 | ||
1063 | static void writeQPString(OFile *fp, const char *s) | 1057 | static void writeEncString(OFile *fp, const char *s, bool nosemi) |
1064 | { | 1058 | { |
1065 | /* | 1059 | /* |
1066 | only A-Z, 0-9 and | 1060 | only A-Z, 0-9 and |
1067 | "'" (ASCII code 39) | 1061 | "'" (ASCII code 39) |
1068 | "(" (ASCII code 40) | 1062 | "(" (ASCII code 40) |
1069 | ")" (ASCII code 41) | 1063 | ")" (ASCII code 41) |
1070 | "+" (ASCII code 43) | 1064 | "+" (ASCII code 43) |
1071 | "," (ASCII code 44) | 1065 | "," (ASCII code 44) |
1072 | "-" (ASCII code 45) | 1066 | "-" (ASCII code 45) |
1073 | "/" (ASCII code 47) | 1067 | "/" (ASCII code 47) |
1074 | "?" (ASCII code 63) | 1068 | "?" (ASCII code 63) |
1075 | 1069 | ||
1076 | should remain un-encoded. | 1070 | should remain un-encoded. |
1077 | '=' needs to be encoded as it is the escape character. | 1071 | '=' needs to be encoded as it is the escape character. |
1078 | ';' needs to be as it is a field separator. | 1072 | ';' needs to be as it is a field separator. |
1079 | 1073 | ||
1080 | */ | 1074 | */ |
1081 | const char *p = s; | 1075 | const char *p = s; |
1076 | switch ( vobj_enc ) { | ||
1077 | case EightBit: | ||
1078 | while (*p) { | ||
1079 | if ( *p == '\n' || nosemi && ( *p == '\\' || *p == ';' ) ) | ||
1080 | appendcOFile(fp, '\\'); | ||
1081 | appendcOFile(fp, *p); | ||
1082 | p++; | ||
1083 | } | ||
1084 | break; | ||
1085 | case QuotedPrintable: | ||
1082 | while (*p) { | 1086 | while (*p) { |
1083 | const char *rep = replaceChar(*p); | 1087 | const char *rep = qpReplaceChar(*p); |
1084 | if (rep) | 1088 | if (rep) |
1085 | appendsOFile(fp, rep); | 1089 | appendsOFile(fp, rep); |
1090 | else if ( *p == ';' && nosemi ) | ||
1091 | appendsOFile(fp, "=3B"); | ||
1092 | else if ( *p == ' ' ) { | ||
1093 | if ( !p[1] || p[1] == '\n' ) // RFC 1521 | ||
1094 | appendsOFile(fp, "=20"); | ||
1086 | else | 1095 | else |
1087 | appendcOFile(fp, *p); | 1096 | appendcOFile(fp, *p); |
1097 | } else | ||
1098 | appendcOFile(fp, *p); | ||
1088 | p++; | 1099 | p++; |
1089 | } | 1100 | } |
1101 | break; | ||
1102 | case Base64: | ||
1103 | writeBase64(fp, (unsigned char*)p, strlen(p)); | ||
1104 | break; | ||
1105 | } | ||
1090 | } | 1106 | } |
1091 | 1107 | ||
1092 | static bool includesUnprintable(VObject *o) | 1108 | static bool includesUnprintable(VObject *o) |
1093 | { | 1109 | { |
1094 | |||
1095 | #if 0 | ||
1096 | |||
1097 | // IF THIS FUNCTION RETURNES TRUE, THE DATA IS EXPORTED | ||
1098 | // AS QUOTED PRINTABLE. | ||
1099 | // BUT THE PARSER IS UNABLE TO IMPORT THIS, THEREFORE | ||
1100 | // I DECIDED TO DISABLE IT UNTIL TROLLTECH FIXES THIS BUG | ||
1101 | // SEE ALSO *replaceChar(unsigned char c) | ||
1102 | // (se) | ||
1103 | |||
1104 | if (o) { | 1110 | if (o) { |
1105 | if (VALUE_TYPE(o) == VCVT_STRINGZ) { | 1111 | if (VALUE_TYPE(o) == VCVT_STRINGZ) { |
1106 | const char *p = STRINGZ_VALUE_OF(o); | 1112 | const char *p = STRINGZ_VALUE_OF(o); |
1107 | if (p) { | 1113 | if (p) { |
1108 | while (*p) { | 1114 | while (*p) { |
1109 | if (replaceChar(*p)) | 1115 | if (*p==' ' && (!p[1] || p[1]=='\n') // RFC 1521: spaces at ends need quoting |
1116 | || qpReplaceChar(*p) ) | ||
1110 | return TRUE; | 1117 | return TRUE; |
1111 | p++; | 1118 | p++; |
1112 | } | 1119 | } |
1113 | } | 1120 | } |
1114 | } | 1121 | } |
1115 | } | 1122 | } |
1116 | |||
1117 | #endif | ||
1118 | #warning "Bug-Workaround must be fixed !" | ||
1119 | |||
1120 | return FALSE; | 1123 | return FALSE; |
1121 | } | 1124 | } |
1122 | 1125 | ||
1123 | static void writeVObject_(OFile *fp, VObject *o); | 1126 | static void writeVObject_(OFile *fp, VObject *o); |
1124 | 1127 | ||
1125 | static void writeValue(OFile *fp, VObject *o, unsigned long size) | 1128 | static void writeValue(OFile *fp, VObject *o, unsigned long size, bool nosemi) |
1126 | { | 1129 | { |
1127 | if (o == 0) return; | 1130 | if (o == 0) return; |
1128 | switch (VALUE_TYPE(o)) { | 1131 | switch (VALUE_TYPE(o)) { |
1129 | case VCVT_STRINGZ: { | 1132 | case VCVT_STRINGZ: { |
1130 | writeQPString(fp, STRINGZ_VALUE_OF(o)); | 1133 | writeEncString(fp, STRINGZ_VALUE_OF(o), nosemi); |
1131 | break; | 1134 | break; |
1132 | } | 1135 | } |
1133 | case VCVT_UINT: { | 1136 | case VCVT_UINT: { |
1134 | char buf[16]; | 1137 | char buf[16]; |
1135 | sprintf(buf,"%u", INTEGER_VALUE_OF(o)); | 1138 | sprintf(buf,"%u", INTEGER_VALUE_OF(o)); |
1136 | appendsOFile(fp,buf); | 1139 | appendsOFile(fp,buf); |
1137 | break; | 1140 | break; |
1138 | } | 1141 | } |
1139 | case VCVT_ULONG: { | 1142 | case VCVT_ULONG: { |
1140 | char buf[16]; | 1143 | char buf[16]; |
1141 | sprintf(buf,"%lu", LONG_VALUE_OF(o)); | 1144 | sprintf(buf,"%lu", LONG_VALUE_OF(o)); |
1142 | appendsOFile(fp,buf); | 1145 | appendsOFile(fp,buf); |
@@ -1151,36 +1154,34 @@ static void writeValue(OFile *fp, VObject *o, unsigned long size) | |||
1151 | appendcOFile(fp,'\n'); | 1154 | appendcOFile(fp,'\n'); |
1152 | writeVObject_(fp,VOBJECT_VALUE_OF(o)); | 1155 | writeVObject_(fp,VOBJECT_VALUE_OF(o)); |
1153 | break; | 1156 | break; |
1154 | } | 1157 | } |
1155 | } | 1158 | } |
1156 | 1159 | ||
1157 | static void writeAttrValue(OFile *fp, VObject *o) | 1160 | static void writeAttrValue(OFile *fp, VObject *o) |
1158 | { | 1161 | { |
1159 | if (NAME_OF(o)) { | 1162 | if (NAME_OF(o)) { |
1160 | struct PreDefProp *pi; | 1163 | struct PreDefProp *pi; |
1161 | pi = lookupPropInfo(NAME_OF(o)); | 1164 | pi = lookupPropInfo(NAME_OF(o)); |
1162 | if (pi && ((pi->flags & PD_INTERNAL) != 0)) return; | 1165 | if (pi && ((pi->flags & PD_INTERNAL) != 0)) return; |
1163 | if ( includesUnprintable(o) ) { | 1166 | if ( includesUnprintable(o) ) |
1164 | appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp); | 1167 | appendsOFileEncCs(fp); |
1165 | appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8"); | ||
1166 | } | ||
1167 | appendcOFile(fp,';'); | 1168 | appendcOFile(fp,';'); |
1168 | appendsOFile(fp,NAME_OF(o)); | 1169 | appendsOFile(fp,NAME_OF(o)); |
1169 | } | 1170 | } else { |
1170 | else | ||
1171 | appendcOFile(fp,';'); | 1171 | appendcOFile(fp,';'); |
1172 | } | ||
1172 | if (VALUE_TYPE(o)) { | 1173 | if (VALUE_TYPE(o)) { |
1173 | appendcOFile(fp,'='); | 1174 | appendcOFile(fp,'='); |
1174 | writeValue(fp,o,0); | 1175 | writeValue(fp,o,0,TRUE); |
1175 | } | 1176 | } |
1176 | } | 1177 | } |
1177 | 1178 | ||
1178 | static void writeGroup(OFile *fp, VObject *o) | 1179 | static void writeGroup(OFile *fp, VObject *o) |
1179 | { | 1180 | { |
1180 | char buf1[256]; | 1181 | char buf1[256]; |
1181 | char buf2[256]; | 1182 | char buf2[256]; |
1182 | strcpy(buf1,NAME_OF(o)); | 1183 | strcpy(buf1,NAME_OF(o)); |
1183 | while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { | 1184 | while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) { |
1184 | strcpy(buf2,STRINGZ_VALUE_OF(o)); | 1185 | strcpy(buf2,STRINGZ_VALUE_OF(o)); |
1185 | strcat(buf2,"."); | 1186 | strcat(buf2,"."); |
1186 | strcat(buf2,buf1); | 1187 | strcat(buf2,buf1); |
@@ -1226,55 +1227,51 @@ static void writeProp(OFile *fp, VObject *o) | |||
1226 | if (fields_) { | 1227 | if (fields_) { |
1227 | int i = 0, n = 0; | 1228 | int i = 0, n = 0; |
1228 | const char** fields = fields_; | 1229 | const char** fields = fields_; |
1229 | /* output prop as fields */ | 1230 | /* output prop as fields */ |
1230 | bool printable = TRUE; | 1231 | bool printable = TRUE; |
1231 | while (*fields && printable) { | 1232 | while (*fields && printable) { |
1232 | VObject *t = isAPropertyOf(o,*fields); | 1233 | VObject *t = isAPropertyOf(o,*fields); |
1233 | if (includesUnprintable(t)) | 1234 | if (includesUnprintable(t)) |
1234 | printable = FALSE; | 1235 | printable = FALSE; |
1235 | fields++; | 1236 | fields++; |
1236 | } | 1237 | } |
1237 | fields = fields_; | 1238 | fields = fields_; |
1238 | if (!printable) { | 1239 | if (!printable) |
1239 | appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp); | 1240 | appendsOFileEncCs(fp); |
1240 | appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8"); | ||
1241 | } | ||
1242 | appendcOFile(fp,':'); | 1241 | appendcOFile(fp,':'); |
1243 | while (*fields) { | 1242 | while (*fields) { |
1244 | VObject *t = isAPropertyOf(o,*fields); | 1243 | VObject *t = isAPropertyOf(o,*fields); |
1245 | i++; | 1244 | i++; |
1246 | if (t) n = i; | 1245 | if (t) n = i; |
1247 | fields++; | 1246 | fields++; |
1248 | } | 1247 | } |
1249 | fields = fields_; | 1248 | fields = fields_; |
1250 | for (i=0;i<n;i++) { | 1249 | for (i=0;i<n;i++) { |
1251 | writeValue(fp,isAPropertyOf(o,*fields),0); | 1250 | writeValue(fp,isAPropertyOf(o,*fields),0,TRUE); |
1252 | fields++; | 1251 | fields++; |
1253 | if (i<(n-1)) appendcOFile(fp,';'); | 1252 | if (i<(n-1)) appendcOFile(fp,';'); |
1254 | } | 1253 | } |
1255 | } | 1254 | } |
1256 | } | 1255 | } |
1257 | 1256 | ||
1258 | 1257 | ||
1259 | if (VALUE_TYPE(o)) { | 1258 | if (VALUE_TYPE(o)) { |
1260 | if ( includesUnprintable(o) ) { | 1259 | if ( includesUnprintable(o) ) |
1261 | appendsOFile(fp, ";" VCEncodingProp "=" VCQuotedPrintableProp); | 1260 | appendsOFileEncCs(fp); |
1262 | appendsOFile(fp, ";" VCCharSetProp "=" "UTF-8"); | ||
1263 | } | ||
1264 | unsigned long size = 0; | 1261 | unsigned long size = 0; |
1265 | VObject *p = isAPropertyOf(o,VCDataSizeProp); | 1262 | VObject *p = isAPropertyOf(o,VCDataSizeProp); |
1266 | if (p) size = LONG_VALUE_OF(p); | 1263 | if (p) size = LONG_VALUE_OF(p); |
1267 | appendcOFile(fp,':'); | 1264 | appendcOFile(fp,':'); |
1268 | writeValue(fp,o,size); | 1265 | writeValue(fp,o,size,FALSE); |
1269 | } | 1266 | } |
1270 | 1267 | ||
1271 | appendcOFile(fp,'\n'); | 1268 | appendcOFile(fp,'\n'); |
1272 | } | 1269 | } |
1273 | 1270 | ||
1274 | static void writeVObject_(OFile *fp, VObject *o) | 1271 | static void writeVObject_(OFile *fp, VObject *o) |
1275 | { | 1272 | { |
1276 | if (NAME_OF(o)) { | 1273 | if (NAME_OF(o)) { |
1277 | struct PreDefProp *pi; | 1274 | struct PreDefProp *pi; |
1278 | pi = lookupPropInfo(NAME_OF(o)); | 1275 | pi = lookupPropInfo(NAME_OF(o)); |
1279 | 1276 | ||
1280 | if (pi && ((pi->flags & PD_BEGIN) != 0)) { | 1277 | if (pi && ((pi->flags & PD_BEGIN) != 0)) { |
@@ -1286,26 +1283,53 @@ static void writeVObject_(OFile *fp, VObject *o) | |||
1286 | initPropIterator(&t,o); | 1283 | initPropIterator(&t,o); |
1287 | while (moreIteration(&t)) { | 1284 | while (moreIteration(&t)) { |
1288 | VObject *eachProp = nextVObject(&t); | 1285 | VObject *eachProp = nextVObject(&t); |
1289 | writeProp(fp, eachProp); | 1286 | writeProp(fp, eachProp); |
1290 | } | 1287 | } |
1291 | appendsOFile(fp,"END:"); | 1288 | appendsOFile(fp,"END:"); |
1292 | appendsOFile(fp,begin); | 1289 | appendsOFile(fp,begin); |
1293 | appendsOFile(fp,"\n\n"); | 1290 | appendsOFile(fp,"\n\n"); |
1294 | } | 1291 | } |
1295 | } | 1292 | } |
1296 | } | 1293 | } |
1297 | 1294 | ||
1295 | static void initVObjectEncoding() | ||
1296 | { | ||
1297 | Config pimConfig( "Beam" ); | ||
1298 | pimConfig.setGroup("Send"); | ||
1299 | Config devcfg(pimConfig.readEntry("DeviceConfig"),Config::File); | ||
1300 | QString enc = "QP"; | ||
1301 | QString cs = "UTF-8"; | ||
1302 | if ( devcfg.isValid() ) { | ||
1303 | devcfg.setGroup("Send"); | ||
1304 | enc = devcfg.readEntry("Encoding","QP"); | ||
1305 | cs = devcfg.readEntry("CharSet","UTF-8"); | ||
1306 | } | ||
1307 | strncpy(vobj_cs,cs.latin1(),10); | ||
1308 | if ( enc == "QP" ) { | ||
1309 | vobj_enc = QuotedPrintable; | ||
1310 | vobj_enc_s = VCQuotedPrintableProp; | ||
1311 | } else if ( enc == "B64" ) { | ||
1312 | vobj_enc = Base64; | ||
1313 | vobj_enc_s = VCBase64Prop; | ||
1314 | } else { | ||
1315 | vobj_enc = EightBit; | ||
1316 | vobj_enc_s = 0; | ||
1317 | } | ||
1318 | } | ||
1319 | |||
1298 | void writeVObject(FILE *fp, VObject *o) | 1320 | void writeVObject(FILE *fp, VObject *o) |
1299 | { | 1321 | { |
1322 | initVObjectEncoding(); | ||
1323 | |||
1300 | OFile ofp; | 1324 | OFile ofp; |
1301 | // ##### | 1325 | // ##### |
1302 | //_setmode(_fileno(fp), _O_BINARY); | 1326 | //_setmode(_fileno(fp), _O_BINARY); |
1303 | initOFile(&ofp,fp); | 1327 | initOFile(&ofp,fp); |
1304 | writeVObject_(&ofp,o); | 1328 | writeVObject_(&ofp,o); |
1305 | } | 1329 | } |
1306 | 1330 | ||
1307 | DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o) | 1331 | DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o) |
1308 | { | 1332 | { |
1309 | QFileDirect f( fname); | 1333 | QFileDirect f( fname); |
1310 | if ( !f.open( IO_WriteOnly ) ) { | 1334 | if ( !f.open( IO_WriteOnly ) ) { |
1311 | qWarning("Unable to open vobject write %s", fname); | 1335 | qWarning("Unable to open vobject write %s", fname); |
@@ -1320,27 +1344,22 @@ DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list) | |||
1320 | QFileDirect f( fname); | 1344 | QFileDirect f( fname); |
1321 | if ( !f.open( IO_WriteOnly ) ) { | 1345 | if ( !f.open( IO_WriteOnly ) ) { |
1322 | qWarning("Unable to open vobject write %s", fname); | 1346 | qWarning("Unable to open vobject write %s", fname); |
1323 | return; | 1347 | return; |
1324 | } | 1348 | } |
1325 | 1349 | ||
1326 | while (list) { | 1350 | while (list) { |
1327 | writeVObject(f.directHandle(),list); | 1351 | writeVObject(f.directHandle(),list); |
1328 | list = nextVObjectInList(list); | 1352 | list = nextVObjectInList(list); |
1329 | } | 1353 | } |
1330 | } | 1354 | } |
1331 | 1355 | ||
1332 | #ifndef __SHARP_COMP_ | ||
1333 | |||
1334 | // This function is not available in the Sharp ROM for SL 5500 ! | ||
1335 | // Therefore I have to move it into the header file.. (se) | ||
1336 | |||
1337 | DLLEXPORT(const char *) vObjectTypeInfo(VObject *o) | 1356 | DLLEXPORT(const char *) vObjectTypeInfo(VObject *o) |
1338 | { | 1357 | { |
1339 | const char *type = vObjectName( o ); | 1358 | const char *type = vObjectName( o ); |
1340 | if ( strcmp( type, "TYPE" ) == 0 ) | 1359 | if ( strcmp( type, "TYPE" ) == 0 ) |
1341 | type = vObjectStringZValue( o ); | 1360 | type = vObjectStringZValue( o ); |
1342 | return type; | 1361 | return type; |
1343 | } | 1362 | } |
1344 | #endif | 1363 | |
1345 | 1364 | ||
1346 | // end of source file vobject.c | 1365 | // end of source file vobject.c |