/*
- * $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-2023 by the citadel.org development team.
+ *
+// This program is open source software. Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
*/
#include <stdio.h>
#include <fcntl.h>
#include <signal.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
+#include <time.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <libcitadel.h>
-/**
+/*
* Constructor (empty vCard)
* Returns an empty vcard
*/
return v;
}
-/**
+/*
* Remove the "charset=" attribute from a vCard property name
*
*/
t = num_tokens(strbuf, ';');
for (i=0; i<t; ++i) {
extract_token(compare, strbuf, i, ';', sizeof compare);
- striplt(compare);
+ string_trim(compare);
if (!strncasecmp(compare, "charset=", 8)) {
remove_token(strbuf, i, ';');
}
* propname name of new property
* propvalue value of new property
*/
-void vcard_add_prop(struct vCard *v, char *propname, char *propvalue) {
+void vcard_add_prop(struct vCard *v, const char *propname, const char *propvalue) {
++v->numprops;
v->prop = realloc(v->prop,
(v->numprops * sizeof(struct vCardProp)) );
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 +
/* Anything left is probably the first name */
safestrncpy(firstname, buf, sizeof firstname);
- striplt(firstname);
+ string_trim(firstname);
/* Compose the structured name */
snprintf(vname, vname_size, "%s;%s;%s;%s;%s", lastname, firstname, middlename,