* read static/server files directly into the outbuffer

[citadel.git] / webcit / availability.c

diff --git a/webcit/availability.c b/webcit/availability.c
index 99996590b91c33122d24ba2ea9a4626f2f7ede08..156137b1b2e51a99f9a3a4fbaaac2b73a0d29526 100644 (file)
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -11,22 +11,23 @@
  * Utility function to fetch a VFREEBUSY type of thing for any specified user.
  */
 icalcomponent *get_freebusy_for_user(char *who) {
+       long nLines;
        char buf[SIZ];
-       char *serialized_fb = NULL;
+       StrBuf *serialized_fb = NewStrBuf();
        icalcomponent *fb = NULL;
 
        serv_printf("ICAL freebusy|%s", who);
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               serialized_fb = read_server_text();
+               read_server_text(serialized_fb, &nLines);
        }
 
        if (serialized_fb == NULL) {
                return NULL;
        }
        
-       fb = icalcomponent_new_from_string(serialized_fb);
-       free(serialized_fb);
+       fb = icalcomponent_new_from_string(ChrPtr(serialized_fb));
+       FreeStrBuf(&serialized_fb);
        if (fb == NULL) {
                return NULL;
        }
@@ -55,22 +56,22 @@ int ical_ctdl_is_overlap(
 
        /* First, check for all-day events */
        if (t1start.is_date) {
-               if (!icaltime_compare_date_only(t1start, t2start, icaltimezone_get_utc_timezone())) {
+               if (!icaltime_compare_date_only(t1start, t2start)) {
                        return(1);
                }
                if (!icaltime_is_null_time(t2end)) {
-                       if (!icaltime_compare_date_only(t1start, t2end, icaltimezone_get_utc_timezone())) {
+                       if (!icaltime_compare_date_only(t1start, t2end)) {
                                return(1);
                        }
                }
        }
 
        if (t2start.is_date) {
-               if (!icaltime_compare_date_only(t2start, t1start, icaltimezone_get_utc_timezone())) {
+               if (!icaltime_compare_date_only(t2start, t1start)) {
                        return(1);
                }
                if (!icaltime_is_null_time(t1end)) {
-                       if (!icaltime_compare_date_only(t2start, t1end, icaltimezone_get_utc_timezone())) {
+                       if (!icaltime_compare_date_only(t2start, t1end)) {
                                return(1);
                        }
                }