* Eliminate EVT_OUTPUTMSG server extensions (don't need them anymore)

[citadel.git] / citadel / vcard.c

diff --git a/citadel/vcard.c b/citadel/vcard.c
index 3755848cc7d26fec2d51dd6bea44814dd0eda8b5..bf46fd9e929fe71cd19a5ecd9c66f5030d3de42f 100644 (file)
--- a/citadel/vcard.c
+++ b/citadel/vcard.c
@@ -9,26 +9,31 @@
  */
 
 
-#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"
 
 /* 
@@ -48,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 = 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)
  */
@@ -85,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 = mallok(colonpos + 1);
                        valuebuf = mallok(nlpos - colonpos + 1);
                        strncpy(namebuf, ptr, colonpos);
@@ -93,18 +111,18 @@ struct vCard *vcard_load(char *vtext) {
                        strncpy(valuebuf, &ptr[colonpos+1], nlpos-colonpos-1);
                        valuebuf[nlpos-colonpos-1] = 0;
 
-                       if ( (!strcasecmp(namebuf, "begin"))
-                          && (!strcasecmp(valuebuf, "vcard")) )  valid = 1;
                        if ( (!strcasecmp(namebuf, "end"))
                           && (!strcasecmp(valuebuf, "vcard")) )  valid = 0;
+                       if ( (!strcasecmp(namebuf, "begin"))
+                          && (!strcasecmp(valuebuf, "vcard")) )  valid = 1;
 
-                       if (valid) {
+                       if ( (valid) && (strcasecmp(namebuf, "begin")) ) {
                                ++v->numprops;
                                v->prop = reallok(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);
@@ -124,20 +142,33 @@ 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.
+ * 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);
+                               }
+                       }
                }
        }
 
@@ -145,14 +176,12 @@ char *vcard_get_prop(struct vCard *v, char *propname, int is_partial) {
 }
 
 
-
-
 /*
  * Destructor
  */
 void vcard_free(struct vCard *v) {
        int i;
-
+       
        if (v->magic != CTDL_VCARD_MAGIC) return;       /* Self-check */
        
        if (v->numprops) for (i=0; i<(v->numprops); ++i) {
@@ -163,19 +192,22 @@ void vcard_free(struct vCard *v) {
        if (v->prop != NULL) phree(v->prop);
        
        memset(v, 0, sizeof(struct vCard));
+       phree(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);
@@ -190,7 +222,7 @@ void vcard_set_prop(struct vCard *v, char *name, char *value) {
        v->prop = reallok(v->prop,
                (v->numprops * sizeof(char *) * 2) );
        v->prop[v->numprops-1].name = strdoop(name);
-       v->prop[v->numprops-1].value = (value);
+       v->prop[v->numprops-1].value = strdoop(value);
 }