*/
-#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
#include <signal.h>
-#include <time.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 <ctype.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
-#include <pthread.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"
/*
}
+/*
+ * Add a property to a vCard
+ */
+void vcard_add_prop(struct vCard *v, char *propname, char *propvalue) {
+ ++v->numprops;
+ v->prop = reallok(v->prop,
+ (v->numprops * sizeof(char *) * 2) );
+ v->prop[v->numprops-1].name = strdoop(propname);
+ v->prop[v->numprops-1].value = strdoop(propvalue);
+}
+
+
+
/*
* Constructor (supply serialized vCard)
*/
colonpos = pattern2(ptr, ":");
nlpos = pattern2(ptr, "\n");
- if (nlpos > colonpos > 0) {
+ if ((nlpos > colonpos) && (colonpos > 0)) {
namebuf = mallok(colonpos + 1);
valuebuf = mallok(nlpos - colonpos + 1);
strncpy(namebuf, ptr, colonpos);
/*
- * 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;
- lprintf(9, "vcard_get_prop(%s, %d) called\n", propname, is_partial);
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);
- lprintf(9, "found: value is <%s>\n", v->prop[i].value);
+ if (instance == found_instance++) {
+ if (get_propname) {
+ return(v->prop[i].name);
+ }
+ else {
+ return(v->prop[i].value);
+ }
+ }
}
}
- lprintf(9, "not found: returning null\n");
return NULL;
}
-
-
/*
* Destructor
*/
}
+
+
/*
* 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);