fix all the <time.h> vs. <sys/time.h> issues, hopefully

[citadel.git] / citadel / policy.c

diff --git a/citadel/policy.c b/citadel/policy.c
index 3beea2bb289aa3eaecf6ac05d789e2dcbba14d8a..076fe8bcd8141358cf70ad6072a63861bf90dd2a 100644 (file)
--- a/citadel/policy.c
+++ b/citadel/policy.c
@@ -1,11 +1,27 @@
-/* $Id$ */
+/* 
+ * $Id$
+ *
+ * Functions which manage policy for rooms (such as message expiry)
+ */
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.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 <limits.h>
 #include "citadel.h"
 #include "server.h"
@@ -24,24 +40,24 @@
  * Retrieve the applicable expire policy for a specific room
  */
 void GetExpirePolicy(struct ExpirePolicy *epbuf, struct quickroom *qrbuf) {
-       struct floor flbuf;
+       struct floor *fl;
 
        /* If the room has its own policy, return it */ 
        if (qrbuf->QRep.expire_mode != 0) {
                memcpy(epbuf, &qrbuf->QRep, sizeof(struct ExpirePolicy));
                return;
-               }
+       }
 
-       /* Otherwise, if the floor has its own policy, return it */     
-       getfloor(&flbuf, qrbuf->QRfloor);
-       if (flbuf.f_ep.expire_mode != 0) {
-               memcpy(epbuf, &flbuf.f_ep, sizeof(struct ExpirePolicy));
+       /* Otherwise, if the floor has its own policy, return it */
+       fl = cgetfloor(qrbuf->QRfloor);
+       if (fl->f_ep.expire_mode != 0) {
+               memcpy(epbuf, &fl->f_ep, sizeof(struct ExpirePolicy));
                return;
-               }
+       }
 
        /* Otherwise, fall back on the system default */
        memcpy(epbuf, &config.c_ep, sizeof(struct ExpirePolicy));
-       }
+}
 
 
 /*
@@ -49,27 +65,27 @@ void GetExpirePolicy(struct ExpirePolicy *epbuf, struct quickroom *qrbuf) {
  */
 void cmd_gpex(char *argbuf) {
        struct ExpirePolicy exp;
-       struct floor flbuf;
-       char which[256];
+       struct floor *fl;
+       char which[SIZ];
 
        extract(which, argbuf, 0);
        if (!strcasecmp(which, "room")) {
                memcpy(&exp, &CC->quickroom.QRep, sizeof(struct ExpirePolicy));
-               }
+       }
        else if (!strcasecmp(which, "floor")) {
-               getfloor(&flbuf, CC->quickroom.QRfloor);
-               memcpy(&exp, &flbuf.f_ep, sizeof(struct ExpirePolicy));
-               }
+               fl = cgetfloor(CC->quickroom.QRfloor);
+               memcpy(&exp, &fl->f_ep, sizeof(struct ExpirePolicy));
+       }
        else if (!strcasecmp(which, "site")) {
                memcpy(&exp, &config.c_ep, sizeof(struct ExpirePolicy));
-               }
+       }
        else {
                cprintf("%d Invalid keyword.\n", ERROR);
                return;
-               }
+       }
 
        cprintf("%d %d|%d\n", OK, exp.expire_mode, exp.expire_value);
-       }
+}
 
 
 /*
@@ -78,7 +94,7 @@ void cmd_gpex(char *argbuf) {
 void cmd_spex(char *argbuf) {
        struct ExpirePolicy exp;
        struct floor flbuf;
-       char which[256];
+       char which[SIZ];
 
        memset(&exp, 0, sizeof(struct ExpirePolicy));
        extract(which, argbuf, 0);
@@ -88,52 +104,52 @@ void cmd_spex(char *argbuf) {
        if ((exp.expire_mode < 0) || (exp.expire_mode > 3)) {
                cprintf("%d Invalid policy.\n", ERROR);
                return;
-               }
+       }
 
        if (!strcasecmp(which, "room")) {
                if (!is_room_aide()) {
                        cprintf("%d Higher access required.\n",
                                ERROR+HIGHER_ACCESS_REQUIRED);
                        return;
-                       }
+               }
                lgetroom(&CC->quickroom, CC->quickroom.QRname);
                memcpy(&CC->quickroom.QRep, &exp, sizeof(struct ExpirePolicy));
                lputroom(&CC->quickroom);
-               cprintf("%d ok\n", OK);
+               cprintf("%d Room expire policy set.\n", OK);
                return;
-               }
+       }
 
        if (CC->usersupp.axlevel < 6) {
                cprintf("%d Higher access required.\n",
                        ERROR+HIGHER_ACCESS_REQUIRED);
                return;
-               }
+       }
 
        if (!strcasecmp(which, "floor")) {
                lgetfloor(&flbuf, CC->quickroom.QRfloor);
                memcpy(&flbuf.f_ep, &exp, sizeof(struct ExpirePolicy));
                lputfloor(&flbuf, CC->quickroom.QRfloor);
-               cprintf("%d ok\n", OK);
+               cprintf("%d Floor expire policy set.\n", OK);
                return;
-               }
+       }
 
        else if (!strcasecmp(which, "site")) {
                if (exp.expire_mode == EXPIRE_NEXTLEVEL) {
                        cprintf("%d Invalid policy (no higher level)\n",
                                ERROR);
                        return;
-                       }
+               }
                memcpy(&config.c_ep, &exp, sizeof(struct ExpirePolicy));
                put_config();
-               cprintf("%d ok\n", OK);
+               cprintf("%d Site expire policy set.\n", OK);
                return;
-               }
+       }
 
        else {
                cprintf("%d Invalid keyword.\n", ERROR);
                return;
-               }
-
        }
 
+}
+