Added TYPE='less parsing support to SilcVCard.

[silc.git] / lib / silcutil / silcvcard.c

diff --git a/lib/silcutil/silcvcard.c b/lib/silcutil/silcvcard.c
index 0f9479c15c526a1ee856f483ff1a3ec6c9a79e81..59ae5cfd716f855c9434cc8f056f680f12eee25c 100644 (file)
--- a/lib/silcutil/silcvcard.c
+++ b/lib/silcutil/silcvcard.c
@@ -133,14 +133,17 @@ unsigned char *silc_vcard_encode(SilcVCard vcard, SilcUInt32 *vcard_len)
     continue;                                  \
   }
 
-/* Take on TYPE= token and prepare for next token */
-#define VCARD_TYPETOKEN(x)                             \
-  if (!(x)) {                                          \
-    int tmpi;                                          \
-    (x) = silc_memdup(val + off + 5, i - off - 5 - 1); \
-    tmpi = off + 5 + strlen((x)) + 1;                  \
-    off = i;                                           \
-    i = tmpi;                                          \
+/* Take on TYPE= token and prepare for next token, accept the
+   type also without TYPE= as it is possible */
+#define VCARD_TYPETOKEN(x)                                     \
+  if (!(x)) {                                                  \
+    int tmpi = 0;                                                      \
+    if (!strcasecmp(val + off, "TYPE="))                       \
+      tmpi = 5;                                                        \
+    (x) = silc_memdup(val + off + tmpi, i - off - tmpi - 1);   \
+    tmpi = off + tmpi + strlen((x)) + 1;                       \
+    off = i;                                                   \
+    i = tmpi;                                                  \
   }
 
 /* Take last token */