/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* journal.c: Log a journal of events to a file
*
* Known contributors to this file:
- * Markus Armbruster, 2004-2011
+ * Markus Armbruster, 2004-2012
* Ron Koenderink, 2008
*/
* logout CNUM
* command NAME
* input INPUT
+ * output THREAD ID OUTPUT
* update ETU
*/
ATTRIBUTE((format (printf, 1, 2)));
static void journal_entry(char *fmt, ...)
ATTRIBUTE((format (printf, 1, 2)));
+static void journal_output_start(struct player *, int);
static FILE *
journal_open(void)
{
- return fopen(journal_fname, "a+");
+ return fopen(journal_fname, "a");
}
static void
journal_entry_vstart(char *fmt, va_list ap)
{
time_t now;
+ empth_t *self;
if (!journal)
return;
time(&now);
+ self = empth_self();
fprintf(journal, "%.24s %10.10s ",
- ctime(&now), empth_name(empth_self()));
+ ctime(&now), self ? empth_name(self) : "Main");
vfprintf(journal, fmt, ap);
}
}
static void
-journal_entry_pr(char *s, size_t n)
+journal_entry_write(char *s, size_t n)
{
- unsigned char *p;
+ char *p;
if (!journal)
return;
- for (p = (unsigned char *)s; *p && n; p++) {
+ for (p = s; p < s + n; p++) {
if (*p == '\\')
- fputs("\\\\", journal);
- else if (isprint(*p))
+ fprintf(journal, "\\\\");
+ else if (isprint(*(unsigned char *)p) || *p == '\t')
putc(*p, journal);
else
fprintf(journal, "\\%03o", *p);
- n--;
}
}
static void
-journal_entry_end(void)
+journal_entry_end(int newline, int flush)
{
if (!journal)
return;
+ if (!newline)
+ fputc('\\', journal);
fputc('\n', journal);
- fflush(journal);
+ if (flush)
+ fflush(journal);
if (ferror(journal)) {
logerror("Error writing journal (%s)", strerror(errno));
clearerr(journal);
va_start(ap, fmt);
journal_entry_vstart(fmt, ap);
va_end(ap);
- journal_entry_end();
+ journal_entry_end(1, 1);
}
int
void
journal_prng(unsigned seed)
{
- journal_entry("prng BSD %d", seed);
+ journal_entry("prng MT19937 %u", seed);
}
void
journal_entry("logout %d", player->cnum);
}
+void
+journal_output(struct player *pl, int id, char *output)
+{
+ static char buf[1024];
+ static char *bp = buf;
+ static struct player *bpl;
+ static int bid;
+ char *s, *e;
+
+ if (keep_journal < 2)
+ return;
+
+ if (bp != buf && (pl != bpl || id != bid)) {
+ journal_output_start(bpl, bid);
+ journal_entry_write(buf, bp - buf);
+ journal_entry_end(0, 0);
+ bp = buf;
+ }
+
+ for (s = output; (e = strchr(s, '\n')); s = e + 1) {
+ journal_output_start(pl, id);
+ journal_entry_write(buf, bp - buf);
+ journal_entry_write(s, e - s);
+ journal_entry_end(1, 0);
+ bp = buf;
+ }
+ e = strchr(s, 0);
+ if (bp + (e - s) <= buf + sizeof(buf)) {
+ memcpy(bp, s, e - s);
+ bp += e - s;
+ bpl = pl;
+ bid = id;
+ } else {
+ journal_output_start(pl, id);
+ journal_entry_write(buf, bp - buf);
+ journal_entry_write(s, e - s);
+ journal_entry_end(0, 0);
+ bp = buf;
+ }
+}
+
+static void
+journal_output_start(struct player *pl, int id)
+{
+ journal_entry_start("output %s %d ", empth_name(pl->proc), id);
+}
+
void
journal_input(char *input)
{
journal_entry_start("input ");
- journal_entry_pr(input, -1);
- journal_entry_end();
+ journal_entry_write(input, strlen(input));
+ journal_entry_end(1, 1);
}
void