/*
* 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-2020, 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/>.
*
* ---
*
* ---
*
* rdsched.c: Read update schedule
- *
+ *
* Known contributors to this file:
- * Markus Armbruster, 2007
+ * Markus Armbruster, 2007-2011
*/
-#define _XOPEN_SOURCE 500
-
#include <config.h>
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
+#include <limits.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
static int delete_update(time_t, time_t[], int);
/*
- * Read update schedule from file FNAME.
- * Put the first N-1 updates after T0 into SCHED[] in ascending order,
+ * Read update schedule from file @fname.
+ * Put the first @n-1 updates after @t0 into @sched[] in ascending order,
* terminated with a zero.
- * Use ANCHOR as initial anchor for anchor-relative times.
+ * Use @anchor as initial anchor for anchor-relative times.
* Return 0 on success, -1 on failure.
*/
int
read_schedule(char *fname, time_t sched[], int n, time_t t0, time_t anchor)
{
FILE *fp;
- int lno = 0;
+ int ret, lno;
char buf[1024];
char *endp;
fname, strerror(errno));
return -1;
}
- } else {
+ } else
fp = stdin;
- fname = "<stdin>";
- }
+ ret = lno = 0;
sched[0] = 0;
while (fgets(buf, sizeof(buf), fp) != NULL) {
++lno;
endp = strchr(buf, '#');
if (endp)
*endp = 0;
- if (parse_schedule_line(buf, sched, n, t0, &anchor, fname, lno))
- return -1;
+ if (parse_schedule_line(buf, sched, n, t0, &anchor,
+ fname ? fname : "<stdin>", lno)) {
+ ret = -1;
+ break;
+ }
}
- fclose(fp);
- return 0;
+ if (fname)
+ fclose(fp);
+ return ret;
}
/*
- * Parse an update schedule directive from LINE.
- * Update SCHED[] and ANCHOR accordingly.
- * SCHED[] holds the first N-1 updates after T0 in ascending order.
- * FNAME and LNO file name and line number for reporting errors.
+ * Parse an update schedule directive from @line.
+ * Update @sched[] and @anchor accordingly.
+ * @sched[] holds the first @n-1 updates after @t0 in ascending order.
+ * @fname and @lno file name and line number for reporting errors.
*/
static int
parse_schedule_line(char *line, time_t sched[], int n,
}
/*
- * Complain and return zero when T is bad, else return non-zero.
- * FNAME and LNO file name and line number.
+ * Complain and return zero when @t is bad, else return non-zero.
+ * @fname and @lno file name and line number.
*/
static int
time_ok(time_t t, char *fname, int lno)
}
/*
- * Parse a time from S into *T.
- * *ANCHOR is the base for anchor-relative time.
+ * Parse a time from @s into *@t.
+ * *@anchor is the base for anchor-relative time.
* Return pointer to first character not parsed on success,
* null pointer on failure.
*/
parse_time(time_t *t, char *s, time_t *anchor)
{
static char *fmt[] = {
+ /*
+ * Absolute time formats
+ * Must set tm_year, tm_mon, tm_mday, tm_hour, tm_min.
+ */
"%Y-%m-%d %H:%M ", /* ISO 8601 */
"%b %d %H:%M %Y ", /* like ctime(): Dec 22 15:35 2006 */
- "%d %b %Y %H:%M ", /* 22 Dec 2006 15:35 */
+ "%d %b %Y %H:%M ", /* like RFC 2822: 22 Dec 2006 15:35 */
+ /*
+ * Relative to anchor formats
+ * Must set tm_wday, may set tm_hour and tm_min
+ */
"next %a %H:%M ", /* next Fri 15:35 */
"next %a ", /* next Fri */
NULL
for (i = 0; ; i++) {
if (!fmt[i])
return NULL;
+ /*
+ * Carefully initialize tm so we can tell what strptime()
+ * actually set.
+ *
+ * Beware: some losing implementations of strptime() happily
+ * succeed when they fully consumed the first argument,
+ * regardless of whether they matched the full second argument
+ * or not. Observed on FreeBSD 6.2.
+ */
memset(&tm, 0, sizeof(tm));
- tm.tm_hour = -1;
+ tm.tm_hour = -1; /* to recognize anchor-relat. w/o time */
+ tm.tm_year = INT_MIN; /* strptime() lossage work-around */
+ tm.tm_mon = tm.tm_mday = tm.tm_min = tm.tm_wday = -1; /* ditto */
endp = strptime(p, fmt[i], &tm);
- if (endp)
+ if (endp
+ /* strptime() lossage work-around: */
+ && ((tm.tm_year != INT_MIN && tm.tm_mon != -1
+ && tm.tm_mday != -1 && tm.tm_hour != -1 && tm.tm_min != -1)
+ || (tm.tm_wday != -1
+ && (tm.tm_hour == -1 || tm.tm_min != -1))))
break;
}
- if (tm.tm_mday == 0) {
+ if (tm.tm_mday == -1) {
/* relative to anchor */
nexttm = *localtime(anchor);
if (tm.tm_hour >= 0) {
tm = nexttm;
}
+ tm.tm_isdst = -1;
*t = mktime(&tm);
return endp;
}
/*
- * Parse an every clause from S into *SECS.
+ * Parse an every clause from @s into *@secs.
* Return pointer to first character not parsed on success,
* null pointer on failure.
*/
static char *
parse_every(time_t *secs, char *s)
{
- int nch, delta;
+ int nch;
+ unsigned delta;
nch = -1;
sscanf(s, " every %u hours%n", &delta, &nch);
else
sscanf(s, " every %u minutes%n", &delta, &nch);
if (nch < 0)
- return NULL; *secs = 60 * delta;
+ return NULL;
+ *secs = 60 * delta;
return s + nch;
}
/*
- * Parse an until clause from S into *T.
- * *ANCHOR is the base for anchor-relative time.
+ * Parse an until clause from @s into *@t.
+ * *@anchor is the base for anchor-relative time.
* Return pointer to first character not parsed on success,
* null pointer on failure.
*/
}
/*
- * Parse an skip clause from S into *T.
- * *ANCHOR is the base for anchor-relative time.
+ * Parse an skip clause from @s into *@t.
+ * *@anchor is the base for anchor-relative time.
* Return pointer to first character not parsed on success,
* null pointer on failure.
*/
}
/*
- * Return the index of the first update at or after T in SCHED[].
+ * Return the index of the first update at or after @t in @sched[].
*/
static int
find_update(time_t t, time_t sched[])
}
/*
- * Insert update at T into SCHED[].
- * SCHED[] holds the first N-1 updates after T0 in ascending order.
- * If T is before T0 or outside game_days/game_hours, return -1.
- * If there's no space for T in SCHED[], return N-1.
- * Else insert T into SCHED[] and return its index in SCHED[].
+ * Insert update at @t into @sched[].
+ * @sched[] holds the first @n-1 updates after @t0 in ascending order.
+ * If @t is before @t0 or outside game_days/game_hours, return -1.
+ * If there's no space for @t in @sched[], return @n-1.
+ * Else insert @t into @sched[] and return its index in @sched[].
*/
static int
insert_update(time_t t, time_t sched[], int n, time_t t0)
}
/*
- * Delete update T from SCHED[].
- * SCHED[] holds N-1 updates in ascending order.
- * Return the index of the first update after T in SCHED[].
+ * Delete update @t from @sched[].
+ * @sched[] holds @n-1 updates in ascending order.
+ * Return the index of the first update after @t in @sched[].
*/
static int
delete_update(time_t t, time_t sched[], int n)
{
int i = find_update(t, sched);
if (t == sched[i])
- memmove(sched + i, sched + i + 1,
- (n - 1 - i) * sizeof(*sched));
+ memmove(sched + i, sched + i + 1, (n - 1 - i) * sizeof(*sched));
return i;
}
projects / empserver / blobdiff