/*
- * $Id: vcard.c 5754 2007-11-16 05:52:26Z ajc $
- *
* vCard implementation for Citadel
*
- * Copyright (C) 1999-2007 by the citadel.org development team.
- * This code is freely redistributable under the terms of the GNU General
- * Public License. All other rights reserved.
+ * Copyright (C) 1999-2008 by the citadel.org development team.
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <libcitadel.h>
-/**
+/*
* Constructor (empty vCard)
* Returns an empty vcard
*/
return v;
}
-/**
+/*
* Remove the "charset=" attribute from a vCard property name
*
*/
v->prop[v->numprops-1].value = strdup(propvalue);
}
+/*
+ * Constructor - returns a new struct vcard given a serialized vcard
+ */
+struct vCard *VCardLoad(StrBuf *vbtext) {
+ return vcard_load((char*)ChrPtr(vbtext));
+}
-
-/**
+/*
* Constructor - returns a new struct vcard given a serialized vcard
*/
struct vCard *vcard_load(char *vtext) {
mycopy = strdup(vtext);
if (mycopy == NULL) return NULL;
- /**
+ /*
* First, fix this big pile o' vCard to make it more parseable.
* To make it easier to parse, we convert CRLF to LF, and unfold any
* multi-line fields into single lines.
}
v = vcard_new();
- if (v == NULL) return v;
+ if (v == NULL)
+ {
+ free(mycopy);
+ return v;
+ }
ptr = mycopy;
while (!IsEmptyStr(ptr)) {
- colonpos = (-1);
- nlpos = (-1);
colonpos = pattern2(ptr, ":");
nlpos = pattern2(ptr, "\n");
if ((nlpos > colonpos) && (colonpos > 0)) {
namebuf = malloc(colonpos + 1);
valuebuf = malloc(nlpos - colonpos + 1);
- strncpy(namebuf, ptr, colonpos);
- namebuf[colonpos] = 0;
- strncpy(valuebuf, &ptr[colonpos+1], nlpos-colonpos-1);
- valuebuf[nlpos-colonpos-1] = 0;
+ memcpy(namebuf, ptr, colonpos);
+ namebuf[colonpos] = '\0';
+ memcpy(valuebuf, &ptr[colonpos+1], nlpos-colonpos-1);
+ valuebuf[nlpos-colonpos-1] = '\0';
if (!strcasecmp(namebuf, "end")) {
valid = 0;
}
-/**
+/*
* Fetch the value of a particular key.
* If is_partial is set to 1, a partial match is ok (for example,
* a key of "tel;home" will satisfy a search for "tel").
if (v->magic != CTDL_VCARD_MAGIC) return; /* Self-check */
- /** If this key is already present, replace it */
+ /* If this key is already present, replace it */
if (!append) if (v->numprops) for (i=0; i<(v->numprops); ++i) {
if (!strcasecmp(v->prop[i].name, name)) {
free(v->prop[i].name);
size_t len;
int is_utf8 = 0;
+ if (v == NULL) return NULL; /* self check */
if (v->magic != CTDL_VCARD_MAGIC) return NULL; /* self check */
- /** Figure out how big a buffer we need to allocate */
+ /* Set the vCard version number to 2.1 at this time. */
+ vcard_set_prop(v, "VERSION", "2.1", 0);
+
+ /* Figure out how big a buffer we need to allocate */
len = 64; /* for begin, end, and a little padding for safety */
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
len = len +