Clean up library dependencies

Move stuff to untangle the ugly cyclic dependencies between the
archives built for selected subdirectories of src/lib/:

* Move common/io.c to empthread/ because it requires empthread stuff

* Move parts of subs/nstr.c to common/nstreval.c to satisfy
  common/ef_verify.o

* Move getstarg.c getstring.c onearg.c from gen/ to subs/ because they
  require stuff from there

* Move bridgefall.c check.c damage.c empobj.c journal.c maps.c
  sectdamage.c from common/ to subs/ because they require stuff from
  there

* Move cnumb.c from subs/ to common/ to satisfy common/type.o

* Move log.c fsize.c from common/ to gen/ because they really belong
  there

* Move emp_config.c mapdist.c from gen/ to common/ because they really
  belong there, and require stuff from libglobal.a

Also package as/ as libas.a to satisfy common/path.o.

Remaining dependencies:

    lib             needs
    --------------------------------------------
    libas.a         libglobal.a
    libcommon.a     libas.a libglobal.a libgen.a
    libgen.a
    libglobal.a
    liblwp.a        libgen.a
    libw32.a[*]     libgen.a

    [*] Except for service.o, which can only be linked into the server

Link order now: liblwp.a libcommon.a libas.a libgen.a libglobal.a
libw32.a.  The position of libw32.a is not quite right, but works
anyway.
This commit is contained in:
Markus Armbruster 2008-02-02 21:03:12 +01:00
parent 1cbb37d4fb
commit 77e95bd788
20 changed files with 235 additions and 191 deletions

169
src/lib/subs/journal.c Normal file
View file

@ -0,0 +1,169 @@
/*
* Empire - A multi-player, client/server Internet based war game.
* Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program 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
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* 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
*
* ---
*
* 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.
*
* ---
*
* journal.c: Log a journal of events to a file
*
* Known contributors to this file:
* Markus Armbruster, 2004-2007
*/
/*
* Journal file format: each line logs an event, and looks like this:
*
* TIME THREAD EVENT DATA
*
* Events and their data are:
*
* startup
* shutdown
* login CNUM HOSTADDR USER
* logout CNUM
* input INPUT
* update ETU
*/
#include <config.h>
#include <ctype.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <time.h>
#include "misc.h"
#include "empthread.h"
#include "journal.h"
#include "optlist.h"
#include "player.h"
#include "prototypes.h"
static char journal_fname[] = "journal.log";
static FILE *journal;
static FILE *
journal_open(void)
{
return fopen(journal_fname, "a+");
}
static void
journal_entry(char *fmt, ...)
{
static char buf[1024];
va_list ap;
time_t now;
unsigned char *p;
if (journal) {
time(&now);
fprintf(journal, "%.24s %p ", ctime(&now), empth_self());
va_start(ap, fmt);
vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
va_end(ap);
for (p = (unsigned char *)buf; *p; p++) {
if (isprint(*p))
putc(*p, journal);
else
fprintf(journal, "\\%03o", *p);
}
fputs("\n", journal);
if (debug)
fflush(journal);
if (ferror(journal)) {
logerror("Error writing journal (%s)", strerror(errno));
clearerr(journal);
}
}
}
int
journal_startup(void)
{
if (!keep_journal)
return 0;
journal = journal_open();
if (!journal) {
logerror("Can't open %s (%s)", journal_fname, strerror(errno));
return -1;
}
journal_entry("startup");
return 0;
}
void
journal_shutdown(void)
{
journal_entry("shutdown");
if (journal) {
fclose(journal);
journal = NULL;
}
}
int
journal_reopen(void)
{
FILE *j;
if (!keep_journal)
return 0;
j = journal_open();
if (!j) {
logerror("Can't open %s (%s)", journal_fname, strerror(errno));
return -1;
}
if (journal)
fclose(journal);
journal = j;
return 0;
}
void
journal_login(void)
{
journal_entry("login %d %s %s",
player->cnum, player->hostaddr, player->userid);
}
void
journal_logout(void)
{
journal_entry("logout %d", player->cnum);
}
void
journal_input(char *input)
{
journal_entry("input %s", input);
}
void
journal_update(int etu)
{
journal_entry("update %d", etu);
}