/*
* $Id$
*
- * vCard implementation for Citadel/UX
+ * vCard implementation for Citadel
*
* Copyright (C) 1999 by Art Cancro
* This code is freely redistributable under the terms of the GNU General
*/
-#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
-#include <syslog.h>
+
#include "citadel.h"
#include "server.h"
-#include "control.h"
-#include "sysdep_decls.h"
#include "support.h"
-#include "config.h"
-#include "tools.h"
#include "vcard.h"
/*
struct vCard *vcard_new() {
struct vCard *v;
- v = (struct vCard *) mallok(sizeof(struct vCard));
+ v = (struct vCard *) malloc(sizeof(struct vCard));
if (v == NULL) return v;
v->magic = CTDL_VCARD_MAGIC;
}
+/*
+ * Add a property to a vCard
+ */
+void vcard_add_prop(struct vCard *v, char *propname, char *propvalue) {
+ ++v->numprops;
+ v->prop = realloc(v->prop,
+ (v->numprops * sizeof(char *) * 2) );
+ v->prop[v->numprops-1].name = strdup(propname);
+ v->prop[v->numprops-1].value = strdup(propvalue);
+}
+
+
+
/*
* Constructor (supply serialized vCard)
*/
int i;
int colonpos, nlpos;
- mycopy = strdoop(vtext);
+ mycopy = strdup(vtext);
if (mycopy == NULL) return NULL;
/* First, fix this big pile o' vCard to make it more parseable.
colonpos = pattern2(ptr, ":");
nlpos = pattern2(ptr, "\n");
- if (nlpos > colonpos > 0) {
- namebuf = mallok(colonpos + 1);
- valuebuf = mallok(nlpos - colonpos + 1);
+ 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);
if ( (valid) && (strcasecmp(namebuf, "begin")) ) {
++v->numprops;
- v->prop = reallok(v->prop,
+ v->prop = realloc(v->prop,
(v->numprops * sizeof(char *) * 2) );
v->prop[v->numprops-1].name = namebuf;
v->prop[v->numprops-1].value = valuebuf;
}
else {
- phree(namebuf);
- phree(valuebuf);
+ free(namebuf);
+ free(valuebuf);
}
}
if (*ptr == '\n') ++ptr;
}
- phree(mycopy);
+ free(mycopy);
return v;
}
/*
- * Fetch the value of a particular key
+ * 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")
+ * a key of "tel;home" will satisfy a search for "tel").
+ * Set "instance" to a value higher than 0 to return subsequent instances
+ * of the same key.
+ * Set "get_propname" to nonzero to fetch the property name instead of value.
*/
-char *vcard_get_prop(struct vCard *v, char *propname, int is_partial) {
+char *vcard_get_prop(struct vCard *v, char *propname,
+ int is_partial, int instance, int get_propname) {
int i;
+ int found_instance = 0;
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
if ( (!strcasecmp(v->prop[i].name, propname))
+ || (propname[0] == 0)
|| ( (!strncasecmp(v->prop[i].name,
propname, strlen(propname)))
&& (v->prop[i].name[strlen(propname)] == ';')
&& (is_partial) ) ) {
- return(v->prop[i].value);
+ if (instance == found_instance++) {
+ if (get_propname) {
+ return(v->prop[i].name);
+ }
+ else {
+ return(v->prop[i].value);
+ }
+ }
}
}
}
-
-
/*
* Destructor
*/
if (v->magic != CTDL_VCARD_MAGIC) return; /* Self-check */
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
- phree(v->prop[i].name);
- phree(v->prop[i].value);
+ free(v->prop[i].name);
+ free(v->prop[i].value);
}
- if (v->prop != NULL) phree(v->prop);
+ if (v->prop != NULL) free(v->prop);
memset(v, 0, sizeof(struct vCard));
- phree(v);
+ free(v);
}
+
+
/*
* Set a name/value pair in the card
*/
-void vcard_set_prop(struct vCard *v, char *name, char *value) {
+void vcard_set_prop(struct vCard *v, char *name, char *value, int append) {
int i;
if (v->magic != CTDL_VCARD_MAGIC) return; /* Self-check */
/* If this key is already present, replace it */
- if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+ if (!append) if (v->numprops) for (i=0; i<(v->numprops); ++i) {
if (!strcasecmp(v->prop[i].name, name)) {
- phree(v->prop[i].name);
- phree(v->prop[i].value);
- v->prop[i].name = strdoop(name);
- v->prop[i].value = strdoop(value);
+ free(v->prop[i].name);
+ free(v->prop[i].value);
+ v->prop[i].name = strdup(name);
+ v->prop[i].value = strdup(value);
return;
}
}
/* Otherwise, append it */
++v->numprops;
- v->prop = reallok(v->prop,
+ v->prop = realloc(v->prop,
(v->numprops * sizeof(char *) * 2) );
- v->prop[v->numprops-1].name = strdoop(name);
- v->prop[v->numprops-1].value = strdoop(value);
+ v->prop[v->numprops-1].name = strdup(name);
+ v->prop[v->numprops-1].value = strdup(value);
}
strlen(v->prop[i].value) + 4;
}
- ser = mallok(len);
+ ser = malloc(len);
if (ser == NULL) return NULL;
strcpy(ser, "begin:vcard\r\n");