Module Name: src
Committed By: matt
Date: Wed Apr 21 05:25:15 UTC 2010
Modified Files:
src/games/fortune/strfile [matt-nb5-mips64]: strfile.8
src/games/hack [matt-nb5-mips64]: extern.h hack.do_name.c hack.eat.c
hack.end.c hack.fight.c hack.h hack.invent.c hack.main.c
hack.objnam.c hack.options.c hack.pri.c hack.rip.c hack.shk.c
hack.topl.c hack.unix.c
src/games/hunt/huntd [matt-nb5-mips64]: answer.c
src/games/rogue [matt-nb5-mips64]: monster.c
Log Message:
sync to netbsd-5
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.38.1 src/games/fortune/strfile/strfile.8
cvs rdiff -u -r1.8.8.1 -r1.8.8.1.2.1 src/games/hack/extern.h
cvs rdiff -u -r1.7.14.2 -r1.7.14.2.2.1 src/games/hack/hack.do_name.c
cvs rdiff -u -r1.6.42.1 -r1.6.42.1.2.1 src/games/hack/hack.eat.c
cvs rdiff -u -r1.9.14.1 -r1.9.14.1.2.1 src/games/hack/hack.end.c \
src/games/hack/hack.pri.c
cvs rdiff -u -r1.8.14.1 -r1.8.14.1.2.1 src/games/hack/hack.fight.c
cvs rdiff -u -r1.10.42.1 -r1.10.42.1.2.1 src/games/hack/hack.h
cvs rdiff -u -r1.10.30.2 -r1.10.30.2.2.1 src/games/hack/hack.invent.c
cvs rdiff -u -r1.10.14.2 -r1.10.14.2.2.1 src/games/hack/hack.main.c
cvs rdiff -u -r1.7.14.1 -r1.7.14.1.2.1 src/games/hack/hack.objnam.c
cvs rdiff -u -r1.7.42.1 -r1.7.42.1.2.1 src/games/hack/hack.options.c
cvs rdiff -u -r1.8.14.2 -r1.8.14.2.2.1 src/games/hack/hack.rip.c \
src/games/hack/hack.topl.c
cvs rdiff -u -r1.8.30.1 -r1.8.30.1.2.1 src/games/hack/hack.shk.c
cvs rdiff -u -r1.9.42.2 -r1.9.42.2.2.1 src/games/hack/hack.unix.c
cvs rdiff -u -r1.9.14.1 -r1.9.14.1.2.1 src/games/hunt/huntd/answer.c
cvs rdiff -u -r1.14 -r1.14.16.1 src/games/rogue/monster.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/strfile/strfile.8
diff -u src/games/fortune/strfile/strfile.8:1.12 src/games/fortune/strfile/strfile.8:1.12.38.1
--- src/games/fortune/strfile/strfile.8:1.12 Thu Sep 9 22:03:21 2004
+++ src/games/fortune/strfile/strfile.8 Wed Apr 21 05:25:14 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: strfile.8,v 1.12 2004/09/09 22:03:21 wiz Exp $
+.\" $NetBSD: strfile.8,v 1.12.38.1 2010/04/21 05:25:14 matt Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)strfile.8 8.1 (Berkeley) 6/9/93
.\"
-.Dd June 9, 1993
+.Dd January 17, 2010
.Dt STRFILE 8
.Os
.Sh NAME
@@ -57,7 +57,7 @@
This allows random access of the strings.
.Pp
The output file, if not specified on the command line, is named
-.Ar source_file Ns Sy .out .
+.Ar source_file Ns Sy .dat .
.Pp
The options are as follows:
.Bl -tag -width "-c char"
@@ -130,7 +130,7 @@
to dump them out in the table order.
.Sh FILES
.Bl -tag -width strfile.out -compact
-.It Pa strfile.out
+.It Pa strfile.dat
default output file.
.El
.Sh SEE ALSO
Index: src/games/hack/extern.h
diff -u src/games/hack/extern.h:1.8.8.1 src/games/hack/extern.h:1.8.8.1.2.1
--- src/games/hack/extern.h:1.8.8.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/extern.h Wed Apr 21 05:25:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.8.8.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: extern.h,v 1.8.8.1.2.1 2010/04/21 05:25:14 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
Index: src/games/hack/hack.do_name.c
diff -u src/games/hack/hack.do_name.c:1.7.14.2 src/games/hack/hack.do_name.c:1.7.14.2.2.1
--- src/games/hack/hack.do_name.c:1.7.14.2 Mon Jun 29 23:25:09 2009
+++ src/games/hack/hack.do_name.c Wed Apr 21 05:25:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.do_name.c,v 1.7.14.2 2009/06/29 23:25:09 snj Exp $ */
+/* $NetBSD: hack.do_name.c,v 1.7.14.2.2.1 2010/04/21 05:25:14 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.do_name.c,v 1.7.14.2 2009/06/29 23:25:09 snj Exp $");
+__RCSID("$NetBSD: hack.do_name.c,v 1.7.14.2.2.1 2010/04/21 05:25:14 matt Exp $");
#endif /* not lint */
#include <stdlib.h>
Index: src/games/hack/hack.eat.c
diff -u src/games/hack/hack.eat.c:1.6.42.1 src/games/hack/hack.eat.c:1.6.42.1.2.1
--- src/games/hack/hack.eat.c:1.6.42.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/hack.eat.c Wed Apr 21 05:25:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.eat.c,v 1.6.42.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: hack.eat.c,v 1.6.42.1.2.1 2010/04/21 05:25:14 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.eat.c,v 1.6.42.1 2009/06/29 23:22:24 snj Exp $");
+__RCSID("$NetBSD: hack.eat.c,v 1.6.42.1.2.1 2010/04/21 05:25:14 matt Exp $");
#endif /* not lint */
#include "hack.h"
Index: src/games/hack/hack.end.c
diff -u src/games/hack/hack.end.c:1.9.14.1 src/games/hack/hack.end.c:1.9.14.1.2.1
--- src/games/hack/hack.end.c:1.9.14.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/hack.end.c Wed Apr 21 05:25:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.end.c,v 1.9.14.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: hack.end.c,v 1.9.14.1.2.1 2010/04/21 05:25:14 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.end.c,v 1.9.14.1 2009/06/29 23:22:24 snj Exp $");
+__RCSID("$NetBSD: hack.end.c,v 1.9.14.1.2.1 2010/04/21 05:25:14 matt Exp $");
#endif /* not lint */
#include <signal.h>
Index: src/games/hack/hack.pri.c
diff -u src/games/hack/hack.pri.c:1.9.14.1 src/games/hack/hack.pri.c:1.9.14.1.2.1
--- src/games/hack/hack.pri.c:1.9.14.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/hack.pri.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.pri.c,v 1.9.14.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: hack.pri.c,v 1.9.14.1.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.pri.c,v 1.9.14.1 2009/06/29 23:22:24 snj Exp $");
+__RCSID("$NetBSD: hack.pri.c,v 1.9.14.1.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include "hack.h"
Index: src/games/hack/hack.fight.c
diff -u src/games/hack/hack.fight.c:1.8.14.1 src/games/hack/hack.fight.c:1.8.14.1.2.1
--- src/games/hack/hack.fight.c:1.8.14.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/hack.fight.c Wed Apr 21 05:25:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.fight.c,v 1.8.14.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: hack.fight.c,v 1.8.14.1.2.1 2010/04/21 05:25:14 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.fight.c,v 1.8.14.1 2009/06/29 23:22:24 snj Exp $");
+__RCSID("$NetBSD: hack.fight.c,v 1.8.14.1.2.1 2010/04/21 05:25:14 matt Exp $");
#endif /* not lint */
#include "hack.h"
Index: src/games/hack/hack.h
diff -u src/games/hack/hack.h:1.10.42.1 src/games/hack/hack.h:1.10.42.1.2.1
--- src/games/hack/hack.h:1.10.42.1 Mon Jun 29 23:25:09 2009
+++ src/games/hack/hack.h Wed Apr 21 05:25:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.h,v 1.10.42.1 2009/06/29 23:25:09 snj Exp $ */
+/* $NetBSD: hack.h,v 1.10.42.1.2.1 2010/04/21 05:25:14 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
Index: src/games/hack/hack.invent.c
diff -u src/games/hack/hack.invent.c:1.10.30.2 src/games/hack/hack.invent.c:1.10.30.2.2.1
--- src/games/hack/hack.invent.c:1.10.30.2 Mon Jun 29 23:25:09 2009
+++ src/games/hack/hack.invent.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.invent.c,v 1.10.30.2 2009/06/29 23:25:09 snj Exp $ */
+/* $NetBSD: hack.invent.c,v 1.10.30.2.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.invent.c,v 1.10.30.2 2009/06/29 23:25:09 snj Exp $");
+__RCSID("$NetBSD: hack.invent.c,v 1.10.30.2.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include <assert.h>
Index: src/games/hack/hack.main.c
diff -u src/games/hack/hack.main.c:1.10.14.2 src/games/hack/hack.main.c:1.10.14.2.2.1
--- src/games/hack/hack.main.c:1.10.14.2 Mon Jun 29 23:25:09 2009
+++ src/games/hack/hack.main.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.main.c,v 1.10.14.2 2009/06/29 23:25:09 snj Exp $ */
+/* $NetBSD: hack.main.c,v 1.10.14.2.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.main.c,v 1.10.14.2 2009/06/29 23:25:09 snj Exp $");
+__RCSID("$NetBSD: hack.main.c,v 1.10.14.2.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include <signal.h>
Index: src/games/hack/hack.objnam.c
diff -u src/games/hack/hack.objnam.c:1.7.14.1 src/games/hack/hack.objnam.c:1.7.14.1.2.1
--- src/games/hack/hack.objnam.c:1.7.14.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/hack.objnam.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.objnam.c,v 1.7.14.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: hack.objnam.c,v 1.7.14.1.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.objnam.c,v 1.7.14.1 2009/06/29 23:22:24 snj Exp $");
+__RCSID("$NetBSD: hack.objnam.c,v 1.7.14.1.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include <stdlib.h>
Index: src/games/hack/hack.options.c
diff -u src/games/hack/hack.options.c:1.7.42.1 src/games/hack/hack.options.c:1.7.42.1.2.1
--- src/games/hack/hack.options.c:1.7.42.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/hack.options.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.options.c,v 1.7.42.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: hack.options.c,v 1.7.42.1.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.options.c,v 1.7.42.1 2009/06/29 23:22:24 snj Exp $");
+__RCSID("$NetBSD: hack.options.c,v 1.7.42.1.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include <stdlib.h>
Index: src/games/hack/hack.rip.c
diff -u src/games/hack/hack.rip.c:1.8.14.2 src/games/hack/hack.rip.c:1.8.14.2.2.1
--- src/games/hack/hack.rip.c:1.8.14.2 Mon Jun 29 23:25:09 2009
+++ src/games/hack/hack.rip.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.rip.c,v 1.8.14.2 2009/06/29 23:25:09 snj Exp $ */
+/* $NetBSD: hack.rip.c,v 1.8.14.2.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.rip.c,v 1.8.14.2 2009/06/29 23:25:09 snj Exp $");
+__RCSID("$NetBSD: hack.rip.c,v 1.8.14.2.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include "hack.h"
Index: src/games/hack/hack.topl.c
diff -u src/games/hack/hack.topl.c:1.8.14.2 src/games/hack/hack.topl.c:1.8.14.2.2.1
--- src/games/hack/hack.topl.c:1.8.14.2 Mon Jun 29 23:25:09 2009
+++ src/games/hack/hack.topl.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.topl.c,v 1.8.14.2 2009/06/29 23:25:09 snj Exp $ */
+/* $NetBSD: hack.topl.c,v 1.8.14.2.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.topl.c,v 1.8.14.2 2009/06/29 23:25:09 snj Exp $");
+__RCSID("$NetBSD: hack.topl.c,v 1.8.14.2.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include <stdlib.h>
Index: src/games/hack/hack.shk.c
diff -u src/games/hack/hack.shk.c:1.8.30.1 src/games/hack/hack.shk.c:1.8.30.1.2.1
--- src/games/hack/hack.shk.c:1.8.30.1 Mon Jun 29 23:22:24 2009
+++ src/games/hack/hack.shk.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.shk.c,v 1.8.30.1 2009/06/29 23:22:24 snj Exp $ */
+/* $NetBSD: hack.shk.c,v 1.8.30.1.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.shk.c,v 1.8.30.1 2009/06/29 23:22:24 snj Exp $");
+__RCSID("$NetBSD: hack.shk.c,v 1.8.30.1.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
#include <stdlib.h>
Index: src/games/hack/hack.unix.c
diff -u src/games/hack/hack.unix.c:1.9.42.2 src/games/hack/hack.unix.c:1.9.42.2.2.1
--- src/games/hack/hack.unix.c:1.9.42.2 Mon Jun 29 23:25:09 2009
+++ src/games/hack/hack.unix.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hack.unix.c,v 1.9.42.2 2009/06/29 23:25:09 snj Exp $ */
+/* $NetBSD: hack.unix.c,v 1.9.42.2.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hack.unix.c,v 1.9.42.2 2009/06/29 23:25:09 snj Exp $");
+__RCSID("$NetBSD: hack.unix.c,v 1.9.42.2.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
/* This file collects some Unix dependencies; hack.pager.c contains some more */
Index: src/games/hunt/huntd/answer.c
diff -u src/games/hunt/huntd/answer.c:1.9.14.1 src/games/hunt/huntd/answer.c:1.9.14.1.2.1
--- src/games/hunt/huntd/answer.c:1.9.14.1 Sun Jun 28 19:53:30 2009
+++ src/games/hunt/huntd/answer.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: answer.c,v 1.9.14.1 2009/06/28 19:53:30 snj Exp $ */
+/* $NetBSD: answer.c,v 1.9.14.1.2.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: answer.c,v 1.9.14.1 2009/06/28 19:53:30 snj Exp $");
+__RCSID("$NetBSD: answer.c,v 1.9.14.1.2.1 2010/04/21 05:25:15 matt Exp $");
#endif /* not lint */
# include <ctype.h>
Index: src/games/rogue/monster.c
diff -u src/games/rogue/monster.c:1.14 src/games/rogue/monster.c:1.14.16.1
--- src/games/rogue/monster.c:1.14 Mon Jan 14 03:50:01 2008
+++ src/games/rogue/monster.c Wed Apr 21 05:25:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: monster.c,v 1.14 2008/01/14 03:50:01 dholland Exp $ */
+/* $NetBSD: monster.c,v 1.14.16.1 2010/04/21 05:25:15 matt Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)monster.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: monster.c,v 1.14 2008/01/14 03:50:01 dholland Exp $");
+__RCSID("$NetBSD: monster.c,v 1.14.16.1 2010/04/21 05:25:15 matt Exp $");
#endif
#endif /* not lint */
@@ -671,7 +671,7 @@
for (i = 0; i < 9; i++) {
rand_around(i, &row, &col);
- if (((row == rogue.row) && (col = rogue.col)) ||
+ if (((row == rogue.row) && (col == rogue.col)) ||
(row < MIN_ROW) || (row > (DROWS-2)) ||
(col < 0) || (col > (DCOLS-1))) {
continue;
