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 3755848cc7d26fec2d51dd6bea44814dd0eda8b5..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"
@@ -93,18 +103,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);
@@ -152,7 +162,7 @@ char *vcard_get_prop(struct vCard *v, char *propname, int is_partial) {
  */
 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,6 +173,7 @@ void vcard_free(struct vCard *v) {
        if (v->prop != NULL) phree(v->prop);
        
        memset(v, 0, sizeof(struct vCard));
+       phree(v);
 }
 
 
@@ -190,7 +201,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);
 }