fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / vcard.c

diff --git a/citadel/vcard.c b/citadel/vcard.c
index 8cf2d2d8c0b0c94cbab643c4d93641a808f777ee..e9c06f3219f4ed6b58a57932022eb5cafb627d7a 100644 (file)
--- a/citadel/vcard.c
+++ b/citadel/vcard.c
@@ -15,12 +15,22 @@
 #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"
@@ -34,7 +44,7 @@
 /* 
  * Constructor (empty vCard)
  */
-struct vCard *new_vcard() {
+struct vCard *vcard_new() {
        struct vCard *v;
 
        v = (struct vCard *) mallok(sizeof(struct vCard));
@@ -51,7 +61,7 @@ struct vCard *new_vcard() {
 /*
  * Constructor (supply serialized vCard)
  */
-struct vCard *load_vcard(char *vtext) {
+struct vCard *vcard_load(char *vtext) {
        struct vCard *v;
        int valid = 0;
        char *mycopy, *ptr;
@@ -75,7 +85,7 @@ struct vCard *load_vcard(char *vtext) {
                }
        }
 
-       v = new_vcard();
+       v = vcard_new();
        if (v == NULL) return v;
 
        ptr = mycopy;
@@ -93,18 +103,18 @@ struct vCard *load_vcard(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);
@@ -123,13 +133,36 @@ struct vCard *load_vcard(char *vtext) {
 }
 
 
+/*
+ * 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")
+ */
+char *vcard_get_prop(struct vCard *v, char *propname, int is_partial) {
+       int i;
+
+       if (v->numprops) for (i=0; i<(v->numprops); ++i) {
+               if ( (!strcasecmp(v->prop[i].name, propname))
+                  || (  (!strncasecmp(v->prop[i].name,
+                                       propname, strlen(propname)))
+                        && (v->prop[i].name[strlen(propname)] == ';')
+                        && (is_partial) ) ) {
+                       return(v->prop[i].value);
+               }
+       }
+
+       return NULL;
+}
+
+
+
 
 /*
  * Destructor
  */
-void free_vcard(struct vCard *v) {
+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) {
@@ -140,13 +173,14 @@ void free_vcard(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 set_prop(struct vCard *v, char *name, char *value) {
+void vcard_set_prop(struct vCard *v, char *name, char *value) {
        int i;
 
        if (v->magic != CTDL_VCARD_MAGIC) return;       /* Self-check */
@@ -167,7 +201,7 @@ void 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);
 }
 
 
@@ -177,7 +211,7 @@ void set_prop(struct vCard *v, char *name, char *value) {
  * Serialize a struct vcard into a standard text/x-vcard MIME type.
  *
  */
-char *serialize_vcard(struct vCard *v)
+char *vcard_serialize(struct vCard *v)
 {
        char *ser;
        int i;
@@ -200,7 +234,7 @@ char *serialize_vcard(struct vCard *v)
        if (v->numprops) for (i=0; i<(v->numprops); ++i) {
                strcat(ser, v->prop[i].name);
                strcat(ser, ":");
-               strcat(ser, v->prop[i].name);
+               strcat(ser, v->prop[i].value);
                strcat(ser, "\r\n");
        }
        strcat(ser, "end:vcard\r\n");