* 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 c35472c5245cd529126a1bf31f3bc61dd42cfeca..bf46fd9e929fe71cd19a5ecd9c66f5030d3de42f 100644 (file)
--- a/citadel/vcard.c
+++ b/citadel/vcard.c
@@ -9,7 +9,6 @@
  */
 
 
-#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -31,14 +30,10 @@
 #include <string.h>
 #include <errno.h>
 #include <limits.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"
 
 /* 
@@ -58,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)
  */
@@ -95,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);
@@ -134,25 +142,32 @@ 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;
 
        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) ) ) {
                        if (instance == found_instance++) {
-                               return(v->prop[i].value);
+                               if (get_propname) {
+                                       return(v->prop[i].name);
+                               }
+                               else {
+                                       return(v->prop[i].value);
+                               }
                        }
                }
        }
@@ -161,8 +176,6 @@ char *vcard_get_prop(struct vCard *v, char *propname,
 }
 
 
-
-
 /*
  * Destructor
  */
@@ -183,39 +196,6 @@ void vcard_free(struct vCard *v) {
 }
 
 
-/*
- * Experimental output type of thing
- */
-char *vcard_to_html(struct vCard *v) {
-       char *html = NULL;
-       int i;
-       size_t len = 256;
-
-       if (v == NULL) return NULL;
-
-       if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-               len += strlen(v->prop[i].name);
-               len += strlen(v->prop[i].value);
-       }
-
-       html = mallok(len);
-       if (html == NULL) return NULL;
-
-       sprintf(html, "<TABLE bgcolor=#888888>");
-       if (v->numprops) for (i=0; i<(v->numprops); ++i) {
-               sprintf(&html[strlen(html),
-                       "<TR><TD>%s</TD><TD>%s</TD></TR>\n",
-                       v->prop[i].name,
-                       v->prop[i].value
-               );
-       }
-
-       strcat(html, "</TABLE>");
-
-       return(html);
-}
-
-
 
 
 /*