new upstream

git-svn-id: file:///srv/svn/joey/trunk/src/packages/bsdgames@10080 a4a2c43b-8ac3-0310-8836-e0e880c912e2
This commit is contained in:
joey
2004-02-14 21:35:37 +00:00
parent 26fb70d304
commit a02c126403
224 changed files with 5624 additions and 2217 deletions

View File

@@ -1,6 +1,6 @@
# Makefrag - makefile fragment for dm
#
# Copyright (c) 1997, 1998, 1999 Joseph Samuel Myers.
# Copyright (c) 1997, 1998, 1999, 2004 Joseph Samuel Myers.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
# SUCH DAMAGE.
# Add -DLOG if you want logging
dm_DEFS := $(GETLOADAVG_DEFS) # -DLOG
dm_DEFS := $(GETLOADAVG_DEFS) -D_GNU_SOURCE -DSUPPORT_UTMPX -DSUPPORT_UTMP # -DLOG
dm_DIRS := $(GAMESDIR) $(MAN8DIR) $(MAN5DIR)
dm_all: dm/dm dm/dm.8 dm/dm.conf.5

View File

@@ -1,13 +0,0 @@
1997-08-07
Dm is the `dungeon master', a program that allows you to control when
users can play games. (Note that this does not control any private
copies of games they may have). I do not claim that this program is
actually useful, but it is included in bsd-games since it is in
NetBSD.
Add -DLOG to the DEFS in the Makefile if you want logging of games
playing.
Joseph S. Myers
jsm@polyomino.org.uk

45
dm/dm.c
View File

@@ -1,5 +1,4 @@
/* $NetBSD: dm.c,v 1.18 2003/08/07 09:37:11 agc Exp $ */
/* For Linux: still using old utmp interface from version 1.16. */
/* $NetBSD: dm.c,v 1.20 2004/02/08 22:23:50 jsm Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -40,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
#if 0
static char sccsid[] = "@(#)dm.c 8.1 (Berkeley) 5/31/93";
#else
__RCSID("$NetBSD: dm.c,v 1.18 2003/08/07 09:37:11 agc Exp $");
__RCSID("$NetBSD: dm.c,v 1.20 2004/02/08 22:23:50 jsm Exp $");
#endif
#endif /* not lint */
@@ -58,8 +57,8 @@ __RCSID("$NetBSD: dm.c,v 1.18 2003/08/07 09:37:11 agc Exp $");
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <utmp.h>
#include "utmpentry.h"
#include "pathnames.h"
static time_t now; /* current time value */
@@ -67,16 +66,16 @@ static int priority = 0; /* priority game runs at */
static char *game, /* requested game */
*gametty; /* from tty? */
void c_day __P((const char *, const char *, const char *));
void c_game __P((const char *, const char *, const char *, const char *));
void c_tty __P((const char *));
const char *hour __P((int));
double load __P((void));
int main __P((int, char *[]));
void nogamefile __P((void));
void play __P((char **)) __attribute__((__noreturn__));
void read_config __P((void));
int users __P((void));
void c_day(const char *, const char *, const char *);
void c_game(const char *, const char *, const char *, const char *);
void c_tty(const char *);
const char *hour(int);
double load(void);
int main(int, char *[]);
void nogamefile(void);
void play(char **) __attribute__((__noreturn__));
void read_config(void);
int users(void);
int
main(argc, argv)
@@ -253,16 +252,16 @@ load()
int
users()
{
int nusers, utmp;
struct utmp buf;
static struct utmpentry *ohead = NULL;
struct utmpentry *ep;
int nusers;
if ((utmp = open(_PATH_UTMP, O_RDONLY, 0)) < 0)
err(1, "%s", _PATH_UTMP);
for (nusers = 0; read(utmp, (char *)&buf, sizeof(struct utmp)) > 0;)
if (buf.ut_name[0] != '\0')
++nusers;
return (nusers);
nusers = getutentries(NULL, &ep);
if (ep != ohead) {
freeutentries(ep);
ohead = ep;
}
return nusers;
}
void

278
dm/utmpentry.c Normal file
View File

@@ -0,0 +1,278 @@
/* $NetBSD: utmpentry.c,v 1.4 2003/02/12 17:39:36 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Christos Zoulas.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: utmpentry.c,v 1.4 2003/02/12 17:39:36 christos Exp $");
#endif
#include <sys/stat.h>
#include <time.h>
#include <string.h>
#include <err.h>
#include <stdlib.h>
#ifdef SUPPORT_UTMP
#include <utmp.h>
#endif
#ifdef SUPPORT_UTMPX
#include <utmpx.h>
#endif
#include "utmpentry.h"
#ifdef SUPPORT_UTMP
static void getentry(struct utmpentry *, struct utmp *);
static time_t utmptime = 0;
#endif
#ifdef SUPPORT_UTMPX
static void getentryx(struct utmpentry *, struct utmpx *);
static time_t utmpxtime = 0;
#endif
#if defined(SUPPORT_UTMPX) || defined(SUPPORT_UTMP)
static int setup(const char *);
static void adjust_size(struct utmpentry *e);
#endif
int maxname = 8, maxline = 8, maxhost = 16;
static int numutmp = 0;
static struct utmpentry *ehead;
#if defined(SUPPORT_UTMPX) || defined(SUPPORT_UTMP)
static void
adjust_size(struct utmpentry *e)
{
int max;
if ((max = strlen(e->name)) > maxname)
maxname = max;
if ((max = strlen(e->line)) > maxline)
maxline = max;
if ((max = strlen(e->host)) > maxhost)
maxhost = max;
}
static int
setup(const char *fname)
{
int what = 3;
struct stat st;
if (fname == NULL) {
#ifdef SUPPORT_UTMPX
setutxent();
#endif
#ifdef SUPPORT_UTMP
setutent();
#endif
} else {
size_t len = strlen(fname);
if (len == 0)
errx(1, "Filename cannot be 0 length.");
what = fname[len - 1] == 'x' ? 1 : 2;
if (what == 1) {
#ifdef SUPPORT_UTMPX
if (utmpxname(fname) == 0)
err(1, "Cannot open `%s'", fname);
#else
errx(1, "utmpx support not compiled in");
#endif
} else {
#ifdef SUPPORT_UTMP
if (utmpname(fname) == 0)
err(1, "Cannot open `%s'", fname);
#else
errx(1, "utmp support not compiled in");
#endif
}
}
#ifdef SUPPORT_UTMPX
if (what & 1) {
(void)stat(fname ? fname : _PATH_UTMPX, &st);
if (st.st_mtime > utmpxtime)
utmpxtime = st.st_mtime;
else
what &= ~1;
}
#endif
#ifdef SUPPORT_UTMP
if (what & 2) {
(void)stat(fname ? fname : _PATH_UTMP, &st);
if (st.st_mtime > utmptime)
utmptime = st.st_mtime;
else
what &= ~2;
}
#endif
return what;
}
#endif
void
freeutentries(struct utmpentry *ep)
{
#ifdef SUPPORT_UTMP
utmptime = 0;
#endif
#ifdef SUPPORT_UTMPX
utmpxtime = 0;
#endif
if (ep == ehead) {
ehead = NULL;
numutmp = 0;
}
while (ep) {
struct utmpentry *sep = ep;
ep = ep->next;
free(sep);
}
}
int
getutentries(const char *fname, struct utmpentry **epp)
{
#ifdef SUPPORT_UTMPX
struct utmpx *utx;
#endif
#ifdef SUPPORT_UTMP
struct utmp *ut;
#endif
#if defined(SUPPORT_UTMP) || defined(SUPPORT_UTMPX)
struct utmpentry *ep;
int what = setup(fname);
struct utmpentry **nextp = &ehead;
if (what == 0) {
*epp = ehead;
return numutmp;
} else {
ehead = NULL;
numutmp = 0;
}
#endif
#ifdef SUPPORT_UTMPX
while ((what & 1) && (utx = getutxent()) != NULL) {
if (fname == NULL && utx->ut_type != USER_PROCESS)
continue;
if ((ep = calloc(1, sizeof(struct utmpentry))) == NULL)
err(1, NULL);
getentryx(ep, utx);
*nextp = ep;
nextp = &(ep->next);
}
#endif
#ifdef SUPPORT_UTMP
while ((what & 2) && (ut = getutent()) != NULL) {
if (fname == NULL && (*ut->ut_name == '\0' ||
*ut->ut_line == '\0'))
continue;
/* Don't process entries that we have utmpx for */
for (ep = ehead; ep != NULL; ep = ep->next) {
if (strncmp(ep->line, ut->ut_line,
sizeof(ut->ut_line)) == 0)
break;
}
if (ep != NULL)
continue;
if ((ep = calloc(1, sizeof(struct utmpentry))) == NULL)
err(1, NULL);
getentry(ep, ut);
*nextp = ep;
nextp = &(ep->next);
}
#endif
numutmp = 0;
#if defined(SUPPORT_UTMP) && defined(SUPPORT_UTMPX)
if (ehead != NULL) {
struct utmpentry *from = ehead, *save;
ehead = NULL;
while (from != NULL) {
for (nextp = &ehead;
(*nextp) && strcmp(from->line, (*nextp)->line) > 0;
nextp = &(*nextp)->next)
continue;
save = from;
from = from->next;
save->next = *nextp;
*nextp = save;
numutmp++;
}
}
*epp = ehead;
return numutmp;
#else
*epp = NULL;
return 0;
#endif
}
#ifdef SUPPORT_UTMP
static void
getentry(struct utmpentry *e, struct utmp *up)
{
(void)strncpy(e->name, up->ut_name, sizeof(up->ut_name));
e->name[sizeof(e->name) - 1] = '\0';
(void)strncpy(e->line, up->ut_line, sizeof(up->ut_line));
e->line[sizeof(e->line) - 1] = '\0';
(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
e->name[sizeof(e->host) - 1] = '\0';
e->tv.tv_sec = up->ut_time;
e->tv.tv_usec = 0;
adjust_size(e);
}
#endif
#ifdef SUPPORT_UTMPX
static void
getentryx(struct utmpentry *e, struct utmpx *up)
{
(void)strncpy(e->name, up->ut_name, sizeof(up->ut_name));
e->name[sizeof(e->name) - 1] = '\0';
(void)strncpy(e->line, up->ut_line, sizeof(up->ut_line));
e->line[sizeof(e->line) - 1] = '\0';
(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
e->name[sizeof(e->host) - 1] = '\0';
e->tv = up->ut_tv;
adjust_size(e);
}
#endif

50
dm/utmpentry.h Normal file
View File

@@ -0,0 +1,50 @@
/* $NetBSD: utmpentry.h,v 1.2 2003/11/28 23:52:34 wiz Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Christos Zoulas.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
struct utmpentry {
char name[65];
char line[65];
char host[257];
struct timeval tv;
struct utmpentry *next;
};
extern int maxname, maxline, maxhost;
int getutentries(const char *, struct utmpentry **);
void freeutentries(struct utmpentry *);