* Replaced all "Citadel/UX" references with "Citadel"

[citadel.git] / citadel / vcard.c

diff --git a/citadel/vcard.c b/citadel/vcard.c
index 03a16b689d196c5851ec29d8156131b4bbe772ad..d0c51e177476f61a355724f8c7e24935e360873e 100644 (file)
--- a/citadel/vcard.c
+++ b/citadel/vcard.c
@@ -1,7 +1,7 @@
 /*
  * $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
@@ -30,9 +30,10 @@
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
-#include <syslog.h>
 
-#include "webcit.h"
+#include "citadel.h"
+#include "server.h"
+#include "support.h"
 #include "vcard.h"
 
 /* 
@@ -52,6 +53,19 @@ struct vCard *vcard_new() {
 }
 
 
+/*
+ * 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)
  */
@@ -89,7 +103,7 @@ struct vCard *vcard_load(char *vtext) {
                colonpos = pattern2(ptr, ":");
                nlpos = pattern2(ptr, "\n");
 
-               if (nlpos > colonpos > 0) {
+               if ((nlpos > colonpos) && (colonpos > 0)) {
                        namebuf = malloc(colonpos + 1);
                        valuebuf = malloc(nlpos - colonpos + 1);
                        strncpy(namebuf, ptr, colonpos);
@@ -128,14 +142,15 @@ struct vCard *vcard_load(char *vtext) {
 
 
 /*
- * 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
+ * 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, int instance) {
+                       int is_partial, int instance, int get_propname) {
        int i;
        int found_instance = 0;
 
@@ -147,7 +162,12 @@ char *vcard_get_prop(struct vCard *v, char *propname,
                         && (v->prop[i].name[strlen(propname)] == ';')
                         && (is_partial) ) ) {
                        if (instance == found_instance++) {
-                               return(v->prop[i].value);
+                               if (get_propname) {
+                                       return(v->prop[i].name);
+                               }
+                               else {
+                                       return(v->prop[i].value);
+                               }
                        }
                }
        }
@@ -156,8 +176,6 @@ char *vcard_get_prop(struct vCard *v, char *propname,
 }
 
 
-
-
 /*
  * Destructor
  */