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

[citadel.git] / citadel / vcard.c

diff --git a/citadel/vcard.c b/citadel/vcard.c
index e7836516e239822055c590ff0fbfac655db89ce0..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
@@ -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"
 
 /* 
@@ -37,7 +42,7 @@
 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;
@@ -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 = 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)
  */
@@ -59,7 +77,7 @@ struct vCard *vcard_load(char *vtext) {
        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.
@@ -85,9 +103,9 @@ struct vCard *vcard_load(char *vtext) {
                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);
@@ -100,14 +118,14 @@ struct vCard *vcard_load(char *vtext) {
 
                        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);
                        }
 
                }
@@ -118,38 +136,46 @@ struct vCard *vcard_load(char *vtext) {
                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;
 
-       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
  */
@@ -159,42 +185,44 @@ void vcard_free(struct vCard *v) {
        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);
 }
 
 
@@ -220,7 +248,7 @@ char *vcard_serialize(struct vCard *v)
                        strlen(v->prop[i].value) + 4;
        }
 
-       ser = mallok(len);
+       ser = malloc(len);
        if (ser == NULL) return NULL;
 
        strcpy(ser, "begin:vcard\r\n");