trying to figure out why webcit doesn't chdir properly when run from appimage

[citadel.git] / webcit / availability.c

diff --git a/webcit/availability.c b/webcit/availability.c
index f71dd1299bad7a8a722274ef6fc2598276e2f072..17edb3393f7068c7420e148224eb1928a1548f04 100644 (file)
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -1,11 +1,19 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2012 by the citadel.org team
  *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 
 #include "webcit.h"
 #include "webserver.h"
+#include "calendar.h"
 
 /*
  * Utility function to fetch a VFREEBUSY type of thing for any specified user.
@@ -90,7 +98,7 @@ int ical_ctdl_is_overlap(
                return(1);
        }
 
-       /* lprintf (9, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d \n",
+       /* syslog(LOG_DEBUG, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d \n",
                t1start.hour, t1start.minute, t1end.hour, t1end.minute,
                t2start.hour, t2start.minute, t2end.hour, t2end.minute);
        */
@@ -99,11 +107,11 @@ int ical_ctdl_is_overlap(
 
        /* If event 1 ends before event 2 starts, we're in the clear. */
        if (icaltime_compare(t1end, t2start) <= 0) return(0);
-       /* lprintf(9, "first passed\n"); */
+       /* syslog(LOG_DEBUG, "first passed\n"); */
 
        /* If event 2 ends before event 1 starts, we're also ok. */
        if (icaltime_compare(t2end, t1start) <= 0) return(0);
-       /* lprintf(9, "second passed\n"); */
+       /* syslog(LOG_DEBUG, "second passed\n"); */
 
        /* Otherwise, they overlap. */
        return(1);
@@ -112,15 +120,16 @@ int ical_ctdl_is_overlap(
 
 
 /*
- * \brief dig availability on citserver
  * Back end function for check_attendee_availability()
  * This one checks an individual attendee against a supplied
  * event start and end time.  All these fields have already been
  * broken out.  
- * \param attendee_string name of the attendee
- * \param event_start starttime of the event to check
- * \param event_end endtime of the event to check
- * \return The result is placed in 'annotation'.
+ *
+ * attendee_string     name of the attendee
+ * event_start         start time of the event to check
+ * event_end           end time of the event to check
+ *
+ * The result is placed in 'annotation'.
  */
 void check_individual_attendee(char *attendee_string,
                                struct icaltimetype event_start,
@@ -132,7 +141,7 @@ void check_individual_attendee(char *attendee_string,
        icalproperty *thisfb = NULL;
        struct icalperiodtype period;
 
-       /**
+       /*
         * Set to 'unknown' right from the beginning.  Unless we learn
         * something else, that's what we'll go with.
         */
@@ -143,7 +152,7 @@ void check_individual_attendee(char *attendee_string,
                return;
        }
 
-       /**
+       /*
         * Make sure we're looking at a VFREEBUSY by itself.  What we're probably
         * looking at initially is a VFREEBUSY encapsulated in a VCALENDAR.
         */
@@ -154,7 +163,7 @@ void check_individual_attendee(char *attendee_string,
                fb = fbc;
        }
 
-       /** Iterate through all FREEBUSY's looking for conflicts. */
+       /* Iterate through all FREEBUSY's looking for conflicts. */
        if (fb != NULL) {
 
                strcpy(annotation, _("free"));
@@ -179,11 +188,11 @@ void check_individual_attendee(char *attendee_string,
 
 
 
-/**
- * \brief check attendees availability
+/*
  * Check the availability of all attendees for an event (when possible)
  * and annotate accordingly.
- * \param vevent the event which should be compared with attendees calendar
+ *
+ * vevent      the event which should be compared with attendees calendar
  */
 void check_attendee_availability(icalcomponent *vevent) {
        icalproperty *attendee = NULL;
@@ -194,12 +203,13 @@ void check_attendee_availability(icalcomponent *vevent) {
        char attendee_string[SIZ];
        char annotated_attendee_string[SIZ];
        char annotation[SIZ];
+       const char *ch;
 
        if (vevent == NULL) {
                return;
        }
 
-       /**
+       /*
         * If we're looking at a fully encapsulated VCALENDAR
         * rather than a VEVENT component, attempt to use the first
         * relevant VEVENT subcomponent.  If there is none, the
@@ -218,7 +228,7 @@ void check_attendee_availability(icalcomponent *vevent) {
 
        ical_dezonify(vevent);          /**< Convert everything to UTC */
 
-       /**
+       /*
         * Learn the start and end times.
         */
        dtstart_p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
@@ -227,18 +237,17 @@ void check_attendee_availability(icalcomponent *vevent) {
        dtend_p = icalcomponent_get_first_property(vevent, ICAL_DTEND_PROPERTY);
        if (dtend_p != NULL) dtend_t = icalproperty_get_dtend(dtend_p);
 
-       /**
+       /*
         * Iterate through attendees.
         */
        for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY);
            attendee != NULL;
            attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
-
-               strcpy(attendee_string, icalproperty_get_attendee(attendee));
-               if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
+               ch = icalproperty_get_attendee(attendee);
+               if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
 
                        /** screen name or email address */
-                       strcpy(attendee_string, &attendee_string[7]);
+                       safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
                        striplt(attendee_string);
 
                        check_individual_attendee(attendee_string,