/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, 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,
* 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/>.
*
* ---
*
* ---
*
* 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>
*/
static char *day_name[7] = {
"sunday", "monday", "tuesday", "wednesday",
- "thursday", "friday", "saturday" };
+ "thursday", "friday", "saturday"
+ };
int i, j;
for (; isspace(*str); ++str) ;
* Else return NULL.
* Time format is HOUR:MINUTE. Initial whitespace is ignored.
*/
-char *
+static char *
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++ != ':')
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;
* 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;