Update copyright notice

[empserver] / src / lib / common / hours.c

diff --git a/src/lib/common/hours.c b/src/lib/common/hours.c
index a9f09630afed137307cc392937a9ad1a8862ee78..e82ccb28e473d11e638bbb1c1a2186910506e22a 100644 (file)
--- a/src/lib/common/hours.c
+++ b/src/lib/common/hours.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,30 +25,28 @@
  *  ---
  *
  *  hours.c: Game hours determination; is it legal to play now?
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Doug Hay, 1998
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004
+ *     Markus Armbruster, 2004-2010
  */
 
 #include <config.h>
 
 #include <ctype.h>
-#include <limits.h>
 #include <time.h>
 #include "misc.h"
 #include "optlist.h"
 #include "prototypes.h"
 
 static char *weekday(char *str, int *wday);
-static char *daytime(char *str, int *min);
 static char *daytime_range(char *str, int *from_min, int *to_min);
 
 /*
- * Is week day WDAY (Sunday is 0) allowed by restriction DAYS?
- * If DAYS is not empty, it lists the allowed week day names.  See
+ * Is week day @wday (Sunday is 0) allowed by restriction @days?
+ * If @days is not empty, it lists the allowed week day names.  See
  * weekday() for syntax.
  */
 int
@@ -68,8 +65,9 @@ is_wday_allowed(int wday, char *days)
 }
 
 /*
- * Is day time DTIME (minutes since midnight) allowed by restriction TIMES?
- * If TIMES is not empty, it lists the allowed day time ranges.  See
+ * Is day time @dtime allowed by restriction @times?
+ * @dtime is in minutes since midnight.
+ * If @times is not empty, it lists the allowed day time ranges.  See
  * daytime_range() for syntax.
  */
 int
@@ -102,8 +100,8 @@ gamehours(time_t t)
 }
 
 /*
- * Parse weekday name in STR.
- * On success assign day number (Sunday is 0) to *WDAY and return
+ * Parse weekday name in @str.
+ * On success assign day number (Sunday is 0) to *@wday and return
  * pointer to first character not parsed.
  * Else return NULL.
  * Abbreviated names are recognized, but not single characters.
@@ -118,7 +116,8 @@ weekday(char *str, int *wday)
      */
     static char *day_name[7] = {
        "sunday", "monday", "tuesday", "wednesday",
-       "thursday", "friday", "saturday" };
+       "thursday", "friday", "saturday"
+    };
     int i, j;
 
     for (; isspace(*str); ++str) ;
@@ -137,13 +136,13 @@ weekday(char *str, int *wday)
 }
 
 /*
- * Parse day time in STR.
- * On success store minutes since midnight in *MIN and return pointer
+ * Parse day time in @str.
+ * On success store minutes since midnight in *@min and return pointer
  * to first character not parsed.
  * Else return NULL.
  * Time format is HOUR:MINUTE.  Initial whitespace is ignored.
  */
-char *
+static char *
 daytime(char *str, int *min)
 {
     /*
@@ -154,7 +153,7 @@ daytime(char *str, int *min)
     unsigned long h, m;
 
     h = strtoul(str, &end, 10);
-    if (end == str || h > 23)
+    if (end == str || h > 24)
        return NULL;
 
     if (*end++ != ':')
@@ -164,19 +163,21 @@ daytime(char *str, int *min)
     m = strtoul(str, &end, 10);
     if (end == str || m > 59)
        return NULL;
+    else if (h == 24 && m != 0)
+       return NULL;
 
     *min = 60 * h + m;
     return end;
 }
 
 /*
- * Parse a day time range in STR.
- * On success store minutes since midnight in *FROM and *TO, return
- * pointer to first character not parsed.
+ * Parse a day time range in @str.
+ * On success, store minutes since midnight in *@from_min, *@to_min,
+ * and return pointer to first character not parsed.
  * Else return NULL.
  * Format is HOUR:MINUTE-HOUR:MINUTE.  Initial whitespace is ignored.
  */
-char *
+static char *
 daytime_range(char *str, int *from_min, int *to_min)
 {
     char *end;