From 26fb70d3040969731cb58553cbb7a06b0c23a6cc Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 21 Dec 2003 04:22:40 +0000 Subject: [PATCH] * New upstream release. - Fix backgammon scoring bug related to peices on the bar and gammons. Closes: #185101 - Fix backgammon tutorial text. Closes: #212478 - Advertising clause is gone from most, but not all licenses. - Apparently better fix for boggle man page. - Incorporates nearly all changes in Debian diff. git-svn-id: file:///srv/svn/joey/trunk/src/packages/bsdgames@9782 a4a2c43b-8ac3-0310-8836-e0e880c912e2 --- COPYING | 83 +- ChangeLog | 244 ++++ INSTALL | 53 +- Makeconfig.in | 1 + NEWS | 17 + PACKAGING | 9 +- README | 13 +- THANKS | 2 +- TODO | 6 - adventure/Makefile.bsd | 11 +- adventure/adventure.6 | 8 +- adventure/crc.c | 10 +- adventure/done.c | 10 +- adventure/glorkz | 6 +- adventure/hdr.h | 8 +- adventure/init.c | 10 +- adventure/io.c | 14 +- adventure/main.c | 10 +- adventure/save.c | 10 +- adventure/setup.c | 10 +- adventure/subr.c | 10 +- adventure/vocab.c | 10 +- adventure/wizard.c | 10 +- arithmetic/arithmetic.6 | 12 +- arithmetic/arithmetic.c | 10 +- atc/Makefile.bsd | 4 +- atc/atc.6.in | 19 +- atc/def.h | 8 +- atc/extern.c | 10 +- atc/extern.h | 8 +- atc/grammar.y | 10 +- atc/graphics.c | 10 +- atc/include.h | 8 +- atc/input.c | 10 +- atc/lex.l | 10 +- atc/list.c | 10 +- atc/log.c | 10 +- atc/main.c | 10 +- atc/pathnames.h.in | 8 +- atc/struct.h | 8 +- atc/tunable.c | 10 +- atc/tunable.h | 8 +- atc/update.c | 10 +- backgammon/backgammon/backgammon.6.in | 16 +- backgammon/backgammon/extra.c | 10 +- backgammon/backgammon/main.c | 12 +- backgammon/backgammon/move.c | 10 +- backgammon/backgammon/text.c | 10 +- backgammon/backgammon/version.c | 10 +- backgammon/common_source/allow.c | 10 +- backgammon/common_source/back.h | 8 +- backgammon/common_source/board.c | 10 +- backgammon/common_source/check.c | 10 +- backgammon/common_source/fancy.c | 10 +- backgammon/common_source/init.c | 10 +- backgammon/common_source/odds.c | 10 +- backgammon/common_source/one.c | 10 +- backgammon/common_source/save.c | 10 +- backgammon/common_source/subs.c | 10 +- backgammon/common_source/table.c | 10 +- backgammon/teachgammon/data.c | 14 +- backgammon/teachgammon/teach.c | 10 +- backgammon/teachgammon/ttext1.c | 10 +- backgammon/teachgammon/ttext2.c | 10 +- backgammon/teachgammon/tutor.c | 10 +- backgammon/teachgammon/tutor.h | 8 +- banner/banner.6 | 8 +- banner/banner.c | 10 +- battlestar/battlestar.6 | 12 +- battlestar/battlestar.c | 10 +- battlestar/command1.c | 10 +- battlestar/command2.c | 10 +- battlestar/command3.c | 10 +- battlestar/command4.c | 10 +- battlestar/command5.c | 10 +- battlestar/command6.c | 10 +- battlestar/command7.c | 10 +- battlestar/cypher.c | 10 +- battlestar/dayfile.c | 10 +- battlestar/dayobjs.c | 10 +- battlestar/extern.h | 8 +- battlestar/fly.c | 10 +- battlestar/getcom.c | 10 +- battlestar/globals.c | 10 +- battlestar/init.c | 10 +- battlestar/misc.c | 10 +- battlestar/nightfile.c | 10 +- battlestar/nightobjs.c | 10 +- battlestar/parse.c | 10 +- battlestar/pathnames.h.in | 8 +- battlestar/room.c | 10 +- battlestar/save.c | 10 +- battlestar/words.c | 10 +- bcd/bcd.6 | 8 +- bcd/bcd.c | 10 +- boggle/Makefile.bsd | 4 +- boggle/boggle/bog.c | 10 +- boggle/boggle/bog.h.in | 8 +- boggle/boggle/boggle.6 | 10 +- boggle/boggle/extern.h | 8 +- boggle/boggle/help.c | 10 +- boggle/boggle/mach.c | 10 +- boggle/boggle/prtable.c | 10 +- boggle/boggle/timer.c | 10 +- boggle/boggle/word.c | 10 +- boggle/mkdict/mkdict.c | 10 +- boggle/mkindex/mkindex.c | 10 +- bsd-games.lsm | 6 +- caesar/caesar.6 | 8 +- caesar/caesar.c | 10 +- canfield/canfield/canfield.6.in | 8 +- canfield/canfield/canfield.c | 10 +- canfield/canfield/pathnames.h.in | 8 +- canfield/cfscores/cfscores.c | 10 +- configure | 1 + countmail/countmail.6 | 4 +- cribbage/cards.c | 10 +- cribbage/crib.c | 10 +- cribbage/cribbage.6.in | 8 +- cribbage/cribbage.h | 8 +- cribbage/cribcur.h | 8 +- cribbage/deck.h | 8 +- cribbage/extern.c | 10 +- cribbage/instr.c | 10 +- cribbage/io.c | 10 +- cribbage/pathnames.h.in | 8 +- cribbage/score.c | 10 +- cribbage/support.c | 10 +- dm/dm.8.in | 8 +- dm/dm.c | 10 +- dm/dm.conf.5.in | 8 +- dm/pathnames.h.in | 8 +- factor/factor.6 | 8 +- factor/factor.c | 10 +- fish/fish.6 | 8 +- fish/fish.c | 10 +- fish/pathnames.h.in | 8 +- fortune/datfiles/Makefile.bsd | 13 +- fortune/datfiles/Makefrag | 6 +- fortune/datfiles/farber | 17 +- fortune/datfiles/fortunes | 125 +- fortune/datfiles/fortunes-o.real | 298 ---- fortune/datfiles/fortunes2 | 345 +---- fortune/datfiles/fortunes2-o.real | 1697 ++-------------------- fortune/datfiles/limerick | 120 +- fortune/datfiles/limerick-o.real | 1932 ++++++++++++++++++------- fortune/datfiles/netbsd | 29 +- fortune/datfiles/netbsd-o.real | 88 +- fortune/datfiles/startrek | 11 +- fortune/datfiles/startrek.sp.ok | 2 +- fortune/datfiles/zippy | 54 +- fortune/datfiles/zippy.sp.ok | 2 +- fortune/fortune/fortune.6.in | 8 +- fortune/fortune/fortune.c | 16 +- fortune/fortune/pathnames.h.in | 10 +- fortune/strfile/strfile.8 | 8 +- fortune/strfile/strfile.c | 10 +- fortune/strfile/strfile.h | 8 +- fortune/unstr/unstr.c | 10 +- gomoku/bdinit.c | 10 +- gomoku/bdisp.c | 10 +- gomoku/gomoku.6 | 8 +- gomoku/gomoku.h | 8 +- gomoku/main.c | 10 +- gomoku/makemove.c | 10 +- gomoku/pickmove.c | 10 +- gomoku/stoc.c | 10 +- hack/.cvsignore | 10 + hack/COPYRIGHT | 2 +- hack/COPYRIGHT-JF | 2 +- hack/Makefile.bsd | 28 +- hack/alloc.c | 4 +- hack/config.h | 5 +- hack/date.h | 2 +- hack/def.edog.h | 2 +- hack/def.eshk.h | 2 +- hack/def.flag.h | 2 +- hack/def.func_tab.h | 2 +- hack/def.gen.h | 2 +- hack/def.gold.h | 2 +- hack/def.mkroom.h | 2 +- hack/def.monst.h | 2 +- hack/def.obj.h | 2 +- hack/def.objclass.h | 2 +- hack/def.objects.h | 2 +- hack/def.permonst.h | 2 +- hack/def.rm.h | 2 +- hack/def.trap.h | 2 +- hack/def.wseg.h | 2 +- hack/hack.6.in | 4 +- hack/hack.Decl.c | 4 +- hack/hack.apply.c | 4 +- hack/hack.bones.c | 4 +- hack/hack.c | 4 +- hack/hack.cmd.c | 4 +- hack/hack.do.c | 4 +- hack/hack.do_name.c | 4 +- hack/hack.do_wear.c | 4 +- hack/hack.dog.c | 4 +- hack/hack.eat.c | 4 +- hack/hack.end.c | 4 +- hack/hack.engrave.c | 4 +- hack/hack.fight.c | 4 +- hack/hack.h | 2 +- hack/hack.invent.c | 4 +- hack/hack.ioctl.c | 4 +- hack/hack.lev.c | 4 +- hack/hack.main.c | 4 +- hack/hack.makemon.c | 4 +- hack/hack.mfndpos.h | 2 +- hack/hack.mhitu.c | 4 +- hack/hack.mklev.c | 4 +- hack/hack.mkmaze.c | 4 +- hack/hack.mkobj.c | 4 +- hack/hack.mkshop.c | 4 +- hack/hack.mon.c | 4 +- hack/hack.monst.c | 4 +- hack/hack.o_init.c | 4 +- hack/hack.objnam.c | 4 +- hack/hack.options.c | 4 +- hack/hack.pager.c | 4 +- hack/hack.potion.c | 4 +- hack/hack.pri.c | 4 +- hack/hack.read.c | 4 +- hack/hack.rip.c | 4 +- hack/hack.rumors.c | 4 +- hack/hack.save.c | 4 +- hack/hack.search.c | 4 +- hack/hack.sh | 2 +- hack/hack.shk.c | 4 +- hack/hack.shknam.c | 4 +- hack/hack.steal.c | 4 +- hack/hack.termcap.c | 4 +- hack/hack.timeout.c | 4 +- hack/hack.topl.c | 4 +- hack/hack.track.c | 4 +- hack/hack.trap.c | 4 +- hack/hack.tty.c | 10 +- hack/hack.u_init.c | 4 +- hack/hack.unix.c | 4 +- hack/hack.vault.c | 4 +- hack/hack.version.c | 4 +- hack/hack.wield.c | 4 +- hack/hack.wizard.c | 4 +- hack/hack.worm.c | 4 +- hack/hack.worn.c | 4 +- hack/hack.zap.c | 4 +- hack/makedefs.c | 4 +- hack/pathnames.h.in | 8 +- hack/rnd.c | 4 +- hangman/endgame.c | 10 +- hangman/extern.c | 10 +- hangman/getguess.c | 10 +- hangman/getword.c | 10 +- hangman/hangman.6.in | 8 +- hangman/hangman.h | 8 +- hangman/main.c | 10 +- hangman/pathnames.h.in | 8 +- hangman/playgame.c | 10 +- hangman/prdata.c | 10 +- hangman/prman.c | 10 +- hangman/prword.c | 10 +- hangman/setup.c | 10 +- hunt/Makefile.inc.bsd | 37 +- hunt/hunt/connect.c | 39 +- hunt/hunt/hunt.6.in | 39 +- hunt/hunt/hunt.c | 161 ++- hunt/hunt/otto.c | 37 +- hunt/hunt/playit.c | 35 +- hunt/huntd/answer.c | 35 +- hunt/huntd/bsd.h | 33 +- hunt/huntd/ctl.c | 37 +- hunt/huntd/ctl_transact.c | 37 +- hunt/huntd/draw.c | 35 +- hunt/huntd/driver.c | 35 +- hunt/huntd/execute.c | 35 +- hunt/huntd/expl.c | 35 +- hunt/huntd/extern.c | 35 +- hunt/huntd/faketalk.c | 39 +- hunt/huntd/get_names.c | 35 +- hunt/huntd/hunt.h | 37 +- hunt/huntd/huntd.6.in | 37 +- hunt/huntd/makemaze.c | 35 +- hunt/huntd/pathname.c | 35 +- hunt/huntd/shots.c | 35 +- hunt/huntd/talk_ctl.h | 38 +- hunt/huntd/terminal.c | 35 +- mille/comp.c | 10 +- mille/end.c | 10 +- mille/extern.c | 10 +- mille/init.c | 10 +- mille/mille.6 | 8 +- mille/mille.c | 10 +- mille/mille.h | 8 +- mille/misc.c | 10 +- mille/move.c | 10 +- mille/print.c | 10 +- mille/roll.c | 10 +- mille/save.c | 10 +- mille/table.c | 10 +- mille/types.c | 10 +- mille/varpush.c | 10 +- monop/Makefile.bsd | 14 +- monop/brd.dat | 8 +- monop/cards.c | 10 +- monop/deck.h | 8 +- monop/execute.c | 15 +- monop/getinp.c | 10 +- monop/houses.c | 10 +- monop/initdeck.c | 10 +- monop/jail.c | 10 +- monop/malloc.c | 493 +++++++ monop/misc.c | 10 +- monop/mon.dat | 8 +- monop/monop.6.in | 26 +- monop/monop.c | 12 +- monop/monop.def | 8 +- monop/monop.ext | 8 +- monop/monop.h | 8 +- monop/morg.c | 10 +- monop/pathnames.h.in | 8 +- monop/print.c | 10 +- monop/prop.c | 10 +- monop/prop.dat | 8 +- monop/rent.c | 10 +- monop/roll.c | 10 +- monop/spec.c | 10 +- monop/trade.c | 10 +- morse/morse.c | 10 +- number/number.6 | 8 +- number/number.c | 10 +- phantasia/Makefile.bsd | 19 +- phantasia/main.c | 4 +- phantasia/misc.c | 6 +- phantasia/pathnames.h.in | 8 +- phantasia/phantasia.6 | 5 +- phantasia/phantglobs.h | 138 +- phantasia/setup.c | 8 +- pig/pig.6 | 8 +- pig/pig.c | 10 +- pom/pom.6 | 8 +- pom/pom.c | 10 +- ppt/ppt.c | 10 +- primes/pattern.c | 10 +- primes/pr_tbl.c | 10 +- primes/primes.c | 10 +- primes/primes.h | 8 +- quiz/pathnames.h.in | 8 +- quiz/quiz.6.in | 8 +- quiz/quiz.c | 10 +- quiz/quiz.h | 8 +- quiz/rxp.c | 10 +- rain/rain.6 | 8 +- rain/rain.c | 10 +- random/random.6 | 8 +- random/random.c | 10 +- robots/extern.c | 10 +- robots/flush_in.c | 10 +- robots/init_field.c | 10 +- robots/main.c | 10 +- robots/make_level.c | 10 +- robots/move.c | 10 +- robots/move_robs.c | 10 +- robots/pathnames.h.in | 8 +- robots/play_level.c | 10 +- robots/query.c | 10 +- robots/rnd_pos.c | 10 +- robots/robots.6.in | 8 +- robots/robots.h | 8 +- robots/score.c | 10 +- sail/assorted.c | 10 +- sail/dr_1.c | 10 +- sail/dr_2.c | 10 +- sail/dr_3.c | 10 +- sail/dr_4.c | 10 +- sail/dr_5.c | 10 +- sail/dr_main.c | 10 +- sail/driver.h | 8 +- sail/extern.h | 8 +- sail/game.c | 10 +- sail/globals.c | 10 +- sail/lo_main.c | 10 +- sail/machdep.h | 8 +- sail/main.c | 10 +- sail/misc.c | 10 +- sail/parties.c | 10 +- sail/pathnames.h.in | 8 +- sail/pl_1.c | 10 +- sail/pl_2.c | 10 +- sail/pl_3.c | 10 +- sail/pl_4.c | 10 +- sail/pl_5.c | 10 +- sail/pl_6.c | 10 +- sail/pl_7.c | 10 +- sail/pl_main.c | 10 +- sail/player.h | 8 +- sail/sail.6 | 10 +- sail/sync.c | 10 +- sail/version.c | 10 +- snake/snake/pathnames.h.in | 8 +- snake/snake/snake.6.in | 8 +- snake/snake/snake.c | 10 +- snake/snscore/snscore.c | 10 +- tests/caesar.197816in | 1 + tests/caesar.197816out | 1 + tests/caesar.test | 7 +- tetris/input.c | 8 +- tetris/input.h | 8 +- tetris/pathnames.h.in | 8 +- tetris/scores.c | 8 +- tetris/scores.h | 8 +- tetris/screen.c | 8 +- tetris/screen.h | 8 +- tetris/shapes.c | 8 +- tetris/tetris.6.in | 8 +- tetris/tetris.c | 8 +- tetris/tetris.h | 8 +- trek/USD.doc/Makefile.bsd | 4 +- trek/USD.doc/trek.me | 8 +- trek/abandon.c | 10 +- trek/attack.c | 10 +- trek/autover.c | 10 +- trek/capture.c | 10 +- trek/cgetc.c | 10 +- trek/check_out.c | 10 +- trek/checkcond.c | 10 +- trek/compkl.c | 10 +- trek/computer.c | 10 +- trek/damage.c | 10 +- trek/damaged.c | 10 +- trek/dcrept.c | 10 +- trek/destruct.c | 10 +- trek/dock.c | 10 +- trek/dumpgame.c | 10 +- trek/dumpme.c | 10 +- trek/dumpssradio.c | 10 +- trek/events.c | 10 +- trek/externs.c | 10 +- trek/getcodi.c | 10 +- trek/getpar.c | 10 +- trek/getpar.h | 10 +- trek/help.c | 10 +- trek/impulse.c | 10 +- trek/initquad.c | 10 +- trek/kill.c | 10 +- trek/klmove.c | 10 +- trek/lose.c | 10 +- trek/lrscan.c | 10 +- trek/main.c | 10 +- trek/move.c | 10 +- trek/nova.c | 10 +- trek/out.c | 10 +- trek/phaser.c | 10 +- trek/play.c | 10 +- trek/ram.c | 10 +- trek/ranf.c | 10 +- trek/rest.c | 10 +- trek/schedule.c | 10 +- trek/score.c | 10 +- trek/setup.c | 10 +- trek/setwarp.c | 10 +- trek/shield.c | 10 +- trek/snova.c | 10 +- trek/srscan.c | 10 +- trek/systemname.c | 10 +- trek/torped.c | 10 +- trek/trek.6 | 8 +- trek/trek.h | 8 +- trek/visual.c | 10 +- trek/warp.c | 10 +- trek/win.c | 10 +- worm/worm.6 | 8 +- worm/worm.c | 10 +- worms/worms.6 | 8 +- worms/worms.c | 10 +- wtf/Makefrag | 3 +- wtf/acronyms | 50 +- wtf/acronyms.comp | 185 +++ wtf/wtf.6.in | 25 +- wtf/wtf.in | 34 +- wump/pathnames.h.in | 8 +- wump/wump.6 | 8 +- wump/wump.c | 10 +- 483 files changed, 4897 insertions(+), 5791 deletions(-) create mode 100644 hack/.cvsignore create mode 100644 monop/malloc.c create mode 100644 tests/caesar.197816in create mode 100644 tests/caesar.197816out create mode 100644 wtf/acronyms.comp diff --git a/COPYING b/COPYING index 1159c47..3779480 100644 --- a/COPYING +++ b/COPYING @@ -8,6 +8,36 @@ Most games are under the standard BSD terms: Copyright (c) 1980, 1982, 1983, 1985-1994 The Regents of the University of California. All rights reserved. + 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. Neither the name of the University 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 REGENTS 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 REGENTS 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. + +The files "caesar/rot13.in" and "wargames/wargames" have a similar +licence but with an additional advertising clause: + + Copyright (c) 1985, 1992, 1993 + The Regents of the University of California. All rights reserved. + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -36,6 +66,41 @@ Most games are under the standard BSD terms: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +The game "hunt" has a similar licence, mentioning the University of +California, San Francisco: + + Copyright (c) 1983-2003, Regents of the University of California. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + + Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 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. + + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + OWNER 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. + +These terms also apply to "hunt/Makeconfig", which is derived from the +hunt "Makefile.inc" distributed by NetBSD. + The files "backgammon/backgammon/backlocal.h", "countmail/countmail", "hack/extern.h", "robots/auto.c", "sail/display.h" and "sail/restart.h" have a similar licence, but copyright is held by the @@ -202,24 +267,6 @@ Brachman, but he confirmed that he had assigned his copyright to the University of California and the continued inclusion of the old copyright notice was an omission on their part. -The game "hunt" appears to be copyrighted by its authors and the -University of California: - - Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - San Francisco, California - - Copyright (c) 1983, 1985 Regents of the University of California. - All rights reserved. The Berkeley software License Agreement - specifies the terms and conditions for redistribution. - - Hunt is part of the user-contributed software distributed by - Berkeley in 4BSD. The sources are copyrighted by the authors - and the University of California. You may redistribute freely - as long as the copyright notices are retained. - -These terms also apply to "hunt/Makeconfig", which is derived from the -hunt "Makefile.inc" distributed by NetBSD. - The game "phantasia" is not copyright (except for "phantasia/pathnames.h.in" to which the BSD copyright and licence apply); the notice in "phantasia/COPYRIGHT" applies to it. diff --git a/ChangeLog b/ChangeLog index 2f8efa7..6c80746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,247 @@ +2003-12-18 Joseph S. Myers + + * Version 2.15. + + * NEWS, bsd-games.lsm, bsd-games-non-free.lsm: Update. + + * README: Update. + +2003-12-17 Joseph S. Myers + + * backgammon/backgammon/main.c (main): Only score as a Gammon or a + Backgammon if the opponent hasn't removed any pieces, not if the + opponent has removed pieces but has had a piece knocked back to + the bar afterwards. Fixes Debian bug 185101 from Konstantin + Seiler . + + * fortune/fortune/fortune.c (fortlen): Return proper fortune + length for fortune files without STR_RANDOM or STR_ORDERED rather + than comparing it to SLEN. Bug reported by Simon Williams + . + + * fortune/fortune/fortune.c (init_prob): Show residual probability + rather than non-residual in "No place to put residual probability" + error message. Distribute residual probability correctly rather + than all to one file. Patch from Mike Castle + . + + * configure, Makeconfig.in, fortune/fortune/pathnames.h.in, + fortune/datfiles/Makefrag: Make fortune directory configurable; + default to NetBSD default. + + * rogue/Makefrag: Don't use -fwritable-strings. + * rogue/rogue.h (struct id): Add const. + * TODO: Update. + + * backgammon/teachgammon/data.c: Make tutorial text match actual + moves. From FreeBSD via OpenBSD. Fixes Debian bug 212478 from + Jim W. Jaszewski . + + * adventure/glorkz: Fix capitalisation of compass directions. + + * phantasia/main.c (cleanup): Only close files that have been + opened successfully. + * phantasic/misc.c (error): Give error text rather than errno + number. + Patch from Joey Hess for Debian bug 187251 from + Mikael Hedin . + + * wtf/acronyms: Add two acronyms suggested by Pavel Machek + . + + * wargames/wargames.6: Fix typo. Patch from Joey Hess + . + + * hack/hack.options.c (parseoptions): Refer to 'O' rather than 'o' + as command to set options. Bug reported by Christian Garbs + in Debian bug 191452. + + * caesar/caesar.c (main): Make dot and winnerdot of type double. + Patch from Jan Vornberger in Debian bug 197816. + * tests/caesar.197816in, tests/caesar.197816out: New tests. + * tests/caesar.test: Update. + + * worm/worm.6: Score is in upper right corner, not upper left + corner. Patch from Robert Hunter in + Debian bug 209034. + + * atc/atc.6.in: Document that pressing return allows you to "fast + forward" the game clock. Patch from Peter Maydell + in Debian bug 216980. + + * PACKAGING: Remove some old version references. + + * INSTALL: Simplify and remove some obsolete information. + + * adventure/Makefile.bsd, adventure/adventure.6, adventure/crc.c, + adventure/done.c, adventure/hdr.h, adventure/init.c, + adventure/io.c, adventure/main.c, adventure/save.c, + adventure/setup.c, adventure/subr.c, adventure/vocab.c, + adventure/wizard.c, arithmetic/arithmetic.6, + arithmetic/arithmetic.c, atc/Makefile.bsd, atc/atc.6.in, + atc/def.h, atc/extern.c, atc/extern.h, atc/grammar.y, + atc/graphics.c, atc/include.h, atc/input.c, atc/lex.l, atc/list.c, + atc/log.c, atc/main.c, atc/pathnames.h.in, atc/struct.h, + atc/tunable.c, atc/tunable.h, atc/update.c, + backgammon/backgammon/backgammon.6.in, + backgammon/backgammon/extra.c, backgammon/backgammon/main.c, + backgammon/backgammon/move.c, backgammon/backgammon/text.c, + backgammon/backgammon/version.c, backgammon/common_source/allow.c, + backgammon/common_source/back.h, backgammon/common_source/board.c, + backgammon/common_source/check.c, + backgammon/common_source/fancy.c, backgammon/common_source/init.c, + backgammon/common_source/odds.c, backgammon/common_source/one.c, + backgammon/common_source/save.c, backgammon/common_source/subs.c, + backgammon/common_source/table.c, backgammon/teachgammon/data.c, + backgammon/teachgammon/teach.c, backgammon/teachgammon/ttext1.c, + backgammon/teachgammon/ttext2.c, backgammon/teachgammon/tutor.c, + backgammon/teachgammon/tutor.h, banner/banner.6, banner/banner.c, + battlestar/battlestar.6, battlestar/battlestar.c, + battlestar/command1.c, battlestar/command2.c, + battlestar/command3.c, battlestar/command4.c, + battlestar/command5.c, battlestar/command6.c, + battlestar/command7.c, battlestar/cypher.c, battlestar/dayfile.c, + battlestar/dayobjs.c, battlestar/extern.h, battlestar/fly.c, + battlestar/getcom.c, battlestar/globals.c, battlestar/init.c, + battlestar/misc.c, battlestar/nightfile.c, battlestar/nightobjs.c, + battlestar/parse.c, battlestar/pathnames.h.in, battlestar/room.c, + battlestar/save.c, battlestar/words.c, bcd/bcd.6, bcd/bcd.c, + boggle/Makefile.bsd, boggle/boggle/bog.c, boggle/boggle/bog.h.in, + boggle/boggle/boggle.6, boggle/boggle/extern.h, + boggle/boggle/help.c, boggle/boggle/mach.c, + boggle/boggle/prtable.c, boggle/boggle/timer.c, + boggle/boggle/word.c, boggle/mkdict/mkdict.c, + boggle/mkindex/mkindex.c, caesar/caesar.6, caesar/caesar.c, + canfield/canfield/canfield.6.in, canfield/canfield/canfield.c, + canfield/canfield/pathnames.h.in, canfield/cfscores/cfscores.c, + countmail/countmail.6, cribbage/cards.c, cribbage/crib.c, + cribbage/cribbage.6.in, cribbage/cribbage.h, cribbage/cribcur.h, + cribbage/deck.h, cribbage/extern.c, cribbage/instr.c, + cribbage/io.c, cribbage/pathnames.h.in, cribbage/score.c, + cribbage/support.c, dm/dm.8.in, dm/dm.c, dm/dm.conf.5.in, + dm/pathnames.h.in, factor/factor.6, factor/factor.c, fish/fish.6, + fish/fish.c, fish/pathnames.h.in, fortune/datfiles/Makefile.bsd, + fortune/datfiles/farber, fortune/datfiles/fortunes, + fortune/datfiles/fortunes-o.real, fortune/datfiles/fortunes2, + fortune/datfiles/fortunes2-o.real, fortune/datfiles/limerick, + fortune/datfiles/limerick-o.real, fortune/datfiles/netbsd, + fortune/datfiles/netbsd-o.real, fortune/datfiles/startrek, + fortune/datfiles/startrek.sp.ok, fortune/datfiles/zippy, + fortune/datfiles/zippy.sp.ok, fortune/fortune/fortune.6.in, + fortune/fortune/fortune.c, fortune/fortune/pathnames.h.in, + fortune/strfile/strfile.8, fortune/strfile/strfile.c, + fortune/strfile/strfile.h, fortune/unstr/unstr.c, gomoku/bdinit.c, + gomoku/bdisp.c, gomoku/gomoku.6, gomoku/gomoku.h, gomoku/main.c, + gomoku/makemove.c, gomoku/pickmove.c, gomoku/stoc.c, + hack/COPYRIGHT, hack/COPYRIGHT-JF, hack/Makefile.bsd, + hack/alloc.c, hack/config.h, hack/date.h, hack/def.edog.h, + hack/def.eshk.h, hack/def.flag.h, hack/def.func_tab.h, + hack/def.gen.h, hack/def.gold.h, hack/def.mkroom.h, + hack/def.monst.h, hack/def.obj.h, hack/def.objclass.h, + hack/def.objects.h, hack/def.permonst.h, hack/def.rm.h, + hack/def.trap.h, hack/def.wseg.h, hack/hack.6.in, + hack/hack.Decl.c, hack/hack.apply.c, hack/hack.bones.c, + hack/hack.c, hack/hack.cmd.c, hack/hack.do.c, hack/hack.do_name.c, + hack/hack.do_wear.c, hack/hack.dog.c, hack/hack.eat.c, + hack/hack.end.c, hack/hack.engrave.c, hack/hack.fight.c, + hack/hack.h, hack/hack.invent.c, hack/hack.ioctl.c, + hack/hack.lev.c, hack/hack.main.c, hack/hack.makemon.c, + hack/hack.mfndpos.h, hack/hack.mhitu.c, hack/hack.mklev.c, + hack/hack.mkmaze.c, hack/hack.mkobj.c, hack/hack.mkshop.c, + hack/hack.mon.c, hack/hack.monst.c, hack/hack.o_init.c, + hack/hack.objnam.c, hack/hack.options.c, hack/hack.pager.c, + hack/hack.potion.c, hack/hack.pri.c, hack/hack.read.c, + hack/hack.rip.c, hack/hack.rumors.c, hack/hack.save.c, + hack/hack.search.c, hack/hack.sh, hack/hack.shk.c, + hack/hack.shknam.c, hack/hack.steal.c, hack/hack.termcap.c, + hack/hack.timeout.c, hack/hack.topl.c, hack/hack.track.c, + hack/hack.trap.c, hack/hack.tty.c, hack/hack.u_init.c, + hack/hack.unix.c, hack/hack.vault.c, hack/hack.version.c, + hack/hack.wield.c, hack/hack.wizard.c, hack/hack.worm.c, + hack/hack.worn.c, hack/hack.zap.c, hack/makedefs.c, + hack/pathnames.h.in, hack/rnd.c, hangman/endgame.c, + hangman/extern.c, hangman/getguess.c, hangman/getword.c, + hangman/hangman.6.in, hangman/hangman.h, hangman/main.c, + hangman/pathnames.h.in, hangman/playgame.c, hangman/prdata.c, + hangman/prman.c, hangman/prword.c, hangman/setup.c, + hunt/Makefile.inc.bsd, hunt/hunt/connect.c, hunt/hunt/hunt.6.in, + hunt/hunt/hunt.c, hunt/hunt/otto.c, hunt/hunt/playit.c, + hunt/huntd/answer.c, hunt/huntd/bsd.h, hunt/huntd/ctl.c, + hunt/huntd/ctl_transact.c, hunt/huntd/draw.c, hunt/huntd/driver.c, + hunt/huntd/execute.c, hunt/huntd/expl.c, hunt/huntd/extern.c, + hunt/huntd/faketalk.c, hunt/huntd/get_names.c, hunt/huntd/hunt.h, + hunt/huntd/huntd.6.in, hunt/huntd/makemaze.c, + hunt/huntd/pathname.c, hunt/huntd/shots.c, hunt/huntd/talk_ctl.h, + hunt/huntd/terminal.c, mille/comp.c, mille/end.c, mille/extern.c, + mille/init.c, mille/mille.6, mille/mille.c, mille/mille.h, + mille/misc.c, mille/move.c, mille/print.c, mille/roll.c, + mille/save.c, mille/table.c, mille/types.c, mille/varpush.c, + monop/Makefile.bsd, monop/brd.dat, monop/cards.c, monop/deck.h, + monop/execute.c, monop/getinp.c, monop/houses.c, monop/initdeck.c, + monop/jail.c, monop/malloc.c, monop/misc.c, monop/mon.dat, + monop/monop.6.in, monop/monop.c, monop/monop.def, monop/monop.ext, + monop/monop.h, monop/morg.c, monop/pathnames.h.in, monop/print.c, + monop/prop.c, monop/prop.dat, monop/rent.c, monop/roll.c, + monop/spec.c, monop/trade.c, morse/morse.c, number/number.6, + number/number.c, phantasia/Makefile.bsd, phantasia/main.c, + phantasia/misc.c, phantasia/pathnames.h.in, phantasia/phantasia.6, + phantasia/phantglobs.h, phantasia/setup.c, pig/pig.6, pig/pig.c, + pom/pom.6, pom/pom.c, ppt/ppt.c, primes/pattern.c, + primes/pr_tbl.c, primes/primes.c, primes/primes.h, + quiz/pathnames.h.in, quiz/quiz.6.in, quiz/quiz.c, quiz/quiz.h, + quiz/rxp.c, rain/rain.6, rain/rain.c, random/random.6, + random/random.c, robots/extern.c, robots/flush_in.c, + robots/init_field.c, robots/main.c, robots/make_level.c, + robots/move.c, robots/move_robs.c, robots/pathnames.h.in, + robots/play_level.c, robots/query.c, robots/rnd_pos.c, + robots/robots.6.in, robots/robots.h, robots/score.c, + rogue/USD.doc/Makefile.bsd, rogue/USD.doc/rogue.me, rogue/hit.c, + rogue/init.c, rogue/inventory.c, rogue/level.c, rogue/machdep.c, + rogue/main.c, rogue/message.c, rogue/monster.c, rogue/move.c, + rogue/object.c, rogue/pack.c, rogue/pathnames.h.in, rogue/play.c, + rogue/random.c, rogue/ring.c, rogue/rogue.6.in, rogue/rogue.h, + rogue/room.c, rogue/save.c, rogue/score.c, rogue/spec_hit.c, + rogue/throw.c, rogue/trap.c, rogue/use.c, rogue/zap.c, + sail/assorted.c, sail/dr_1.c, sail/dr_2.c, sail/dr_3.c, + sail/dr_4.c, sail/dr_5.c, sail/dr_main.c, sail/driver.h, + sail/extern.h, sail/game.c, sail/globals.c, sail/lo_main.c, + sail/machdep.h, sail/main.c, sail/misc.c, sail/parties.c, + sail/pathnames.h.in, sail/pl_1.c, sail/pl_2.c, sail/pl_3.c, + sail/pl_4.c, sail/pl_5.c, sail/pl_6.c, sail/pl_7.c, + sail/pl_main.c, sail/player.h, sail/sail.6, sail/sync.c, + sail/version.c, snake/snake/pathnames.h.in, + snake/snake/snake.6.in, snake/snake/snake.c, + snake/snscore/snscore.c, tetris/input.c, tetris/input.h, + tetris/pathnames.h.in, tetris/scores.c, tetris/scores.h, + tetris/screen.c, tetris/screen.h, tetris/shapes.c, + tetris/tetris.6.in, tetris/tetris.c, tetris/tetris.h, + trek/USD.doc/Makefile.bsd, trek/USD.doc/trek.me, trek/abandon.c, + trek/attack.c, trek/autover.c, trek/capture.c, trek/cgetc.c, + trek/check_out.c, trek/checkcond.c, trek/compkl.c, + trek/computer.c, trek/damage.c, trek/damaged.c, trek/dcrept.c, + trek/destruct.c, trek/dock.c, trek/dumpgame.c, trek/dumpme.c, + trek/dumpssradio.c, trek/events.c, trek/externs.c, trek/getcodi.c, + trek/getpar.c, trek/getpar.h, trek/help.c, trek/impulse.c, + trek/initquad.c, trek/kill.c, trek/klmove.c, trek/lose.c, + trek/lrscan.c, trek/main.c, trek/move.c, trek/nova.c, trek/out.c, + trek/phaser.c, trek/play.c, trek/ram.c, trek/ranf.c, trek/rest.c, + trek/schedule.c, trek/score.c, trek/setup.c, trek/setwarp.c, + trek/shield.c, trek/snova.c, trek/srscan.c, trek/systemname.c, + trek/torped.c, trek/trek.6, trek/trek.h, trek/visual.c, + trek/warp.c, trek/win.c, worm/worm.6, worm/worm.c, worms/worms.6, + worms/worms.c, wtf/wtf.in, wtf/wtf.6.in, wump/pathnames.h.in, + wump/wump.6, wump/wump.c: Update from NetBSD CVS. + * wtf/acronyms: Update from NetBSD CVS. + * wtf/acronyms.comp: New file from NetBSD CVS. + * wtf/Makefrag: Update. + * COPYING: Update. + * INSTALL: Note that glibc 2.3 now required at least for hunt (for + ). + +2003-11-08 Joseph S. Myers + + * THANKS: Update Malcolm Parsons's email address. + 2003-04-01 Joseph S. Myers * Version 2.14. diff --git a/INSTALL b/INSTALL index a86699a..a41c332 100644 --- a/INSTALL +++ b/INSTALL @@ -31,22 +31,24 @@ don't worry about it ... it really is more of an aesthetic thing. Prerequisites ============= -You need gcc (the C compiler only - other languages not needed), libc5 -(version 5.4.5 or later) or libc6, and ncurses (any reasonably recent -version). Older versions of ncurses may work (but are much more -buggy), and BSD curses / termcap just might work (but is obsolete), -but these are completely unsupported; even with recent ncurses -versions you could run into problems with some games dependent on the -version of ncurses; if so, get a debugging version of ncurses -(libncurses_g.a), link with -lncurses_g instead of -lncurses, and good -luck bug-hunting. If the display gets confused in ordinary use (as -opposed for example to after resizing the window), this might be a bug -in the game, but is probably a bug in ncurses. You also need some -sort of lex and yacc; by default this package will use flex and bison, -but byacc will probably work as well. Libc5 versions before 5.4.5, or -libc4, will not work since they don't have the BSD error -reporting functions. libcrypto from OpenSSL can optionally be used by -factor. +You need the following to build this distribution: + +* GCC (the C compiler only - other languages not needed). + +* glibc 2.3 or later. Older versions will not work (at least for + hunt) since they lack the header. + +* ncurses; other curses / termcap implementations might work, but are + unsupported. + +* lex and yacc; by default this package will use flex and bison, but + byacc will probably work as well. + +* GNU make. + +* A POSIX shell, such as bash, in /bin/sh. + +libcrypto from OpenSSL can optionally be used by factor. You now need a word list for boggle and hangman; bsd-games no longer provides one itself. The GNU miscfiles package contains one, for @@ -54,25 +56,6 @@ example. The path can be specified at configure time (default: /usr/share/dict/words). The file used by hangman can also be specified at run time with the "-d" option. -The makefiles require GNU make; if you have a strange system on which -"make" is not GNU make you can use it under some other name since -$(MAKE) is used where appropriate. The configure script assumes that -/bin/sh is a POSIX.2 shell (bash is known to work; current versions of -ksh and ash should be OK but I haven't tested them); it can be run -manually with "bash configure" or similar if /bin/sh is not a POSIX.2 -shell. It uses the POSIX.2 printf utility (in GNU sh-utils, and a -builtin in bash 2.02) to avoid depending on echo -n. - -I am not aware of any dependence on the version of gcc used, although -it would be advisable to use gcc 2.7.2.1 or later (or use --fno-strength-reduce). EGCS releases 1.1.x may produce spurious -warnings about uninitialized variables because of limitations in the -code to detect this, but this does not affect the correctness of the -compiled code; this seems to be fixed in GCC 2.95. Some glibc -versions may produce many warnings in the system headers; these -generally represent bugs in the headers whose only impact is cosmetic, -and can be ignored. - Security ======== diff --git a/Makeconfig.in b/Makeconfig.in index aef159c..86efce3 100644 --- a/Makeconfig.in +++ b/Makeconfig.in @@ -112,6 +112,7 @@ CANFIELD_SCOREFILE := @canfield_scorefile@ CRIBBAGE_INSTRFILE := @cribbage_instrfile@ CRIBBAGE_SCOREFILE := @cribbage_scorefile@ FISH_INSTRFILE := @fish_instrfile@ +FORTUNE_DIR := @fortune_dir@ FORTUNE_TYPE := @fortune_type@ HACK_DIR := @hack_dir@ MONOP_CARDSFILE := @monop_cardsfile@ diff --git a/NEWS b/NEWS index d70faf8..3caf766 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,23 @@ changes in installation instructions. Packagers should also reread the PACKAGING file each version (or do a diff between the old and new versions of the package and read that). +Version 2.15 (2003-12-18) +============ + +* Updated from NetBSD CVS of 2003-12-17. This includes: + + + Advertising clause removed from licence of almost all + UCB-copyright code. + + + Hunt licence clarified. + +* Various bugs fixed, though some bug reports are still backlogged. + +* Glibc 2.3 or later now required, at least for hunt. + +* Directory for fortune files individually configurable, and default +has changed to match that used in NetBSD. + Version 2.14 (2003-04-01) ============ diff --git a/PACKAGING b/PACKAGING index edd0175..5bd4ce4 100644 --- a/PACKAGING +++ b/PACKAGING @@ -89,12 +89,9 @@ users. long as they apply without error, even though they may no longer be needed or even be harmful. -If you have patches that are needed for the package to build (in a -supported environment: libc 5.3.12 (or any Linux libc before 5.4.5) -and glibc 1.99 (or other old snapshots) are not supported although the -latter may work; nor is BSD curses/libtermcap or ncurses before 1.9.9e -(== 3.0 shared library version)) or to fix bugs (again in a supported -environment) or that provide enhancements other than conforming to +If you have patches that are needed for the package to build or to fix +bugs (in a supported environment, not with old versions of libraries +and tools) or that provide enhancements other than conforming to distribution-specific policy, please send them to me (unidiffs preferred; see notes on bug reporting and sending patches at the end of README). Do not assume that old patches should be applied to new diff --git a/README b/README index 6d26e13..161e5d1 100644 --- a/README +++ b/README @@ -20,16 +20,9 @@ has been removed because of the lack of a clear licence. The games are mostly not enhanced from the NetBSD versions, but many bugs are fixed. -The games should work with ncurses (any reasonably recent version). -They might also work with BSD curses/termcap, but this is not tested -by me. They should work with both libc5 (version 5.4.5 or later - -earlier versions won't work) and libc6 (glibc 2). Note however that I -don't test all possible combinations of libraries for each release, so -tell me if some versions don't work. For details of prerequisites, -see INSTALL. - -For installation instructions, see the file "INSTALL". Some games -have "README.linux" files you may wish to read. +For installation instructions and details of prerequisites, see the +file "INSTALL". Some games have "README.linux" files you may wish to +read. The statement of year 2000 issues associated with bsd-games and bsd-games-non-free is in the file "YEAR2000". diff --git a/THANKS b/THANKS index 3213503..10e033c 100644 --- a/THANKS +++ b/THANKS @@ -46,7 +46,7 @@ Stuart Lamble For a bug report and analysis (with patch) about scoring in backgammon. -Malcolm Parsons +Malcolm Parsons For several bug reports and fixes. diff --git a/TODO b/TODO index 7ea25fd..2c639fc 100644 --- a/TODO +++ b/TODO @@ -34,12 +34,6 @@ those. The issues listed there are not included in this list. 1998-07-28 - Support building in a directory other than the source directory. -1998-08-18 - Fix whatever makes rogue need -fwritable-strings. This - seem to be various arrays of struct id being initialised - with constant strings, but then being modified in the - course of saving and restoring. Only object.c needs to - be compiled with -fwritable-strings. - 1998-08-27 - Convert the games that use termcap to use curses. Currently these are backgammon, hack and tetris; rain, snake and worms have been done. If it becomes possible diff --git a/adventure/Makefile.bsd b/adventure/Makefile.bsd index adc23f3..6530c3c 100644 --- a/adventure/Makefile.bsd +++ b/adventure/Makefile.bsd @@ -1,16 +1,19 @@ -# $NetBSD: Makefile,v 1.9 2002/03/05 21:28:12 thorpej Exp $ +# $NetBSD: Makefile,v 1.13 2003/11/16 14:14:18 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/12/93 PROG= adventure SRCS= main.c init.c done.c save.c subr.c vocab.c wizard.c io.c data.c crc.c MAN= adventure.6 HIDEGAME=hidegame -CLEANFILES+=setup data.c +CLEANFILES+=setup setup.lo data.c data.c: glorkz setup + ${_MKTARGET_CREATE} ./setup ${.CURDIR}/glorkz > data.c -setup: setup.c hdr.h - ${HOST_LINK.c} -o setup ${.CURDIR}/setup.c +setup.lo: hdr.h +setup: setup.lo + ${_MKTARGET_LINK} + ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} .include diff --git a/adventure/adventure.6 b/adventure/adventure.6 index 58a2649..cc8c7a8 100644 --- a/adventure/adventure.6 +++ b/adventure/adventure.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: adventure.6,v 1.3 1997/10/10 11:59:33 lukem Exp $ +.\" $NetBSD: adventure.6,v 1.4 2003/08/07 09:36:50 agc Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -16,11 +16,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/adventure/crc.c b/adventure/crc.c index 2e00099..66504f1 100644 --- a/adventure/crc.c +++ b/adventure/crc.c @@ -1,4 +1,4 @@ -/* $NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $ */ +/* $NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -42,7 +38,7 @@ static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 5/31/93"; static char ORIGINAL_sccsid[] = "@(#)crc.c 5.2 (Berkeley) 4/4/91"; #else -__RCSID("$NetBSD: crc.c,v 1.7 1999/02/10 00:29:21 hubertf Exp $"); +__RCSID("$NetBSD: crc.c,v 1.8 2003/08/07 09:36:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/adventure/done.c b/adventure/done.c index eb5def8..54e5fa6 100644 --- a/adventure/done.c +++ b/adventure/done.c @@ -1,4 +1,4 @@ -/* $NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $ */ +/* $NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)done.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: done.c,v 1.7 2000/07/03 03:57:39 matt Exp $"); +__RCSID("$NetBSD: done.c,v 1.8 2003/08/07 09:36:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/adventure/glorkz b/adventure/glorkz index c65c8fd..a00d400 100644 --- a/adventure/glorkz +++ b/adventure/glorkz @@ -135,7 +135,7 @@ 71 combined. 72 You are in a large low room. Crawls lead north, SE, and SW. 73 Dead end crawl. -74 You are in a secret canyon which here runs e/w. It crosses over a +74 You are in a secret canyon which here runs E/W. It crosses over a 74 very tight canyon 15 feet below. If you go down you may not be able 74 to get back up. 75 You are at a wide place in a very tight N/S canyon. @@ -182,7 +182,7 @@ 99 distance. An extremely tight tunnel leads east. It looks like a very 99 tight squeeze. An eerie light can be seen at the other end. 100 You're in a small chamber lit by an eerie green light. An extremely -100 narrow tunnel exits to the west. A dark corridor leads ne. +100 narrow tunnel exits to the west. A dark corridor leads NE. 101 You're in the Dark-Room. A corridor leading south is the only exit. 102 You are in an arched hall. A coral passage once continued up and east 102 from here, but is now blocked by debris. The air smells of sea water. @@ -249,7 +249,7 @@ 119 You are in a secret canyon which exits to the north and east. 120 You are in a secret canyon which exits to the north and east. 121 You are in a secret canyon which exits to the north and east. -122 You are on the far side of the chasm. A ne path leads away from the +122 You are on the far side of the chasm. A NE path leads away from the 122 chasm on this side. 123 You're in a long east/west corridor. A faint rumbling noise can be 123 heard in the distance. diff --git a/adventure/hdr.h b/adventure/hdr.h index 45e5e8b..3843831 100644 --- a/adventure/hdr.h +++ b/adventure/hdr.h @@ -1,4 +1,4 @@ -/* $NetBSD: hdr.h,v 1.9 2001/02/05 00:20:05 christos Exp $ */ +/* $NetBSD: hdr.h,v 1.10 2003/08/07 09:36:50 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/adventure/init.c b/adventure/init.c index 7c888a5..1816fc1 100644 --- a/adventure/init.c +++ b/adventure/init.c @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $ */ +/* $NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $ */ /*- * Copyright (c) 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 6/2/93"; #else -__RCSID("$NetBSD: init.c,v 1.13 2001/02/05 00:20:05 christos Exp $"); +__RCSID("$NetBSD: init.c,v 1.14 2003/08/07 09:36:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/adventure/io.c b/adventure/io.c index e3c80e8..33ae2fe 100644 --- a/adventure/io.c +++ b/adventure/io.c @@ -1,4 +1,4 @@ -/* $NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $ */ +/* $NetBSD: io.c,v 1.15 2003/09/19 10:01:53 itojun Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: io.c,v 1.12 2000/01/09 17:17:19 jsm Exp $"); +__RCSID("$NetBSD: io.c,v 1.15 2003/09/19 10:01:53 itojun Exp $"); #endif #endif /* not lint */ @@ -306,7 +302,7 @@ rdesc(sect) /* read description-format msgs */ ptext[oldloc].txtlen = maystart - seekstart; break; case 6:/* random messages */ - if (oldloc > RTXSIZ) + if (oldloc >= RTXSIZ) errx(1,"Too many random msgs"); rtext[oldloc].seekadr = seekhere; rtext[oldloc].txtlen = maystart - seekstart; @@ -317,7 +313,7 @@ rdesc(sect) /* read description-format msgs */ cval[clsses++] = oldloc; break; case 12: /* magic messages */ - if (oldloc > MAGSIZ) + if (oldloc >= MAGSIZ) errx(1,"Too many magic msgs"); mtext[oldloc].seekadr = seekhere; mtext[oldloc].txtlen = maystart - seekstart; diff --git a/adventure/main.c b/adventure/main.c index 56393c6..ba2b2a4 100644 --- a/adventure/main.c +++ b/adventure/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $ */ +/* $NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -48,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/2/93"; #else -__RCSID("$NetBSD: main.c,v 1.16 2000/07/03 03:57:39 matt Exp $"); +__RCSID("$NetBSD: main.c,v 1.17 2003/08/07 09:36:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/adventure/save.c b/adventure/save.c index 71b9e78..2f0e355 100644 --- a/adventure/save.c +++ b/adventure/save.c @@ -1,4 +1,4 @@ -/* $NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $ */ +/* $NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: save.c,v 1.7 1999/07/17 20:02:48 hubertf Exp $"); +__RCSID("$NetBSD: save.c,v 1.8 2003/08/07 09:36:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/adventure/setup.c b/adventure/setup.c index d71f965..ca5a24c 100644 --- a/adventure/setup.c +++ b/adventure/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $ */ +/* $NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ static const char copyright[] __attribute__((__unused__)) = "@(#) Copyright (c) #if 0 static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93"; #else -static const char rcsid[] __attribute__((__unused__)) = "$NetBSD: setup.c,v 1.9 2001/08/29 18:22:56 jsm Exp $"; +static const char rcsid[] __attribute__((__unused__)) = "$NetBSD: setup.c,v 1.10 2003/08/07 09:36:51 agc Exp $"; #endif #endif /* not lint */ diff --git a/adventure/subr.c b/adventure/subr.c index 6a05a3e..297238b 100644 --- a/adventure/subr.c +++ b/adventure/subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $ */ +/* $NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: subr.c,v 1.9 2000/07/03 03:57:39 matt Exp $"); +__RCSID("$NetBSD: subr.c,v 1.10 2003/08/07 09:36:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/adventure/vocab.c b/adventure/vocab.c index f1e4d50..78939d3 100644 --- a/adventure/vocab.c +++ b/adventure/vocab.c @@ -1,4 +1,4 @@ -/* $NetBSD: vocab.c,v 1.10 2000/01/09 17:17:19 jsm Exp $ */ +/* $NetBSD: vocab.c,v 1.11 2003/08/07 09:36:51 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)vocab.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: vocab.c,v 1.10 2000/01/09 17:17:19 jsm Exp $"); +__RCSID("$NetBSD: vocab.c,v 1.11 2003/08/07 09:36:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/adventure/wizard.c b/adventure/wizard.c index aed2a56..5e20605 100644 --- a/adventure/wizard.c +++ b/adventure/wizard.c @@ -1,4 +1,4 @@ -/* $NetBSD: wizard.c,v 1.10 1999/07/16 01:38:20 hubertf Exp $ */ +/* $NetBSD: wizard.c,v 1.11 2003/08/07 09:36:51 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -17,11 +17,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)wizard.c 8.1 (Berkeley) 6/2/93"; #else -__RCSID("$NetBSD: wizard.c,v 1.10 1999/07/16 01:38:20 hubertf Exp $"); +__RCSID("$NetBSD: wizard.c,v 1.11 2003/08/07 09:36:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/arithmetic/arithmetic.6 b/arithmetic/arithmetic.6 index 4040d67..b8d4d8f 100644 --- a/arithmetic/arithmetic.6 +++ b/arithmetic/arithmetic.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: arithmetic.6,v 1.9 2002/09/26 18:31:58 wiz Exp $ +.\" $NetBSD: arithmetic.6,v 1.11 2003/08/07 09:36:52 agc Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -102,7 +98,9 @@ if you get a question wrong. .Dq Right! if you get it right. .Dq Please type a number. -if arithmetic doesn't understand what you typed. +if +.Nm +doesn't understand what you typed. .Sh SEE ALSO .Xr bc 1 , .Xr dc 1 diff --git a/arithmetic/arithmetic.c b/arithmetic/arithmetic.c index 13add74..fb1170e 100644 --- a/arithmetic/arithmetic.c +++ b/arithmetic/arithmetic.c @@ -1,4 +1,4 @@ -/* $NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $ */ +/* $NetBSD: arithmetic.c,v 1.19 2003/08/07 09:36:52 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)arithmetic.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: arithmetic.c,v 1.18 2002/03/31 04:07:22 hubertf Exp $"); +__RCSID("$NetBSD: arithmetic.c,v 1.19 2003/08/07 09:36:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/Makefile.bsd b/atc/Makefile.bsd index ad5efc6..5adc5e4 100644 --- a/atc/Makefile.bsd +++ b/atc/Makefile.bsd @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 1999/07/17 19:57:03 hubertf Exp $ +# $NetBSD: Makefile,v 1.23 2003/08/01 17:03:42 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include @@ -22,6 +22,4 @@ FILESDIR=/usr/share/games/atc FILESMODE=444 .endif -lex.o: grammar.h - .include diff --git a/atc/atc.6.in b/atc/atc.6.in index ceeff64..d9800cf 100644 --- a/atc/atc.6.in +++ b/atc/atc.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: atc.6,v 1.16 2003/02/25 10:34:44 wiz Exp $ +.\" $NetBSD: atc.6,v 1.19 2003/08/07 09:36:53 agc Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -122,7 +118,7 @@ Depending on the terminal you run on, the screen will be divided into 4 areas. It should be stressed that the terminal driver portion of the game was designed to be reconfigurable, so the display format can vary -depending the version you are playing. +depending on the version you are playing. The descriptions here are based on the ascii version of the game. The game rules and input format, however, should remain consistent. Control-L redraws the screen, should it become muddled. @@ -377,7 +373,7 @@ Plane X: ignore .It Jets move every update; prop planes move every other update. .It -All planes turn a most 90 degrees per movement. +All planes turn at most 90 degrees per movement. .It Planes enter at 7000 feet and leave at 9000 feet. .It @@ -386,7 +382,8 @@ Planes flying at an altitude of 0 crash if they are not over an airport. Planes waiting at airports can only be told to take off (climb in altitude). .It Pressing return (that is, entering an empty command) will perform the -next update immediately. This allows you to ``fast forward'' +next update immediately. +This allows you to ``fast forward'' the game clock if nothing interesting is happening. .El .Sh NEW GAMES @@ -434,8 +431,8 @@ For beacons, a simple x, y coordinate pair is used (enclosed in parenthesis). Airports and exits require a third value, which is one of the directions .Em wedcxzaq . For airports, this is the direction that planes must be going to take -off and land, and for exits, this is the direction that planes will going -when they +off and land, and for exits, this is the direction that planes will be +going when they .Em enter the arena. This may not seem intuitive, but as there is no restriction on diff --git a/atc/def.h b/atc/def.h index 4f0ee60..a27266d 100644 --- a/atc/def.h +++ b/atc/def.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.h,v 1.5 1999/09/30 18:01:31 jsm Exp $ */ +/* $NetBSD: def.h,v 1.6 2003/08/07 09:36:53 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/atc/extern.c b/atc/extern.c index 0ec00df..a96fdd4 100644 --- a/atc/extern.c +++ b/atc/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.6 1998/11/10 13:43:30 hubertf Exp $ */ +/* $NetBSD: extern.c,v 1.7 2003/08/07 09:36:53 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -50,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.6 1998/11/10 13:43:30 hubertf Exp $"); +__RCSID("$NetBSD: extern.c,v 1.7 2003/08/07 09:36:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/extern.h b/atc/extern.h index 5cf4722..1b0fa41 100644 --- a/atc/extern.h +++ b/atc/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.9 2001/02/05 00:22:52 christos Exp $ */ +/* $NetBSD: extern.h,v 1.10 2003/08/07 09:36:53 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/atc/grammar.y b/atc/grammar.y index 770683a..2d82da5 100644 --- a/atc/grammar.y +++ b/atc/grammar.y @@ -1,4 +1,4 @@ -/* $NetBSD: grammar.y,v 1.7 1999/07/26 21:14:21 hubertf Exp $ */ +/* $NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -68,7 +64,7 @@ #if 0 static char sccsid[] = "@(#)grammar.y 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: grammar.y,v 1.7 1999/07/26 21:14:21 hubertf Exp $"); +__RCSID("$NetBSD: grammar.y,v 1.8 2003/08/07 09:36:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/graphics.c b/atc/graphics.c index 798d902..2bf34c1 100644 --- a/atc/graphics.c +++ b/atc/graphics.c @@ -1,4 +1,4 @@ -/* $NetBSD: graphics.c,v 1.9 1999/09/10 00:16:43 jsm Exp $ */ +/* $NetBSD: graphics.c,v 1.10 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -50,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)graphics.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: graphics.c,v 1.9 1999/09/10 00:16:43 jsm Exp $"); +__RCSID("$NetBSD: graphics.c,v 1.10 2003/08/07 09:36:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/include.h b/atc/include.h index e0c7ce1..1697f6f 100644 --- a/atc/include.h +++ b/atc/include.h @@ -1,4 +1,4 @@ -/* $NetBSD: include.h,v 1.7 2001/08/29 18:23:44 jsm Exp $ */ +/* $NetBSD: include.h,v 1.8 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/atc/input.c b/atc/input.c index 900bc28..232e81f 100644 --- a/atc/input.c +++ b/atc/input.c @@ -1,4 +1,4 @@ -/* $NetBSD: input.c,v 1.14 2001/01/16 02:50:28 cgd Exp $ */ +/* $NetBSD: input.c,v 1.15 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -50,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: input.c,v 1.14 2001/01/16 02:50:28 cgd Exp $"); +__RCSID("$NetBSD: input.c,v 1.15 2003/08/07 09:36:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/lex.l b/atc/lex.l index 864d547..3e90b76 100644 --- a/atc/lex.l +++ b/atc/lex.l @@ -1,5 +1,5 @@ %{ -/* $NetBSD: lex.l,v 1.6 1998/04/09 00:32:32 tv Exp $ */ +/* $NetBSD: lex.l,v 1.7 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -16,11 +16,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -51,7 +47,7 @@ #if 0 static char sccsid[] = "@(#)lex.l 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: lex.l,v 1.6 1998/04/09 00:32:32 tv Exp $"); +__RCSID("$NetBSD: lex.l,v 1.7 2003/08/07 09:36:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/list.c b/atc/list.c index ca17e10..e1b50b1 100644 --- a/atc/list.c +++ b/atc/list.c @@ -1,4 +1,4 @@ -/* $NetBSD: list.c,v 1.5 2001/06/19 13:42:08 wiz Exp $ */ +/* $NetBSD: list.c,v 1.6 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -50,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)list.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: list.c,v 1.5 2001/06/19 13:42:08 wiz Exp $"); +__RCSID("$NetBSD: list.c,v 1.6 2003/08/07 09:36:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/log.c b/atc/log.c index 60abbbc..5f5d9bf 100644 --- a/atc/log.c +++ b/atc/log.c @@ -1,4 +1,4 @@ -/* $NetBSD: log.c,v 1.11 2001/01/16 02:50:28 cgd Exp $ */ +/* $NetBSD: log.c,v 1.12 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -50,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: log.c,v 1.11 2001/01/16 02:50:28 cgd Exp $"); +__RCSID("$NetBSD: log.c,v 1.12 2003/08/07 09:36:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/main.c b/atc/main.c index 5b97670..fe2482c 100644 --- a/atc/main.c +++ b/atc/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.12 2001/02/05 00:22:52 christos Exp $ */ +/* $NetBSD: main.c,v 1.13 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -55,7 +51,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.12 2001/02/05 00:22:52 christos Exp $"); +__RCSID("$NetBSD: main.c,v 1.13 2003/08/07 09:36:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/pathnames.h.in b/atc/pathnames.h.in index fcee438..6c17c0e 100644 --- a/atc/pathnames.h.in +++ b/atc/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/21 15:04:28 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/atc/struct.h b/atc/struct.h index 35e302f..500a8ea 100644 --- a/atc/struct.h +++ b/atc/struct.h @@ -1,4 +1,4 @@ -/* $NetBSD: struct.h,v 1.4 1999/07/17 19:57:03 hubertf Exp $ */ +/* $NetBSD: struct.h,v 1.5 2003/08/07 09:36:54 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/atc/tunable.c b/atc/tunable.c index bb0ba49..d5f6d15 100644 --- a/atc/tunable.c +++ b/atc/tunable.c @@ -1,4 +1,4 @@ -/* $NetBSD: tunable.c,v 1.4 1997/10/10 02:07:32 lukem Exp $ */ +/* $NetBSD: tunable.c,v 1.5 2003/08/07 09:36:55 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -50,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)tunable.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: tunable.c,v 1.4 1997/10/10 02:07:32 lukem Exp $"); +__RCSID("$NetBSD: tunable.c,v 1.5 2003/08/07 09:36:55 agc Exp $"); #endif #endif /* not lint */ diff --git a/atc/tunable.h b/atc/tunable.h index a295a47..2b18323 100644 --- a/atc/tunable.h +++ b/atc/tunable.h @@ -1,4 +1,4 @@ -/* $NetBSD: tunable.h,v 1.3 1995/03/21 15:04:35 cgd Exp $ */ +/* $NetBSD: tunable.h,v 1.4 2003/08/07 09:36:55 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/atc/update.c b/atc/update.c index accc1d3..3a145e5 100644 --- a/atc/update.c +++ b/atc/update.c @@ -1,4 +1,4 @@ -/* $NetBSD: update.c,v 1.11 2001/01/16 02:50:28 cgd Exp $ */ +/* $NetBSD: update.c,v 1.12 2003/08/07 09:36:55 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -50,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)update.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: update.c,v 1.11 2001/01/16 02:50:28 cgd Exp $"); +__RCSID("$NetBSD: update.c,v 1.12 2003/08/07 09:36:55 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/backgammon/backgammon.6.in b/backgammon/backgammon/backgammon.6.in index 7657556..af7ce7d 100644 --- a/backgammon/backgammon/backgammon.6.in +++ b/backgammon/backgammon/backgammon.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: backgammon.6,v 1.9 2002/09/26 18:31:58 wiz Exp $ +.\" $NetBSD: backgammon.6,v 1.11 2003/08/07 09:36:55 agc Exp $ .\" .\" Copyright (c) 1980, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -56,13 +52,13 @@ .Sh DESCRIPTION This program lets you play backgammon against the computer or against a "friend". -All commands only are one letter, so you don't need to type a carriage return, +All commands are only one letter, so you don't need to type a carriage return, except at the end of a move. -The program is mostly self documenting, +The program is mostly self-explanatory, so that a question mark (?) will usually get some help. If you answer `y' when the program asks if you want the rules, you will get text explaining the rules of the game, some hints on strategy, -instruction on how to use the program, +instructions on how to use the program, and a tutorial consisting of a practice game against the computer. A description of how to use the program can be obtained by answering `y' when it asks if you want instructions. @@ -92,7 +88,7 @@ uses .Pa /usr/share/misc/termcap .It Fl s Ar file recover previously saved game from -.Ar file . +.Ar file .El .Pp .\" diff --git a/backgammon/backgammon/extra.c b/backgammon/backgammon/extra.c index 5d76f86..a5b5faa 100644 --- a/backgammon/backgammon/extra.c +++ b/backgammon/backgammon/extra.c @@ -1,4 +1,4 @@ -/* $NetBSD: extra.c,v 1.4 1997/10/10 08:59:36 lukem Exp $ */ +/* $NetBSD: extra.c,v 1.5 2003/08/07 09:36:55 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)extra.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extra.c,v 1.4 1997/10/10 08:59:36 lukem Exp $"); +__RCSID("$NetBSD: extra.c,v 1.5 2003/08/07 09:36:55 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/backgammon/main.c b/backgammon/backgammon/main.c index ed8e496..a2572de 100644 --- a/backgammon/backgammon/main.c +++ b/backgammon/backgammon/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.17 2001/09/18 18:15:49 wiz Exp $ */ +/* $NetBSD: main.c,v 1.18 2003/08/07 09:36:56 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.17 2001/09/18 18:15:49 wiz Exp $"); +__RCSID("$NetBSD: main.c,v 1.18 2003/08/07 09:36:56 agc Exp $"); #endif #endif /* not lint */ @@ -478,7 +474,7 @@ main(argc, argv) /* compute game value */ if (tflag) curmove(20, 0); - if (*offopp == 15 && *offptr <= 0) { + if (*offopp == 15 && (*offptr == 0 || *offptr == -15)) { if (mflag) { writel(bgammon); gvalue *= 3; diff --git a/backgammon/backgammon/move.c b/backgammon/backgammon/move.c index c4d3c53..7f1e203 100644 --- a/backgammon/backgammon/move.c +++ b/backgammon/backgammon/move.c @@ -1,4 +1,4 @@ -/* $NetBSD: move.c,v 1.6 1997/10/10 08:59:37 lukem Exp $ */ +/* $NetBSD: move.c,v 1.7 2003/08/07 09:36:56 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: move.c,v 1.6 1997/10/10 08:59:37 lukem Exp $"); +__RCSID("$NetBSD: move.c,v 1.7 2003/08/07 09:36:56 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/backgammon/text.c b/backgammon/backgammon/text.c index 1e5dc7c..ed02ba1 100644 --- a/backgammon/backgammon/text.c +++ b/backgammon/backgammon/text.c @@ -1,4 +1,4 @@ -/* $NetBSD: text.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $ */ +/* $NetBSD: text.c,v 1.7 2003/08/07 09:36:56 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)text.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: text.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $"); +__RCSID("$NetBSD: text.c,v 1.7 2003/08/07 09:36:56 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/backgammon/version.c b/backgammon/backgammon/version.c index 676ecbc..40a4e49 100644 --- a/backgammon/backgammon/version.c +++ b/backgammon/backgammon/version.c @@ -1,4 +1,4 @@ -/* $NetBSD: version.c,v 1.5 1999/02/10 12:29:47 hubertf Exp $ */ +/* $NetBSD: version.c,v 1.6 2003/08/07 09:36:56 agc Exp $ */ /* * Copyright (c) 1980, 1987, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: version.c,v 1.5 1999/02/10 12:29:47 hubertf Exp $"); +__RCSID("$NetBSD: version.c,v 1.6 2003/08/07 09:36:56 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/allow.c b/backgammon/common_source/allow.c index e3af4be..f6bae78 100644 --- a/backgammon/common_source/allow.c +++ b/backgammon/common_source/allow.c @@ -1,4 +1,4 @@ -/* $NetBSD: allow.c,v 1.4 1997/10/10 08:59:41 lukem Exp $ */ +/* $NetBSD: allow.c,v 1.5 2003/08/07 09:36:56 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)allow.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: allow.c,v 1.4 1997/10/10 08:59:41 lukem Exp $"); +__RCSID("$NetBSD: allow.c,v 1.5 2003/08/07 09:36:56 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/back.h b/backgammon/common_source/back.h index e17b81a..c7ca828 100644 --- a/backgammon/common_source/back.h +++ b/backgammon/common_source/back.h @@ -1,4 +1,4 @@ -/* $NetBSD: back.h,v 1.12 1999/10/04 23:26:59 lukem Exp $ */ +/* $NetBSD: back.h,v 1.13 2003/08/07 09:36:56 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/backgammon/common_source/board.c b/backgammon/common_source/board.c index 56cffb2..cccdc5b 100644 --- a/backgammon/common_source/board.c +++ b/backgammon/common_source/board.c @@ -1,4 +1,4 @@ -/* $NetBSD: board.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $ */ +/* $NetBSD: board.c,v 1.7 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)board.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: board.c,v 1.6 1999/02/10 12:29:47 hubertf Exp $"); +__RCSID("$NetBSD: board.c,v 1.7 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/check.c b/backgammon/common_source/check.c index 53376ad..04ce1db 100644 --- a/backgammon/common_source/check.c +++ b/backgammon/common_source/check.c @@ -1,4 +1,4 @@ -/* $NetBSD: check.c,v 1.4 1997/10/10 08:59:44 lukem Exp $ */ +/* $NetBSD: check.c,v 1.5 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)check.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: check.c,v 1.4 1997/10/10 08:59:44 lukem Exp $"); +__RCSID("$NetBSD: check.c,v 1.5 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/fancy.c b/backgammon/common_source/fancy.c index 78f50a1..fc5720f 100644 --- a/backgammon/common_source/fancy.c +++ b/backgammon/common_source/fancy.c @@ -1,4 +1,4 @@ -/* $NetBSD: fancy.c,v 1.10 1999/07/26 18:39:06 hubertf Exp $ */ +/* $NetBSD: fancy.c,v 1.11 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)fancy.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: fancy.c,v 1.10 1999/07/26 18:39:06 hubertf Exp $"); +__RCSID("$NetBSD: fancy.c,v 1.11 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/init.c b/backgammon/common_source/init.c index dc06d6e..f55d555 100644 --- a/backgammon/common_source/init.c +++ b/backgammon/common_source/init.c @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.7 1999/02/10 12:29:48 hubertf Exp $ */ +/* $NetBSD: init.c,v 1.8 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: init.c,v 1.7 1999/02/10 12:29:48 hubertf Exp $"); +__RCSID("$NetBSD: init.c,v 1.8 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/odds.c b/backgammon/common_source/odds.c index 5f350a3..509d5f4 100644 --- a/backgammon/common_source/odds.c +++ b/backgammon/common_source/odds.c @@ -1,4 +1,4 @@ -/* $NetBSD: odds.c,v 1.4 1997/10/10 08:59:46 lukem Exp $ */ +/* $NetBSD: odds.c,v 1.5 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)odds.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: odds.c,v 1.4 1997/10/10 08:59:46 lukem Exp $"); +__RCSID("$NetBSD: odds.c,v 1.5 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/one.c b/backgammon/common_source/one.c index 7049377..86b57ef 100644 --- a/backgammon/common_source/one.c +++ b/backgammon/common_source/one.c @@ -1,4 +1,4 @@ -/* $NetBSD: one.c,v 1.4 1997/10/10 08:59:47 lukem Exp $ */ +/* $NetBSD: one.c,v 1.5 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)one.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: one.c,v 1.4 1997/10/10 08:59:47 lukem Exp $"); +__RCSID("$NetBSD: one.c,v 1.5 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/save.c b/backgammon/common_source/save.c index 2f4a810..e48a914 100644 --- a/backgammon/common_source/save.c +++ b/backgammon/common_source/save.c @@ -1,4 +1,4 @@ -/* $NetBSD: save.c,v 1.9 1999/07/28 02:07:39 hubertf Exp $ */ +/* $NetBSD: save.c,v 1.10 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: save.c,v 1.9 1999/07/28 02:07:39 hubertf Exp $"); +__RCSID("$NetBSD: save.c,v 1.10 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/subs.c b/backgammon/common_source/subs.c index 48d0550..2c88eff 100644 --- a/backgammon/common_source/subs.c +++ b/backgammon/common_source/subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: subs.c,v 1.13 1999/10/04 23:26:59 lukem Exp $ */ +/* $NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)subs.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: subs.c,v 1.13 1999/10/04 23:26:59 lukem Exp $"); +__RCSID("$NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/common_source/table.c b/backgammon/common_source/table.c index 5f545e5..e54e801 100644 --- a/backgammon/common_source/table.c +++ b/backgammon/common_source/table.c @@ -1,4 +1,4 @@ -/* $NetBSD: table.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $ */ +/* $NetBSD: table.c,v 1.7 2003/08/07 09:36:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: table.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $"); +__RCSID("$NetBSD: table.c,v 1.7 2003/08/07 09:36:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/teachgammon/data.c b/backgammon/teachgammon/data.c index 8af936d..87f6513 100644 --- a/backgammon/teachgammon/data.c +++ b/backgammon/teachgammon/data.c @@ -1,4 +1,4 @@ -/* $NetBSD: data.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $ */ +/* $NetBSD: data.c,v 1.6 2003/08/07 09:36:58 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)data.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: data.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $"); +__RCSID("$NetBSD: data.c,v 1.6 2003/08/07 09:36:58 agc Exp $"); #endif #endif /* not lint */ @@ -92,7 +88,7 @@ const char *const text4[] = { const char *const text5[] = { "Not a spectacular move, but a safe one. I follow by rolling 6 1.", - "I decide to use this roll to move 22-16,16-17. It leaves me with", + "I decide to use this roll to move 22-16,16-15. It leaves me with", "one man still open, but the blot is farther back on the board, and", "would suffer less of a loss by being hit.", 0 @@ -123,7 +119,7 @@ const char *const text8[] = { const char *const text9[] = { "My venture off the bar did not last long. However, I got lucky", - "and rolled double 1's, allowing me to move 0-1,1-2,15-14,15-14.", + "and rolled double 1's, allowing me to move 25-24,24-23,15-14,15-14.", 0 }; diff --git a/backgammon/teachgammon/teach.c b/backgammon/teachgammon/teach.c index d3520ea..d3a320c 100644 --- a/backgammon/teachgammon/teach.c +++ b/backgammon/teachgammon/teach.c @@ -1,4 +1,4 @@ -/* $NetBSD: teach.c,v 1.13 2001/04/06 11:13:52 wiz Exp $ */ +/* $NetBSD: teach.c,v 1.14 2003/08/07 09:36:58 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: teach.c,v 1.13 2001/04/06 11:13:52 wiz Exp $"); +__RCSID("$NetBSD: teach.c,v 1.14 2003/08/07 09:36:58 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/teachgammon/ttext1.c b/backgammon/teachgammon/ttext1.c index 2091e0d..82db223 100644 --- a/backgammon/teachgammon/ttext1.c +++ b/backgammon/teachgammon/ttext1.c @@ -1,4 +1,4 @@ -/* $NetBSD: ttext1.c,v 1.6 1999/07/25 00:06:13 hubertf Exp $ */ +/* $NetBSD: ttext1.c,v 1.7 2003/08/07 09:36:58 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)ttext1.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: ttext1.c,v 1.6 1999/07/25 00:06:13 hubertf Exp $"); +__RCSID("$NetBSD: ttext1.c,v 1.7 2003/08/07 09:36:58 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/teachgammon/ttext2.c b/backgammon/teachgammon/ttext2.c index 51ab8b0..5e827d7 100644 --- a/backgammon/teachgammon/ttext2.c +++ b/backgammon/teachgammon/ttext2.c @@ -1,4 +1,4 @@ -/* $NetBSD: ttext2.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $ */ +/* $NetBSD: ttext2.c,v 1.7 2003/08/07 09:36:58 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)ttext2.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: ttext2.c,v 1.6 1999/02/10 12:29:48 hubertf Exp $"); +__RCSID("$NetBSD: ttext2.c,v 1.7 2003/08/07 09:36:58 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/teachgammon/tutor.c b/backgammon/teachgammon/tutor.c index c1a122d..4516902 100644 --- a/backgammon/teachgammon/tutor.c +++ b/backgammon/teachgammon/tutor.c @@ -1,4 +1,4 @@ -/* $NetBSD: tutor.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $ */ +/* $NetBSD: tutor.c,v 1.6 2003/08/07 09:36:58 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)tutor.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: tutor.c,v 1.5 1999/02/10 12:29:48 hubertf Exp $"); +__RCSID("$NetBSD: tutor.c,v 1.6 2003/08/07 09:36:58 agc Exp $"); #endif #endif /* not lint */ diff --git a/backgammon/teachgammon/tutor.h b/backgammon/teachgammon/tutor.h index e3ba2f7..d0544bf 100644 --- a/backgammon/teachgammon/tutor.h +++ b/backgammon/teachgammon/tutor.h @@ -1,4 +1,4 @@ -/* $NetBSD: tutor.h,v 1.6 1999/02/10 12:29:48 hubertf Exp $ */ +/* $NetBSD: tutor.h,v 1.7 2003/08/07 09:36:59 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/banner/banner.6 b/banner/banner.6 index 0f46ca4..acf4c3a 100644 --- a/banner/banner.6 +++ b/banner/banner.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: banner.6,v 1.12 2002/09/26 18:31:59 wiz Exp $ +.\" $NetBSD: banner.6,v 1.13 2003/08/07 09:36:59 agc Exp $ .\" .\" Copyright (c) 1980, 1993, 1995 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/banner/banner.c b/banner/banner.c index 0b812cd..0d2d9ae 100644 --- a/banner/banner.c +++ b/banner/banner.c @@ -1,4 +1,4 @@ -/* $NetBSD: banner.c,v 1.10 1999/07/19 19:07:17 hubertf Exp $ */ +/* $NetBSD: banner.c,v 1.11 2003/08/07 09:36:59 agc Exp $ */ /* * Copyright (c) 1980, 1993, 1994 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)banner.c 8.4 (Berkeley) 4/29/95"; #else -__RCSID("$NetBSD: banner.c,v 1.10 1999/07/19 19:07:17 hubertf Exp $"); +__RCSID("$NetBSD: banner.c,v 1.11 2003/08/07 09:36:59 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/battlestar.6 b/battlestar/battlestar.6 index b8ecf08..0d1602b 100644 --- a/battlestar/battlestar.6 +++ b/battlestar/battlestar.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: battlestar.6,v 1.12 2002/09/26 18:31:59 wiz Exp $ +.\" $NetBSD: battlestar.6,v 1.14 2003/08/07 09:37:00 agc Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -64,7 +60,7 @@ They could take any object from thin air, and, uttering the word .Sq su could disappear. .Pp -In those times men were known for their lust of gold and desire to +In those times men were known for their lust for gold and desire to wear fine weapons. Swords and coats of mail were fashioned that could withstand a laser blast. .Pp @@ -79,7 +75,7 @@ drop --- drop an object wear --- wear an object you are holding draw --- carry an object you are wearing -puton --- take an object and wear it +put on --- take an object and wear it take off -- draw an object and drop it throw \*[Lt]object\*[Gt] \*[Lt]direction\*[Gt] diff --git a/battlestar/battlestar.c b/battlestar/battlestar.c index a7f57ab..62e1e63 100644 --- a/battlestar/battlestar.c +++ b/battlestar/battlestar.c @@ -1,4 +1,4 @@ -/* $NetBSD: battlestar.c,v 1.12 2000/09/21 17:44:34 jsm Exp $ */ +/* $NetBSD: battlestar.c,v 1.13 2003/08/07 09:37:00 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)battlestar.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: battlestar.c,v 1.12 2000/09/21 17:44:34 jsm Exp $"); +__RCSID("$NetBSD: battlestar.c,v 1.13 2003/08/07 09:37:00 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/command1.c b/battlestar/command1.c index 5ece500..2ecf181 100644 --- a/battlestar/command1.c +++ b/battlestar/command1.c @@ -1,4 +1,4 @@ -/* $NetBSD: command1.c,v 1.1 2001/10/19 03:06:11 tv Exp $ */ +/* $NetBSD: command1.c,v 1.2 2003/08/07 09:37:00 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com1.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command1.c,v 1.1 2001/10/19 03:06:11 tv Exp $"); +__RCSID("$NetBSD: command1.c,v 1.2 2003/08/07 09:37:00 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/command2.c b/battlestar/command2.c index aac5b0e..9d56f21 100644 --- a/battlestar/command2.c +++ b/battlestar/command2.c @@ -1,4 +1,4 @@ -/* $NetBSD: command2.c,v 1.1 2001/10/19 03:06:11 tv Exp $ */ +/* $NetBSD: command2.c,v 1.2 2003/08/07 09:37:00 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com2.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command2.c,v 1.1 2001/10/19 03:06:11 tv Exp $"); +__RCSID("$NetBSD: command2.c,v 1.2 2003/08/07 09:37:00 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/command3.c b/battlestar/command3.c index f8a0110..0279193 100644 --- a/battlestar/command3.c +++ b/battlestar/command3.c @@ -1,4 +1,4 @@ -/* $NetBSD: command3.c,v 1.1 2001/10/19 03:06:11 tv Exp $ */ +/* $NetBSD: command3.c,v 1.2 2003/08/07 09:37:00 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com3.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command3.c,v 1.1 2001/10/19 03:06:11 tv Exp $"); +__RCSID("$NetBSD: command3.c,v 1.2 2003/08/07 09:37:00 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/command4.c b/battlestar/command4.c index 2ae5bd0..b791114 100644 --- a/battlestar/command4.c +++ b/battlestar/command4.c @@ -1,4 +1,4 @@ -/* $NetBSD: command4.c,v 1.1 2001/10/19 03:06:11 tv Exp $ */ +/* $NetBSD: command4.c,v 1.2 2003/08/07 09:37:00 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com4.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command4.c,v 1.1 2001/10/19 03:06:11 tv Exp $"); +__RCSID("$NetBSD: command4.c,v 1.2 2003/08/07 09:37:00 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/command5.c b/battlestar/command5.c index 22aa3c4..17d3c10 100644 --- a/battlestar/command5.c +++ b/battlestar/command5.c @@ -1,4 +1,4 @@ -/* $NetBSD: command5.c,v 1.1 2001/10/19 03:06:11 tv Exp $ */ +/* $NetBSD: command5.c,v 1.2 2003/08/07 09:37:00 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com5.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command5.c,v 1.1 2001/10/19 03:06:11 tv Exp $"); +__RCSID("$NetBSD: command5.c,v 1.2 2003/08/07 09:37:00 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/command6.c b/battlestar/command6.c index ce9f853..3986336 100644 --- a/battlestar/command6.c +++ b/battlestar/command6.c @@ -1,4 +1,4 @@ -/* $NetBSD: command6.c,v 1.1 2001/10/19 03:06:11 tv Exp $ */ +/* $NetBSD: command6.c,v 1.2 2003/08/07 09:37:01 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com6.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command6.c,v 1.1 2001/10/19 03:06:11 tv Exp $"); +__RCSID("$NetBSD: command6.c,v 1.2 2003/08/07 09:37:01 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/command7.c b/battlestar/command7.c index 633d41f..d483245 100644 --- a/battlestar/command7.c +++ b/battlestar/command7.c @@ -1,4 +1,4 @@ -/* $NetBSD: command7.c,v 1.1 2001/10/19 03:06:11 tv Exp $ */ +/* $NetBSD: command7.c,v 1.2 2003/08/07 09:37:01 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)com7.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: command7.c,v 1.1 2001/10/19 03:06:11 tv Exp $"); +__RCSID("$NetBSD: command7.c,v 1.2 2003/08/07 09:37:01 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/cypher.c b/battlestar/cypher.c index caf4139..5131dca 100644 --- a/battlestar/cypher.c +++ b/battlestar/cypher.c @@ -1,4 +1,4 @@ -/* $NetBSD: cypher.c,v 1.21 2000/09/25 19:37:58 jsm Exp $ */ +/* $NetBSD: cypher.c,v 1.22 2003/08/07 09:37:01 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)cypher.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: cypher.c,v 1.21 2000/09/25 19:37:58 jsm Exp $"); +__RCSID("$NetBSD: cypher.c,v 1.22 2003/08/07 09:37:01 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/dayfile.c b/battlestar/dayfile.c index 29c9726..36fbc09 100644 --- a/battlestar/dayfile.c +++ b/battlestar/dayfile.c @@ -1,4 +1,4 @@ -/* $NetBSD: dayfile.c,v 1.11 2000/09/18 06:14:31 jsm Exp $ */ +/* $NetBSD: dayfile.c,v 1.12 2003/08/07 09:37:01 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dayfile.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: dayfile.c,v 1.11 2000/09/18 06:14:31 jsm Exp $"); +__RCSID("$NetBSD: dayfile.c,v 1.12 2003/08/07 09:37:01 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/dayobjs.c b/battlestar/dayobjs.c index 8efd71d..12f7095 100644 --- a/battlestar/dayobjs.c +++ b/battlestar/dayobjs.c @@ -1,4 +1,4 @@ -/* $NetBSD: dayobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $ */ +/* $NetBSD: dayobjs.c,v 1.9 2003/08/07 09:37:01 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dayobjs.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: dayobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $"); +__RCSID("$NetBSD: dayobjs.c,v 1.9 2003/08/07 09:37:01 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/extern.h b/battlestar/extern.h index ef8e391..fd6d962 100644 --- a/battlestar/extern.h +++ b/battlestar/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.28 2000/09/25 19:37:59 jsm Exp $ */ +/* $NetBSD: extern.h,v 1.29 2003/08/07 09:37:02 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/battlestar/fly.c b/battlestar/fly.c index a78a621..3caf311 100644 --- a/battlestar/fly.c +++ b/battlestar/fly.c @@ -1,4 +1,4 @@ -/* $NetBSD: fly.c,v 1.10 2001/12/04 13:00:24 blymn Exp $ */ +/* $NetBSD: fly.c,v 1.11 2003/08/07 09:37:02 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)fly.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: fly.c,v 1.10 2001/12/04 13:00:24 blymn Exp $"); +__RCSID("$NetBSD: fly.c,v 1.11 2003/08/07 09:37:02 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/getcom.c b/battlestar/getcom.c index 85cee2e..29a3456 100644 --- a/battlestar/getcom.c +++ b/battlestar/getcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: getcom.c,v 1.10 2000/09/24 15:51:40 jsm Exp $ */ +/* $NetBSD: getcom.c,v 1.11 2003/08/07 09:37:02 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getcom.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: getcom.c,v 1.10 2000/09/24 15:51:40 jsm Exp $"); +__RCSID("$NetBSD: getcom.c,v 1.11 2003/08/07 09:37:02 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/globals.c b/battlestar/globals.c index 2c7d7f5..262b23e 100644 --- a/battlestar/globals.c +++ b/battlestar/globals.c @@ -1,4 +1,4 @@ -/* $NetBSD: globals.c,v 1.18 2000/09/25 14:45:01 jsm Exp $ */ +/* $NetBSD: globals.c,v 1.19 2003/08/07 09:37:02 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)globals.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: globals.c,v 1.18 2000/09/25 14:45:01 jsm Exp $"); +__RCSID("$NetBSD: globals.c,v 1.19 2003/08/07 09:37:02 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/init.c b/battlestar/init.c index 9670ea8..a945042 100644 --- a/battlestar/init.c +++ b/battlestar/init.c @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.12 2000/09/09 09:37:58 jsm Exp $ */ +/* $NetBSD: init.c,v 1.13 2003/08/07 09:37:02 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)init.c 8.4 (Berkeley) 4/30/95"; #else -__RCSID("$NetBSD: init.c,v 1.12 2000/09/09 09:37:58 jsm Exp $"); +__RCSID("$NetBSD: init.c,v 1.13 2003/08/07 09:37:02 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/misc.c b/battlestar/misc.c index 89d636a..5bcbacb 100644 --- a/battlestar/misc.c +++ b/battlestar/misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.7 1999/02/10 01:36:50 hubertf Exp $ */ +/* $NetBSD: misc.c,v 1.8 2003/08/07 09:37:02 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: misc.c,v 1.7 1999/02/10 01:36:50 hubertf Exp $"); +__RCSID("$NetBSD: misc.c,v 1.8 2003/08/07 09:37:02 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/nightfile.c b/battlestar/nightfile.c index 9eff1c3..696d96d 100644 --- a/battlestar/nightfile.c +++ b/battlestar/nightfile.c @@ -1,4 +1,4 @@ -/* $NetBSD: nightfile.c,v 1.11 2000/09/18 06:14:32 jsm Exp $ */ +/* $NetBSD: nightfile.c,v 1.12 2003/08/07 09:37:02 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)nightfile.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: nightfile.c,v 1.11 2000/09/18 06:14:32 jsm Exp $"); +__RCSID("$NetBSD: nightfile.c,v 1.12 2003/08/07 09:37:02 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/nightobjs.c b/battlestar/nightobjs.c index fa65487..706ea5c 100644 --- a/battlestar/nightobjs.c +++ b/battlestar/nightobjs.c @@ -1,4 +1,4 @@ -/* $NetBSD: nightobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $ */ +/* $NetBSD: nightobjs.c,v 1.9 2003/08/07 09:37:03 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)nightobjs.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: nightobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $"); +__RCSID("$NetBSD: nightobjs.c,v 1.9 2003/08/07 09:37:03 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/parse.c b/battlestar/parse.c index 4470366..3c38fd7 100644 --- a/battlestar/parse.c +++ b/battlestar/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.12 2001/06/19 13:42:09 wiz Exp $ */ +/* $NetBSD: parse.c,v 1.13 2003/08/07 09:37:03 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: parse.c,v 1.12 2001/06/19 13:42:09 wiz Exp $"); +__RCSID("$NetBSD: parse.c,v 1.13 2003/08/07 09:37:03 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/pathnames.h.in b/battlestar/pathnames.h.in index 1562663..8e15a9d 100644 --- a/battlestar/pathnames.h.in +++ b/battlestar/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/21 15:07:51 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:03 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/battlestar/room.c b/battlestar/room.c index 3cdc0e1..5cbaf85 100644 --- a/battlestar/room.c +++ b/battlestar/room.c @@ -1,4 +1,4 @@ -/* $NetBSD: room.c,v 1.10 2000/09/17 23:03:43 jsm Exp $ */ +/* $NetBSD: room.c,v 1.11 2003/08/07 09:37:03 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)room.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: room.c,v 1.10 2000/09/17 23:03:43 jsm Exp $"); +__RCSID("$NetBSD: room.c,v 1.11 2003/08/07 09:37:03 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/save.c b/battlestar/save.c index e37d109..0ed15a9 100644 --- a/battlestar/save.c +++ b/battlestar/save.c @@ -1,4 +1,4 @@ -/* $NetBSD: save.c,v 1.10 2000/01/09 17:17:20 jsm Exp $ */ +/* $NetBSD: save.c,v 1.11 2003/08/07 09:37:03 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)save.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: save.c,v 1.10 2000/01/09 17:17:20 jsm Exp $"); +__RCSID("$NetBSD: save.c,v 1.11 2003/08/07 09:37:03 agc Exp $"); #endif #endif /* not lint */ diff --git a/battlestar/words.c b/battlestar/words.c index 6bcc541..8f6266a 100644 --- a/battlestar/words.c +++ b/battlestar/words.c @@ -1,4 +1,4 @@ -/* $NetBSD: words.c,v 1.10 2000/09/25 19:37:59 jsm Exp $ */ +/* $NetBSD: words.c,v 1.11 2003/08/07 09:37:03 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)words.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: words.c,v 1.10 2000/09/25 19:37:59 jsm Exp $"); +__RCSID("$NetBSD: words.c,v 1.11 2003/08/07 09:37:03 agc Exp $"); #endif #endif /* not lint */ diff --git a/bcd/bcd.6 b/bcd/bcd.6 index a7a1052..f07acb5 100644 --- a/bcd/bcd.6 +++ b/bcd/bcd.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: bcd.6,v 1.15 2003/02/25 10:34:45 wiz Exp $ +.\" $NetBSD: bcd.6,v 1.16 2003/08/07 09:37:04 agc Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/bcd/bcd.c b/bcd/bcd.c index 23c357b..97bf184 100644 --- a/bcd/bcd.c +++ b/bcd/bcd.c @@ -1,4 +1,4 @@ -/* $NetBSD: bcd.c,v 1.11 2000/07/03 03:57:40 matt Exp $ */ +/* $NetBSD: bcd.c,v 1.12 2003/08/07 09:37:04 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)bcd.c 8.2 (Berkeley) 3/20/94"; #else -__RCSID("$NetBSD: bcd.c,v 1.11 2000/07/03 03:57:40 matt Exp $"); +__RCSID("$NetBSD: bcd.c,v 1.12 2003/08/07 09:37:04 agc Exp $"); #endif #endif /* not lint */ diff --git a/boggle/Makefile.bsd b/boggle/Makefile.bsd index ecfcfc2..59d2f35 100644 --- a/boggle/Makefile.bsd +++ b/boggle/Makefile.bsd @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/09/18 02:51:46 lukem Exp $ +# $NetBSD: Makefile,v 1.22 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 .include @@ -26,10 +26,12 @@ ${MKINDEX}: @cd ${.CURDIR}/mkindex && ${MAKE} dictionary: ${WORDS} ${MKDICT} + ${_MKTARGET_CREATE} rm -f ${.TARGET} ${MKDICT} < ${WORDS} > ${.TARGET} dictindex: dictionary ${MKINDEX} + ${_MKTARGET_CREATE} rm -f ${.TARGET} ${MKINDEX} < dictionary > ${.TARGET} diff --git a/boggle/boggle/bog.c b/boggle/boggle/bog.c index 39c8932..3a11bf2 100644 --- a/boggle/boggle/bog.c +++ b/boggle/boggle/bog.c @@ -1,4 +1,4 @@ -/* $NetBSD: bog.c,v 1.16 2000/05/08 07:56:02 mycroft Exp $ */ +/* $NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\ #if 0 static char sccsid[] = "@(#)bog.c 8.2 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: bog.c,v 1.16 2000/05/08 07:56:02 mycroft Exp $"); +__RCSID("$NetBSD: bog.c,v 1.17 2003/08/07 09:37:05 agc Exp $"); #endif #endif /* not lint */ diff --git a/boggle/boggle/bog.h.in b/boggle/boggle/bog.h.in index 8c29fc3..7051d24 100644 --- a/boggle/boggle/bog.h.in +++ b/boggle/boggle/bog.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: bog.h,v 1.2 1995/03/21 12:14:32 cgd Exp $ */ +/* $NetBSD: bog.h,v 1.3 2003/08/07 09:37:05 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/boggle/boggle/boggle.6 b/boggle/boggle/boggle.6 index 19f7166..6befc4f 100644 --- a/boggle/boggle/boggle.6 +++ b/boggle/boggle/boggle.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: boggle.6,v 1.5 2002/09/26 18:31:59 wiz Exp $ +.\" $NetBSD: boggle.6,v 1.7 2003/08/07 09:37:05 agc Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -99,7 +95,7 @@ listing the board left to right and top to bottom. .El .Pp Help is available during play by typing -.Ic `?' . +.Sq Ic \&? . More detailed information on the game is given there. .Sh BUGS If there are a great many words in the cube the final display of the words diff --git a/boggle/boggle/extern.h b/boggle/boggle/extern.h index b76b68c..fa2a0ab 100644 --- a/boggle/boggle/extern.h +++ b/boggle/boggle/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.6 1999/09/09 17:30:18 jsm Exp $ */ +/* $NetBSD: extern.h,v 1.7 2003/08/07 09:37:05 agc Exp $ */ /*- * Copyright (c) 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/boggle/boggle/help.c b/boggle/boggle/help.c index 24b6f15..e1be72e 100644 --- a/boggle/boggle/help.c +++ b/boggle/boggle/help.c @@ -1,4 +1,4 @@ -/* $NetBSD: help.c,v 1.4 2001/02/05 00:27:35 christos Exp $ */ +/* $NetBSD: help.c,v 1.5 2003/08/07 09:37:05 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 6/11/93"; #else -__RCSID("$NetBSD: help.c,v 1.4 2001/02/05 00:27:35 christos Exp $"); +__RCSID("$NetBSD: help.c,v 1.5 2003/08/07 09:37:05 agc Exp $"); #endif #endif /* not lint */ diff --git a/boggle/boggle/mach.c b/boggle/boggle/mach.c index 8739750..5f78e0c 100644 --- a/boggle/boggle/mach.c +++ b/boggle/boggle/mach.c @@ -1,4 +1,4 @@ -/* $NetBSD: mach.c,v 1.11 2001/02/05 00:27:35 christos Exp $ */ +/* $NetBSD: mach.c,v 1.12 2003/08/07 09:37:05 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)mach.c 8.1 (Berkeley) 6/11/93"; #else -__RCSID("$NetBSD: mach.c,v 1.11 2001/02/05 00:27:35 christos Exp $"); +__RCSID("$NetBSD: mach.c,v 1.12 2003/08/07 09:37:05 agc Exp $"); #endif #endif /* not lint */ diff --git a/boggle/boggle/prtable.c b/boggle/boggle/prtable.c index 6796df9..6c3d507 100644 --- a/boggle/boggle/prtable.c +++ b/boggle/boggle/prtable.c @@ -1,4 +1,4 @@ -/* $NetBSD: prtable.c,v 1.6 2000/03/13 22:49:31 soren Exp $ */ +/* $NetBSD: prtable.c,v 1.7 2003/08/07 09:37:05 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -40,7 +36,7 @@ #include #ifndef lint -__RCSID("$NetBSD: prtable.c,v 1.6 2000/03/13 22:49:31 soren Exp $"); +__RCSID("$NetBSD: prtable.c,v 1.7 2003/08/07 09:37:05 agc Exp $"); #endif /* not lint */ #include diff --git a/boggle/boggle/timer.c b/boggle/boggle/timer.c index 1f48077..0d015fa 100644 --- a/boggle/boggle/timer.c +++ b/boggle/boggle/timer.c @@ -1,4 +1,4 @@ -/* $NetBSD: timer.c,v 1.7 2002/09/19 21:26:56 mycroft Exp $ */ +/* $NetBSD: timer.c,v 1.8 2003/08/07 09:37:06 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)timer.c 8.2 (Berkeley) 2/22/94"; #else -__RCSID("$NetBSD: timer.c,v 1.7 2002/09/19 21:26:56 mycroft Exp $"); +__RCSID("$NetBSD: timer.c,v 1.8 2003/08/07 09:37:06 agc Exp $"); #endif #endif /* not lint */ diff --git a/boggle/boggle/word.c b/boggle/boggle/word.c index ec11284..2d5abb4 100644 --- a/boggle/boggle/word.c +++ b/boggle/boggle/word.c @@ -1,4 +1,4 @@ -/* $NetBSD: word.c,v 1.6 2001/02/05 00:27:35 christos Exp $ */ +/* $NetBSD: word.c,v 1.7 2003/08/07 09:37:06 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)word.c 8.1 (Berkeley) 6/11/93"; #else -__RCSID("$NetBSD: word.c,v 1.6 2001/02/05 00:27:35 christos Exp $"); +__RCSID("$NetBSD: word.c,v 1.7 2003/08/07 09:37:06 agc Exp $"); #endif #endif /* not lint */ diff --git a/boggle/mkdict/mkdict.c b/boggle/mkdict/mkdict.c index 1dfdcb4..7359768 100644 --- a/boggle/mkdict/mkdict.c +++ b/boggle/mkdict/mkdict.c @@ -1,4 +1,4 @@ -/* $NetBSD: mkdict.c,v 1.8 2001/08/29 18:22:56 jsm Exp $ */ +/* $NetBSD: mkdict.c,v 1.9 2003/08/07 09:37:06 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -44,7 +40,7 @@ static const char copyright[] __attribute__((__unused__)) = static char sccsid[] = "@(#)mkdict.c 8.1 (Berkeley) 6/11/93"; #else static const char rcsid[] __attribute__((__unused__)) = - "$NetBSD: mkdict.c,v 1.8 2001/08/29 18:22:56 jsm Exp $"; + "$NetBSD: mkdict.c,v 1.9 2003/08/07 09:37:06 agc Exp $"; #endif #endif /* not lint */ diff --git a/boggle/mkindex/mkindex.c b/boggle/mkindex/mkindex.c index c14e229..bdf4822 100644 --- a/boggle/mkindex/mkindex.c +++ b/boggle/mkindex/mkindex.c @@ -1,4 +1,4 @@ -/* $NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $ */ +/* $NetBSD: mkindex.c,v 1.9 2003/08/07 09:37:06 agc Exp $ */ /*- * Copyright (c) 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -44,7 +40,7 @@ static const char copyright[] __attribute__((__unused__)) = "@(#) Copyright (c) static char sccsid[] = "@(#)mkindex.c 8.1 (Berkeley) 6/11/93"; #else static const char rcsid[] __attribute__((__unused__)) = - "$NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $"; + "$NetBSD: mkindex.c,v 1.9 2003/08/07 09:37:06 agc Exp $"; #endif #endif /* not lint */ diff --git a/bsd-games.lsm b/bsd-games.lsm index d0a32f7..ea5e804 100644 --- a/bsd-games.lsm +++ b/bsd-games.lsm @@ -1,7 +1,7 @@ Begin4 Title: bsd-games -Version: 2.14 -Entered-date: 2003-04-01 +Version: 2.15 +Entered-date: 2003-12-18 Description: Port of most of the games from NetBSD-current. Games included: adventure arithmetic atc backgammon banner battlestar bcd boggle caesar canfield countmail cribbage dm factor fish fortune @@ -11,7 +11,7 @@ Description: Port of most of the games from NetBSD-current. Games Keywords: games, NetBSD Maintained-by: jsm@polyomino.org.uk (Joseph S. Myers) Primary-site: ibiblio.org /pub/Linux/games - bsd-games-2.14.tar.gz + bsd-games-2.15.tar.gz Alternate-site: tsx-11.mit.edu /pub/linux/sources/usr.games Original-site: ftp.netbsd.org /pub/NetBSD/NetBSD-current/tar_files/src games.tar.gz diff --git a/caesar/caesar.6 b/caesar/caesar.6 index 8a0f8fe..b959e3b 100644 --- a/caesar/caesar.6 +++ b/caesar/caesar.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: caesar.6,v 1.8 2002/09/26 18:31:59 wiz Exp $ +.\" $NetBSD: caesar.6,v 1.9 2003/08/07 09:37:07 agc Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/caesar/caesar.c b/caesar/caesar.c index 595bd39..8e80335 100644 --- a/caesar/caesar.c +++ b/caesar/caesar.c @@ -1,4 +1,4 @@ -/* $NetBSD: caesar.c,v 1.11 2000/05/08 07:56:02 mycroft Exp $ */ +/* $NetBSD: caesar.c,v 1.12 2003/08/07 09:37:07 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -20,11 +20,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -51,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: caesar.c,v 1.11 2000/05/08 07:56:02 mycroft Exp $"); +__RCSID("$NetBSD: caesar.c,v 1.12 2003/08/07 09:37:07 agc Exp $"); #endif #endif /* not lint */ diff --git a/canfield/canfield/canfield.6.in b/canfield/canfield/canfield.6.in index ea81071..0745365 100644 --- a/canfield/canfield/canfield.6.in +++ b/canfield/canfield/canfield.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: canfield.6,v 1.8 2002/09/26 18:32:00 wiz Exp $ +.\" $NetBSD: canfield.6,v 1.9 2003/08/07 09:37:07 agc Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/canfield/canfield/canfield.c b/canfield/canfield/canfield.c index ddf445a..d1d40d6 100644 --- a/canfield/canfield/canfield.c +++ b/canfield/canfield/canfield.c @@ -1,4 +1,4 @@ -/* $NetBSD: canfield.c,v 1.17 2000/05/08 07:56:02 mycroft Exp $ */ +/* $NetBSD: canfield.c,v 1.18 2003/08/07 09:37:07 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)canfield.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: canfield.c,v 1.17 2000/05/08 07:56:02 mycroft Exp $"); +__RCSID("$NetBSD: canfield.c,v 1.18 2003/08/07 09:37:07 agc Exp $"); #endif #endif /* not lint */ diff --git a/canfield/canfield/pathnames.h.in b/canfield/canfield/pathnames.h.in index 001729e..b93a86d 100644 --- a/canfield/canfield/pathnames.h.in +++ b/canfield/canfield/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/21 15:08:34 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:08 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/canfield/cfscores/cfscores.c b/canfield/cfscores/cfscores.c index aeeef6c..6aecb10 100644 --- a/canfield/cfscores/cfscores.c +++ b/canfield/cfscores/cfscores.c @@ -1,4 +1,4 @@ -/* $NetBSD: cfscores.c,v 1.10 2000/07/03 03:57:40 matt Exp $ */ +/* $NetBSD: cfscores.c,v 1.11 2003/08/07 09:37:08 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)cfscores.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: cfscores.c,v 1.10 2000/07/03 03:57:40 matt Exp $"); +__RCSID("$NetBSD: cfscores.c,v 1.11 2003/08/07 09:37:08 agc Exp $"); #endif #endif /* not lint */ diff --git a/configure b/configure index f478c6e..e2bd7a7 100755 --- a/configure +++ b/configure @@ -485,6 +485,7 @@ game_ask dm "Configuration file for dm" dm_configfile /etc/dm.conf game_ask dm "File to disable games playing" dm_nogamesfile /etc/nogames game_ask dm "Log file for dm" dm_logfile "$varlibdir/games.log" game_ask fish "File for fish instructions" fish_instrfile "$sharedir/fish.instr" +game_ask fortune "Directory for fortune files" fortune_dir "$sharedir/fortune" game_ask hack "Directory for hack variable data" hack_dir "$varlibdir/hack" if building_in hack; then diff --git a/countmail/countmail.6 b/countmail/countmail.6 index 1d4b60a..3f7143c 100644 --- a/countmail/countmail.6 +++ b/countmail/countmail.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: countmail.6,v 1.8 2002/09/26 18:32:00 wiz Exp $ +.\" $NetBSD: countmail.6,v 1.9 2003/07/26 17:31:47 salo Exp $ .\" .\" Copyright (c) 1997 Matthew R. Green .\" All rights reserved. @@ -48,7 +48,7 @@ was first written by .An Noah Friedman Aq friedman@splode.com in 1993. This version was written by Charles M. Hannum -.Aq mycroft@netbsd.org . +.Aq mycroft@NetBSD.org . .Sh CAVEATS The read loop is horrendously slow on every shell implementation tried. .Nm diff --git a/cribbage/cards.c b/cribbage/cards.c index 29eed58..50e2f48 100644 --- a/cribbage/cards.c +++ b/cribbage/cards.c @@ -1,4 +1,4 @@ -/* $NetBSD: cards.c,v 1.6 1999/09/30 18:01:32 jsm Exp $ */ +/* $NetBSD: cards.c,v 1.7 2003/08/07 09:37:08 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)cards.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: cards.c,v 1.6 1999/09/30 18:01:32 jsm Exp $"); +__RCSID("$NetBSD: cards.c,v 1.7 2003/08/07 09:37:08 agc Exp $"); #endif #endif /* not lint */ diff --git a/cribbage/crib.c b/cribbage/crib.c index 5f89539..afcd572 100644 --- a/cribbage/crib.c +++ b/cribbage/crib.c @@ -1,4 +1,4 @@ -/* $NetBSD: crib.c,v 1.16 2001/12/06 11:59:45 blymn Exp $ */ +/* $NetBSD: crib.c,v 1.17 2003/08/07 09:37:09 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)crib.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: crib.c,v 1.16 2001/12/06 11:59:45 blymn Exp $"); +__RCSID("$NetBSD: crib.c,v 1.17 2003/08/07 09:37:09 agc Exp $"); #endif #endif /* not lint */ diff --git a/cribbage/cribbage.6.in b/cribbage/cribbage.6.in index 4eb0677..a57deb9 100644 --- a/cribbage/cribbage.6.in +++ b/cribbage/cribbage.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: cribbage.6,v 1.10 2002/09/30 12:43:22 wiz Exp $ +.\" $NetBSD: cribbage.6,v 1.11 2003/08/07 09:37:09 agc Exp $ .\" .\" Copyright (c) 1980, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/cribbage/cribbage.h b/cribbage/cribbage.h index bcaa8ea..f2e6451 100644 --- a/cribbage/cribbage.h +++ b/cribbage/cribbage.h @@ -1,4 +1,4 @@ -/* $NetBSD: cribbage.h,v 1.8 2002/12/06 01:48:24 thorpej Exp $ */ +/* $NetBSD: cribbage.h,v 1.9 2003/08/07 09:37:09 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/cribbage/cribcur.h b/cribbage/cribcur.h index b209f54..725147a 100644 --- a/cribbage/cribcur.h +++ b/cribbage/cribcur.h @@ -1,4 +1,4 @@ -/* $NetBSD: cribcur.h,v 1.3 1995/03/21 15:08:48 cgd Exp $ */ +/* $NetBSD: cribcur.h,v 1.4 2003/08/07 09:37:09 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/cribbage/deck.h b/cribbage/deck.h index 796175e..cccc7ab 100644 --- a/cribbage/deck.h +++ b/cribbage/deck.h @@ -1,4 +1,4 @@ -/* $NetBSD: deck.h,v 1.3 1995/03/21 15:08:49 cgd Exp $ */ +/* $NetBSD: deck.h,v 1.4 2003/08/07 09:37:10 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/cribbage/extern.c b/cribbage/extern.c index 12e23ba..01b3edd 100644 --- a/cribbage/extern.c +++ b/cribbage/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.6 2002/12/06 01:48:24 thorpej Exp $ */ +/* $NetBSD: extern.c,v 1.7 2003/08/07 09:37:10 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.6 2002/12/06 01:48:24 thorpej Exp $"); +__RCSID("$NetBSD: extern.c,v 1.7 2003/08/07 09:37:10 agc Exp $"); #endif #endif /* not lint */ diff --git a/cribbage/instr.c b/cribbage/instr.c index 5c7738c..823f9f5 100644 --- a/cribbage/instr.c +++ b/cribbage/instr.c @@ -1,4 +1,4 @@ -/* $NetBSD: instr.c,v 1.9 1999/11/09 15:06:32 drochner Exp $ */ +/* $NetBSD: instr.c,v 1.10 2003/08/07 09:37:10 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)instr.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: instr.c,v 1.9 1999/11/09 15:06:32 drochner Exp $"); +__RCSID("$NetBSD: instr.c,v 1.10 2003/08/07 09:37:10 agc Exp $"); #endif #endif /* not lint */ diff --git a/cribbage/io.c b/cribbage/io.c index 21075e2..422b02d 100644 --- a/cribbage/io.c +++ b/cribbage/io.c @@ -1,4 +1,4 @@ -/* $NetBSD: io.c,v 1.15 2002/05/26 00:12:11 wiz Exp $ */ +/* $NetBSD: io.c,v 1.16 2003/08/07 09:37:10 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: io.c,v 1.15 2002/05/26 00:12:11 wiz Exp $"); +__RCSID("$NetBSD: io.c,v 1.16 2003/08/07 09:37:10 agc Exp $"); #endif #endif /* not lint */ diff --git a/cribbage/pathnames.h.in b/cribbage/pathnames.h.in index c9cbb5d..ab5d218 100644 --- a/cribbage/pathnames.h.in +++ b/cribbage/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/21 15:08:56 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:10 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/cribbage/score.c b/cribbage/score.c index 6677314..2241bd6 100644 --- a/cribbage/score.c +++ b/cribbage/score.c @@ -1,4 +1,4 @@ -/* $NetBSD: score.c,v 1.9 2002/12/06 01:48:24 thorpej Exp $ */ +/* $NetBSD: score.c,v 1.10 2003/08/07 09:37:10 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: score.c,v 1.9 2002/12/06 01:48:24 thorpej Exp $"); +__RCSID("$NetBSD: score.c,v 1.10 2003/08/07 09:37:10 agc Exp $"); #endif #endif /* not lint */ diff --git a/cribbage/support.c b/cribbage/support.c index 288bb0c..0952b91 100644 --- a/cribbage/support.c +++ b/cribbage/support.c @@ -1,4 +1,4 @@ -/* $NetBSD: support.c,v 1.6 2002/12/06 01:48:25 thorpej Exp $ */ +/* $NetBSD: support.c,v 1.7 2003/08/07 09:37:11 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)support.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: support.c,v 1.6 2002/12/06 01:48:25 thorpej Exp $"); +__RCSID("$NetBSD: support.c,v 1.7 2003/08/07 09:37:11 agc Exp $"); #endif #endif /* not lint */ diff --git a/dm/dm.8.in b/dm/dm.8.in index 54e7ad2..3c65c81 100644 --- a/dm/dm.8.in +++ b/dm/dm.8.in @@ -1,4 +1,4 @@ -.\" $NetBSD: dm.8,v 1.8 2003/02/25 10:34:45 wiz Exp $ +.\" $NetBSD: dm.8,v 1.9 2003/08/07 09:37:11 agc Exp $ .\" .\" Copyright (c) 1987, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/dm/dm.c b/dm/dm.c index c5a108f..6c89316 100644 --- a/dm/dm.c +++ b/dm/dm.c @@ -1,4 +1,4 @@ -/* $NetBSD: dm.c,v 1.17 2002/08/02 03:06:24 christos Exp $ */ +/* $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. */ /* @@ -13,11 +13,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -44,7 +40,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.17 2002/08/02 03:06:24 christos Exp $"); +__RCSID("$NetBSD: dm.c,v 1.18 2003/08/07 09:37:11 agc Exp $"); #endif #endif /* not lint */ diff --git a/dm/dm.conf.5.in b/dm/dm.conf.5.in index aca057c..437d96a 100644 --- a/dm/dm.conf.5.in +++ b/dm/dm.conf.5.in @@ -1,4 +1,4 @@ -.\" $NetBSD: dm.conf.5,v 1.7 2002/09/26 18:32:00 wiz Exp $ +.\" $NetBSD: dm.conf.5,v 1.8 2003/08/07 09:37:11 agc Exp $ .\" .\" Copyright (c) 1988, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/dm/pathnames.h.in b/dm/pathnames.h.in index c5d0649..f48b240 100644 --- a/dm/pathnames.h.in +++ b/dm/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/21 15:09:08 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:12 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/factor/factor.6 b/factor/factor.6 index 8a24c66..493296f 100644 --- a/factor/factor.6 +++ b/factor/factor.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: factor.6,v 1.7 2002/09/26 18:32:01 wiz Exp $ +.\" $NetBSD: factor.6,v 1.8 2003/08/07 09:37:12 agc Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/factor/factor.c b/factor/factor.c index c18e388..4d66a99 100644 --- a/factor/factor.c +++ b/factor/factor.c @@ -1,4 +1,4 @@ -/* $NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $ */ +/* $NetBSD: factor.c,v 1.14 2003/08/07 09:37:12 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $"); +__RCSID("$NetBSD: factor.c,v 1.14 2003/08/07 09:37:12 agc Exp $"); #endif #endif /* not lint */ diff --git a/fish/fish.6 b/fish/fish.6 index 34c2f3e..398c55f 100644 --- a/fish/fish.6 +++ b/fish/fish.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: fish.6,v 1.7 2001/04/02 22:42:38 wiz Exp $ +.\" $NetBSD: fish.6,v 1.8 2003/08/07 09:37:13 agc Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/fish/fish.c b/fish/fish.c index 4098a11..c28da11 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -1,4 +1,4 @@ -/* $NetBSD: fish.c,v 1.13 2000/05/08 07:56:03 mycroft Exp $ */ +/* $NetBSD: fish.c,v 1.14 2003/08/07 09:37:13 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\ #if 0 static char sccsid[] = "@(#)fish.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: fish.c,v 1.13 2000/05/08 07:56:03 mycroft Exp $"); +__RCSID("$NetBSD: fish.c,v 1.14 2003/08/07 09:37:13 agc Exp $"); #endif #endif /* not lint */ diff --git a/fish/pathnames.h.in b/fish/pathnames.h.in index eb411d8..7639eb6 100644 --- a/fish/pathnames.h.in +++ b/fish/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/23 08:28:21 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:13 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/fortune/datfiles/Makefile.bsd b/fortune/datfiles/Makefile.bsd index 0007bcf..0a3eed0 100644 --- a/fortune/datfiles/Makefile.bsd +++ b/fortune/datfiles/Makefile.bsd @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/10/22 16:14:04 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2003/10/21 10:01:19 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/19/94 .include # for INSTALL_OFFENSIVE_FORTUNES @@ -37,6 +37,7 @@ realall: ${DATFILES} # Normal fortunes: build directly from data files. fortunes.dat fortunes2.dat startrek.dat zippy.dat limerick.dat netbsd.dat farber.dat: + ${_MKTARGET_CREATE} ${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET} fortunes.dat: fortunes fortunes2.dat: fortunes2 @@ -49,28 +50,38 @@ farber.dat: farber # Obscene fortunes: we have to build source and data files fortunes-o: fortunes-o.${TYPE} + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} fortunes-o.dat: fortunes-o + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} fortunes2-o: fortunes2-o.${TYPE} + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} fortunes2-o.dat: fortunes2-o + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} limerick-o: limerick-o.${TYPE} + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} limerick-o.dat: limerick-o + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} unamerican-o: unamerican-o.${TYPE} + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} unamerican-o.dat: unamerican-o + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} netbsd-o: netbsd-o.${TYPE} + ${_MKTARGET_CREATE} tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET} netbsd-o.dat: netbsd-o + ${_MKTARGET_CREATE} ${STRFILE} -rsx ${.ALLSRC} ${.TARGET} diff --git a/fortune/datfiles/Makefrag b/fortune/datfiles/Makefrag index 50a4ee1..61879c2 100644 --- a/fortune/datfiles/Makefrag +++ b/fortune/datfiles/Makefrag @@ -1,6 +1,6 @@ # Makefrag - makefile fragment for fortune/datfiles # -# Copyright (c) 1997, 1998, 1999 Joseph Samuel Myers. +# Copyright (c) 1997, 1998, 1999, 2001, 2003 Joseph Samuel Myers. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -47,7 +47,7 @@ fortune_datfiles_SRCFILESp := fortune/datfiles/farber \ fortune/datfiles/zippy fortune_datfiles_CLEANFILES := $(fortune_datfiles_DATFILES) $(fortune_datfiles_DATFILES_off) $(fortune_datfiles_GENSRCFILES) -fortune_datfiles_DIRS := $(SHAREDIR)/fortunes +fortune_datfiles_DIRS := $(FORTUNE_DIR) fortune_datfiles_all: $(fortune_datfiles_DATFILESp) $(fortune_datfiles_DATFILES_offp) $(fortune_datfiles_SRCFILESp) $(fortune_datfiles_GENSRCFILESp) @@ -56,7 +56,7 @@ fortune_datfiles_install: fortune_datfiles_all $(fortune_datfiles_GENSRCFILES) $(fortune_datfiles_DATFILES) \ $(fortune_datfiles_DATFILES_off); do \ $(INSTALL_DATA) fortune/datfiles/$$f \ - $(INSTALL_PREFIX)$(SHAREDIR)/fortunes/$$f; \ + $(INSTALL_PREFIX)$(FORTUNE_DIR)/$$f; \ done $(fortune_datfiles_DATFILESp): fortune/datfiles/%.dat: fortune/datfiles/% fortune/strfile/strfile diff --git a/fortune/datfiles/farber b/fortune/datfiles/farber index 6edc88e..064dbb5 100644 --- a/fortune/datfiles/farber +++ b/fortune/datfiles/farber @@ -243,10 +243,10 @@ Have we been cast a strange eye at? % Have we gone too fast too far? % -He has a dire need, actually it's half-dire, but he thinks +He has a dire need, actually it's half-dire, but he thinks it's double-dire. % -He may be the greatest piece of cheese that ever walked down +He may be the greatest piece of cheese that ever walked down the plank. % He and his group are two different people. @@ -355,7 +355,7 @@ He'll get his neck in hot water. % He'll grease any palm that will pat his ass. % -He's tossing symbols around like a percussionist in a John +He's tossing symbols around like a percussionist in a John Philip Sousa band. % He's a bulldog in a china shop. @@ -498,7 +498,7 @@ Hold your cool! % How old is your 2-year old? % -I speak only with olive branches dripping from the corners +I speak only with olive branches dripping from the corners of my mouth. % I accept it with both barrels. @@ -685,16 +685,16 @@ I'd like to strike while the inclination is hot. % I'd rather be tight than right. % -If they do that, they'll be committing suicide for the rest of +If they do that, they'll be committing suicide for the rest of their lives. % -If they had to stand on their own two feet, they would have gone +If they had to stand on their own two feet, they would have gone down the drain a long time ago. % -If we keep going this way, somebody is going to be left standing +If we keep going this way, somebody is going to be left standing at the church with his pants on. % -If you don't want words put in your mouth, don't leave it +If you don't want words put in your mouth, don't leave it hanging open. % If anything, I bend over on the backwards side. @@ -1853,4 +1853,3 @@ Your wild oats have come home to roost. You're blowing it all out of context. % You've always been the bone of human kindness. -% diff --git a/fortune/datfiles/fortunes b/fortune/datfiles/fortunes index eac7ca4..a679604 100644 --- a/fortune/datfiles/fortunes +++ b/fortune/datfiles/fortunes @@ -188,13 +188,6 @@ wants to read. % A closed mouth gathers no foot. % -A computer, to print out a fact, -Will divide, multiply, and subtract. - But this output can be - No more than debris, -If the input was short of exact. - -- Gigo -% A conclusion is simply the place where someone got tired of thinking. % A CONS is an object which cares. @@ -213,12 +206,6 @@ damned things is ample. A countryman between two lawyers is like a fish between two cats. -- Ben Franklin % -A crusader's wife slipped from the garrison -And had an affair with a Saracen. - She was not oversexed, - Or jealous or vexed, -She just wanted to make a comparison. -% A cynic is a person searching for an honest man, with a stolen lantern. -- Edgar A. Shoaff @@ -257,12 +244,6 @@ architect." A door is what a dog is perpetually on the wrong side of. -- Ogden Nash % -A dozen, a gross, and a score, -Plus three times the square root of four, - Divided by seven, - Plus five times eleven, -Equals nine squared plus zero, no more. -% A famous Lisp Hacker noticed an Undergraduate sitting in front of a Xerox 1108, trying to edit a complex Klone network via a browser. Wanting to help, the Hacker clicked one of the nodes in the network @@ -381,12 +362,6 @@ A Law of Computer Programming: Make it possible for programmers to write in English and you will find the programmers cannot write in English. % -A limerick packs laughs anatomical -Into space that is quite economical. - But the good ones I've seen - So seldom are clean, -And the clean ones so seldom are comical. -% A LISP programmer knows the value of everything, but the cost of nothing. -- Alan Perlis @@ -495,12 +470,6 @@ on loan," the teacher replied. At that moment, the donkey brayed loudly inside the stable. "But I can hear it bray, over there." "Whom do you believe," asked Nasrudin, "me or a donkey?" % -A new dramatist of the absurd -Has a voice that will shortly be heard. - I learn from my spies - He's about to devise -An unprintable three-letter word. -% A new koan: If you have some ice cream, I will give it to you. @@ -754,22 +723,10 @@ in students. A University without students is like an ointment without a fly. -- Ed Nather, professor of astronomy at UT Austin % -A UNIX saleslady, Lenore, -Enjoys work, but she likes the beach more. - She found a good way - To combine work and play: -She sells C shells by the seashore. -% A vacuum is a hell of a lot better than some of the stuff that nature replaces it with. -- Tennessee Williams % -A very intelligent turtle -Found programming UNIX a hurdle - The system, you see, - Ran as slow as did he, -And that's not saying much for the turtle. -% A well adjusted person is one who makes the same mistake twice without getting nervous. % @@ -3146,13 +3103,6 @@ Dentist, n.: coins out of one's pockets. -- Ambrose Bierce, "The Devil's Dictionary" % -Despising machines to a man, -The Luddites joined up with the Klan, - And ride out by night - In a sheeting of white -To lynch all the robots they can. - -- C. M. and G. A. Maxson -% Dessert is probably the most important stage of the meal, since it will be the last thing your guests remember before they pass out all over the table. @@ -4079,12 +4029,6 @@ granted. If I were you, I'd walk right up and smack them in the face. Five is a sufficiently close approximation to infinity. -- Robert Firth % -Flappity, floppity, flip -The mouse on the m"obius strip; - The strip revolved, - The mouse dissolved -In a chronodimensional skip. -% FLASH! Intelligence of mankind decreasing. Details at ... uh, when the little hand is on the .... % @@ -5183,10 +5127,6 @@ Health nuts are going to feel stupid someday, lying in hospitals dying of nothing. -- Redd Foxx % -Health nuts are going to feel stupid someday, lying in hospitals dying -of nothing. - -- Redd Foxx -% Heaven, n.: A place where the wicked cease from troubling you with talk of their personal affairs, and the good listen with attention while you @@ -6955,12 +6895,6 @@ the sucker. % If you stand on your head, you will get footprints in your hair. % -If you stick a stock of liquor in your locker, -It is slick to stick a lock upon your stock. - Or some joker who is slicker, - Will trick you of your liquor, -If you fail to lock your liquor with a lock. -% If you think education is expensive, try ignorance. -- Derek Bok, president of Harvard % @@ -8335,12 +8269,6 @@ Like the ski resort of girls looking for husbands and husbands looking for girls, the situation is not as symmetrical as it might seem. -- Alan McKay % -Limericks are art forms complex, -Their topics run chiefly to sex. - They usually have virgins, - And masculine urgin's, -And other erotic effects. -% Line Printer paper is strongest at the perforations. % Linus: I guess it's wrong always to be worrying about tomorrow. Maybe @@ -9419,8 +9347,6 @@ Noncombatant, n.: % Nondeterminism means never having to say you are wrong. % -Nondeterminism means never having to say you are wrong. -% Nostalgia isn't what it used to be. % Not far from here, by a white sun, behind a green star, lived the @@ -11858,13 +11784,6 @@ Swipple's Rule of Order: Syntactic sugar causes cancer of the semicolon. -- Epigrams in Programming, ACM SIGPLAN Sept. 1982 % -System/3! System/3! -See how it runs! See how it runs! - Its monitor loses so totally! - It runs all its programs in RPG! - It's made by our favorite monopoly! -System/3! -% Systems have sub-systems and sub-systems have sub-systems and so on ad infinitum -- which is why we're always starting over. -- Epigrams in Programming, ACM SIGPLAN Sept. 1982 @@ -13773,24 +13692,6 @@ There is something fascinating about science. One gets such wholesale returns of conjecture out of such a trifling investment of fact. -- Mark Twain % -There once was a girl named Irene -Who lived on distilled kerosene - But she started absorbin' - A new hydrocarbon -And since then has never benzene. -% -There once was a member of Mensa -Who was a most excellent fencer. - The sword that he used - Was his -- (line is refused, -And has now been removed by the censor). -% -There once was an old man from Esser, -Who's knowledge grew lesser and lesser. - It at last grew so small, - He knew nothing at all, -And now he's a College Professor. -% There was a boy called Eustace Clarence Scrubb, and he almost deserved it. -- C. S. Lewis, The Chronicles of Narnia % @@ -13806,30 +13707,6 @@ said, "Look! We're not solving anything like this! The only fair thing to do is to vote on it." So they did, and Mayor Daley won by 97 votes. % -There was a young lady from Hyde -Who ate a green apple and died. - While her lover lamented - The apple fermented -And made cider inside her inside. -% -There was a young man who said "God, -I find it exceedingly odd, - That the willow oak tree - Continues to be, -When there's no one about in the Quad." - -"Dear Sir, your astonishment's odd, -For I'm always about in the Quad; - And that's why the tree, - Continues to be," -Signed "Yours faithfully, God." -% -There was a young poet named Dan, -Whose poetry never would scan. - When told this was so, - He said, "Yes, I know. -It's because I try to put every possible syllable into that last line that I can." -% There was an interesting development in the CBS-Westmoreland trial: both sides agreed that after the trial, Andy Rooney would be allowed to talk to the jury for three minutes about little things that annoyed him @@ -15437,7 +15314,7 @@ Who needs friends when you can sit alone in your room and drink? % Who's on first? % -Whom are you?" said he, for he had been to night school. +"Whom are you?" said he, for he had been to night school. -- George Ade % Whom computers would destroy, they must first drive mad. diff --git a/fortune/datfiles/fortunes-o.real b/fortune/datfiles/fortunes-o.real index 355934c..b0f1303 100644 --- a/fortune/datfiles/fortunes-o.real +++ b/fortune/datfiles/fortunes-o.real @@ -2,18 +2,6 @@ 69 with two fingers up your ass. -- George Carlin % -A bather whose clothing was strewed -By breezes that left her quite nude, - Saw a man come along - And, unless I'm quite wrong, -You expected this line to be lewd. -% -A beat schizophrenic said, "Me? -I am not I, I'm a tree." - But another, more sane, - Shouted, "I'm a Great Dane!" -And covered his pants leg with pee. -% A bureaucracy is like a septic tank -- all the really big shits float to the top. % @@ -35,12 +23,6 @@ A hard man is good to find. % A man needs a mistress, just to break the monogamy. % -A mathematician named Hall -Has a hexahedronical ball, - And the cube of its weight - Times his pecker's, plus eight -Is his phone number -- give him a call. -% A Mormon is a man that has the bad taste and the religion to do what a good many other people are restrained from doing by conscientious scruples and the police. @@ -58,58 +40,16 @@ A nymph hits you and steals your virginity. A person who has both feet planted firmly in the air can be safely called a liberal. % -A pretty young lady named Vogel -Once sat herself down on a molehill. - A curious mole - Nosed into her hole -- -Ms. Vogel's ok, but the mole's ill. -% -A pretty young maiden from France -Decided she'd "just take a chance." - She let herself go - For an hour or so -And now all her sisters are aunts. -% A Puritan is someone who is deathly afraid that someone, somewhere, is having fun. % A reactionary is a man whose political opinions always manage to keep up with yesterday. % -A remarkable race are the Persians; -They have such peculiar diversions. - They make love the whole day - In the usual way -And save up the nights for perversions. -% -A team playing baseball in Dallas -Called the umpire blind out of malice. - While this worthy had fits - The team made eight hits -And a girl in the bleachers named Alice. -% -A wanton young lady from Wimley -Reproached for not acting quite primly - Said, "Heavens above! - I know sex isn't love, -But it's such an entrancing facsimile." -% -A widow who fancied a man some -Was diddled three times in a hansome. - When she clamored for more - Her young man became sore -And exclaimed "My name's Simpson not Samson." -% A woman is like a dresser ... some man always goin' through her drawers. -- Blind Lemon Pledge % -A worried young man from Stamboul -Founds lots of red spots on his tool. - Said the doctor, a cynic, - "Get out of my clinic; -Just wipe off the lipstick, you fool!" -% A.I. hackers do it with robots. % Absinthe makes the tart grow fonder. @@ -154,12 +94,6 @@ America is a large, friendly dog in a very small room. Every time it wags its tail, it knocks over a chair. -- Arnold Joseph Toynbee % -An architect fellow named Yoric -Could, when feeling euphoric, - Display for selection - Three kinds of erection -- -Corinthian, ionic, and doric. -% An Army travels on her stomach. % An egg has the shortest sex-life of all: it gets laid once; it gets @@ -608,12 +542,6 @@ finally hit upon the idea of woman and created Eve. % He could be a poster child for retroactive birth control. % -He hated to mend, so young Ned -Called in a cute neighbor instead. - Her husband said, "Vi, - When you stitched his torn fly, -Did you have to bite off the thread?" -% He wasn't much of an actor, he wasn't much of a Governor -- Hell, they _H_A_D to make him President of the United States. It's the only job he's qualified for! @@ -704,12 +632,6 @@ I hope he fries in Hell. % I love this fucking University, and this University loves fucking me. % -I once met a lassie named Ruth -In a long distance telephone booth. - Now I know the perfection - Of an ideal connection -Even if somewhat uncouth. -% I own my own body, but I share. % I realize that today you have a number of top female athletes such as @@ -871,12 +793,6 @@ growth of the Laboratories." And the Captain looked down upon the Project, and He saw that it was Good! % -In the Garden of Eden sat Adam, -Massaging the bust of his madam, - He chuckled with mirth, - For he knew that on earth, -There were only two boobs and he had 'em. -% Incest, n.: Sibling revelry. % @@ -1051,12 +967,6 @@ Ocean, n.: A body of water occupying about two-thirds of a world made for man -- who has no gills. % -Once a young gay from Khartoum -Took a lesbian up to his room. - They argued all night - Over who had the right -To do what, and with which, and to whom. -% Once upon a time, there was a non-conforming sparrow who decided not to fly south for the winter. However, soon after the weather turned cold, the sparrow changed his mind and reluctantly started to fly south. @@ -1259,30 +1169,6 @@ any reason why they should. Democrats ought to, but don't. % Ronald Reagan -- America's favorite placebo % -Said a horny young girl from Milpitas, -"My favorite sport is coitus." - But a fullback from State - Made her period late, -And now she has athlete's fetus. -% -Said a swinging young chick named Lyth -Whose virtue was largely a myth, - "Try as hard as I can, - I can't find a man -That it's fun to be virtuous with." -% -Said Einstein, "I have an equation -Which to some may seem rabelaisian: - Let _V be virginity - Approaching infinity; -Let _P be a constant persuasion; - -"Let _V over _P be inverted -With the square root of _M_u inserted - _N times into _V ... - The result, Q.E.D., -Is a relative!" Einstein asserted. -% Save Soviet Jewry -- Win Valuable Prizes!!!! % Sex is like a bridge game -- If you have a good hand no partner is @@ -1527,184 +1413,6 @@ There are two sides to every divorce: yours and the shithead's. There is a God, but He drinks. -- Blore % -There once was a couple named Kelley, -Who lived their life belly to belly. - Because in their haste - They used Library Paste, -Instead of Petroleum Jelly. -% -There once was a feisty young terrier -Who liked to bite girls on the derriere. - He'd yip and he'd yap, - Then leap up and snap; -And the fairer the derriere the merrier. -% -There once was a freshman named Lin, -Whose tool was as thin as a pin, - A virgin named Joan - From a bible belt home, -Said, "This won't be much of a sin." -% -There once was a hacker named Ken -Who inherited truckloads of Yen - So he built him some chicks - Of silicon chips -And hasn't been heard from since then. -% -There once was a lady from Exeter, -So pretty that men craned their necks at her. - One was even so brave - As to take out and wave -The distinguishing mark of his sex at her. -% -There once was a man named Eugene -Who invented a screwing machine - Concave and convex - It served either sex -And it played with itself in between. -% -There once was a plumber from Leigh, -Who was plumbing his maid by the sea, - Said she, "Please stop plumbing, - I think someone's coming!" -Said he, "Yes I know love, it's me." -% -There once was a queen of Bulgaria -Whose bush had grown hairier and hairier, - Till a prince from Peru - Who came up for a screw -Had to hunt for her cunt with a terrier. -% -There once was a Scot named McAmeter -With a tool of prodigious diameter. - It was not the size - That cause such surprise; -'Twas his rhythm -- iambic pentameter. -% -There was a bluestocking in Florence -Wrote anti-sex pamphlets in torrents, - Till a Spanish grandee, - Got her off with his knee, -And she burned all her works with abhorrence. -% -There was a gay countess of Bray, -And you may think it odd when I say, - That in spite of high station, - Rank and education, -She always spelled cunt with a "k". -% -There was a young fellow named Bliss -Whose sex life was strangely amiss, - For even with Venus - His recalcitrant penis -Would never do better than t - h - i - s - . -% -There was a young girl from Hong Kong -Whose cervical cap was a gong. - She said with a yell, - As a shot rang her bell, -"I'll give you a ding for a dong!" -% -There was a young girl named Sapphire -Who succumbed to her lover's desire. - She said, "It's a sin, - But now that it's in, -Could you shove it a few inches higher?" -% -There was a young girl of Angina -Who stretched catgut across her vagina. - From the love-making frock - (With the proper sized cock) -Came Tocata and Fugue in D minor. -% -There was a young girl of Darjeeling -Who could dance with such exquisite feeling - There was never a sound - For miles around -Save of fly-buttons hitting the ceiling. -% -There was a young lad name of Durcan -Who was always jerkin' his gherkin. - His father said, "Durcan! - Stop jerkin' your gherkin! -Your gherkin's for ferkin', not jerkin'. -% -There was a young lady from Maine -Who claimed she had men on her brain. - But you knew from the view, - As her abdomen grew, -It was not on her brain that he'd lain. -% -There was a young lady named Clair -Who possessed a magnificent pair; - At least so I thought - Till I saw one get caught -On a thorn, and begin losing air. -% -There was a young lady named Hall, -Wore a newspaper dress to a ball. - The dress caught on fire - And burned her entire -Front page, sporting section, and all. -% -There was a young lady named Twiss -Who said she thought fucking a bliss, - For it tickled her bum - And caused her to come -.siht ekil gniyl ylbatrofmoc elihW -% -There was a young lady of Norway -Who hung by her toes in a doorway. - She said to her beau - "Just look at me, Joe, -I think I've discovered one more way." -% -There was a young man from Bel-Air -Who was screwing his girl on the stair, - But the banister broke, - So he doubled his stroke, -And finished her off in mid-air. -% -There was a young man named Crockett -Whose balls got caught in a socket. - His wife was a bitch, - And she threw the switch, -As Crockett went off like a rocket. -% -There was a young man of Cape Horn -Who wished he had never been born, - And he wouldn't have been - If his father had seen -That the end of the rubber was torn. -% -There was a young man of St. John's -Who wanted to bugger the swans. - But the loyal hall porter - Said, "Pray take my daughter! -Those birds are reserved for the dons." -% -There was a young whore from Kaloo -Who filled her vagina with glue. - She said with a grin, - "If they pay to get in, -They can pay to get out again too!" -% -There was an old man of the port -Whose prick was remarkably short. - When he got into bed, - The old woman said, -"This isn't a prick; it's a wart!" -% -There was an old pirate named Bates -Who was learning to rhumba on skates. - He fell on his cutlass, - Which rendered him nutless -And practically useless on dates. -% There were the Scots Who kept the Sabbath And everything else they could lay their hands on. @@ -1913,12 +1621,6 @@ would be before she could resume her sex life. "I really haven't thought about it," gulped the stunned surgeon. "You're the first patient who's asked me that after a tonsillectomy!" % -While I, with my usual enthusiasm, -Was exploring in Ermintrude's busiasm, - She explained, "They are flat, - But think nothing of that -- -You will find that my sweet sister Susiasm." -% White House carpenters have reworked the master bedroom, remodeling it so that Ronnie can sleep with his head in the hall. That way, by the time he wakes up, somebody will have already shined his hair. diff --git a/fortune/datfiles/fortunes2 b/fortune/datfiles/fortunes2 index 96c366a..547657f 100644 --- a/fortune/datfiles/fortunes2 +++ b/fortune/datfiles/fortunes2 @@ -2310,7 +2310,7 @@ Fish heads, fish heads, eat them up. Yum! They can't play baseball; they don't wear sweaters; They aren't good dancers; they can't play drums. (chorus): - Roly-poly fish heads are NEVER seen drinking cappucino in + Roly-poly fish heads are NEVER seen drinking cappuccino in Italian restaurants with Oriental women. (chorus): Fishy! @@ -3352,26 +3352,6 @@ had to be printed and pasted over them in every copy. The result provoked wry comments on the rather patchy papal infallibility, and Pope Sixtus had no recourse but to order the return and destruction of every copy. -% - So Richard and I decided to try to catch [the small shark]. With -a great deal of strategy and effort and shouting, we managed to maneuver -the shark, over the course of about a half-hour, to a sort of corner of the -lagoon, so that it had no way to escape other than to flop up onto the land -and evolve. Richard and I were inching toward it, sort of crouched over, -when all of a sudden it turned around and -- I can still remember the -sensation I felt at that moment, primarily in the armpit area -- headed -right straight toward us. - Many people would have panicked at this point. But Richard and I -were not "many people." We were experienced waders, and we kept our heads. -We did exactly what the textbook says you should do when you're unarmed and -a shark that is nearly two feet long turns on you in water up to your lower -calves: We sprinted I would say 600 yards in the opposite direction, using -a sprinting style such that the bottoms of our feet never once went below -the surface of the water. We ran all the way to the far shore, and if we -had been in a Warner Brothers cartoon we would have run right INTO the beach, -and you would have seen these two mounds of sand racing across the island -until they bonked into trees and coconuts fell onto their heads. - -- Dave Barry, "The Wonders of Sharks on TV" % So Richard and I decided to try to catch [the small shark]. With a great deal of strategy and effort and shouting, we managed to @@ -3523,24 +3503,6 @@ is the only thing for you. Look what a lot of things there are to learn." -- T.H. White, "The Once and Future King" % The big problem with pornography is defining it. You can't just -say it's pictures of people naked. For example, you have these primitive -African tribes that exist by chasing the wildebeest on foot, and they have -to go around largely naked, because, as the old tribal saying goes: "N'wam -k'honi soit qui mali," which means, "If you think you can catch a wildebeest -in this climate and wear clothes at the same time, then I have some beach -front property in the desert region of Northern Mali that you may be -interested in." - So it's not considered pornographic when National Geographic publishes -color photographs of these people hunting the wildebeest naked, or pounding -one rock onto another rock for some primitive reason naked, or whatever. -But if National Geographic were to publish an article entitled "The Girls -of the California Junior College System Hunt the Wildebeest Naked," some -people would call it pornography. But others would not. And still others, -such as the Spectacularly Rev. Jerry Falwell, would get upset about seeing -the wildebeest naked. - -- Dave Barry, "Pornography" -% - The big problem with pornography is defining it. You can't just say it's pictures of people naked. For example, you have these primitive African tribes that exist by chasing the wildebeest on foot, and they have to go around largely naked, because, as the old tribal @@ -5084,16 +5046,6 @@ of this article.) "... bleakness... desolation... plastic forks..." -- Zippy the Pinhead % -... But if we laugh with derision, we will never understand. Human -intellectual capacity has not altered for thousands of years so far as we -can tell. If intelligent people invested intense energy in issues that now -seem foolish to us, then the failure lies in our understanding of their -world, not in their distorted perceptions. Even the standard example of -ancient nonsense -- the debate about angels on pinheads -- makes sense once -you realize that theologians were not discussing whether five or eighteen -would fit, but whether a pin could house a finite or an infinite number. - -- S. J. Gould, "Wide Hats and Narrow Minds" -% ... C++ offers even more flexible control over the visibility of member objects and member functions. Specifically, members may be placed in the public, private, or protected parts of a class. Members declared in the @@ -6510,10 +6462,6 @@ A government that is big enough to give you all you want is big enough to take it all away. -- Barry Goldwater % -A government that is big enough to give you all you want is big enough -to take it all away. - -- Barry Goldwater -% A grammarian's life is always intense. % A great empire, like a great cake, is most easily diminished at the edges. @@ -8025,15 +7973,6 @@ A wise person makes his own decisions, a weak one obeys public opinion. A witty saying proves nothing. -- Voltaire % -"A wizard cannot do everything; a fact most magicians are reticent to admit, -let alone discuss with prospective clients. Still, the fact remains that -there are certain objects, and people, that are, for one reason or another, -completely immune to any direct magical spell. It is for this group of -beings that the magician learns the subtleties of using indirect spells. -It also does no harm, in dealing with these matters, to carry a large club -near your person at all times." - -- The Teachings of Ebenezum, Volume VIII -% A wizard cannot do everything; a fact most magicians are reticent to admit, let alone discuss with prospective clients. Still, the fact remains that there are certain objects, and people, that are, for one reason or another, @@ -8072,14 +8011,6 @@ A woman is like your shadow; follow her, she flies; fly from her, she follows. -- Chamfort % -A woman is like your shadow; follow her, -she flies; fly from her, she follows. - -- Chamfort -% -A woman may very well form a friendship with a man, but for this to endure, -it must be assisted by a little physical antipathy. - -- Nietzsche -% A woman may very well form a friendship with a man, but for this to endure, it must be assisted by a little physical antipathy. -- Nietzsche @@ -8088,10 +8019,6 @@ A woman must be a cute, cuddly, naive little thing -- tender, sweet, and stupid. -- Adolf Hitler % -A woman must be a cute, cuddly, naive -little thing -- tender, sweet, and stupid. - -- Adolf Hitler -% A woman of generous character will sacrifice her life a thousand times over for her lover, but will break with him for ever over a question of pride -- for the opening or the shutting of a door. @@ -8410,12 +8337,6 @@ Here in New York we really don't care too much. Because we know that we could beat up their city anytime. -- David Letterman % -According to the Rand McNally Places-Rated Almanac, the best place to live in -America is the city of Pittsburgh. The city of New York came in twenty-fifth. -Here in New York we really don't care too much. Because we know that we could -beat up their city anytime. - -- David Letterman -% ACCORDION: A bagpipe with pleats. % @@ -8872,12 +8793,6 @@ The surest poison is time. Alcohol is the anesthesia by which we endure the operation of life. -- George Bernard Shaw % -Alden's Laws: - (1) Giving away baby clothes and furniture is the major cause - of pregnancy. - (2) Always be backlit. - (3) Sit down whenever possible. -% Alden's Laws: 1: Giving away baby clothes and furniture is the major cause of pregnancy. @@ -9477,11 +9392,6 @@ R: "We take tanks." An American's a person who isn't afraid to criticize the president but is always polite to traffic cops. % -An anthropologist at Tulane has just come back from a field trip to New -Guinea with reports of a tribe so primitive that they have Tide but not -new Tide with lemon-fresh Borax. - -- David Letterman -% An anthropologist at Tulane has just come back from a field trip to New Guinea with reports of a tribe so primitive that they have Tide but not new Tide with lemon-fresh Borax. @@ -9978,13 +9888,6 @@ in short, I should have liked, I do confess, to have had the lightest license of a child, and yet been man enough to know its value. -- Charles Dickens % -And yet, seasons must be taken with a grain of salt, for they too have a -sense of humor, as does history. Corn stalks comedy, comedy stalks tragedy, -and this too is historic. And yet, still, when corn meets tragedy face to -face, we have politics. - -- Dalglish, Larsen and Sutherland, "Root Crops and - Ground Cover" -% And yet, seasons must be taken with a grain of salt, for they too have a sense of humor, as does history. Corn stalks comedy, comedy stalks tragedy, and this too is historic. And yet, still, when corn meets @@ -10500,9 +10403,6 @@ Are you making all this up as you go along? Are you sure the back door is locked? % "Are you sure you're not an encyclopedia salesman?" -"No, Ma'am. Just a burglar, come to ransack the flat." -% -"Are you sure you're not an encyclopedia salesman?" No, Ma'am. Just a burglar, come to ransack the flat." -- Monty Python % @@ -10643,11 +10543,6 @@ disgusting person are you," these letters typically ask, "that you make jokes about setting fire to a goat?" -- Dave Barry % -As an adolescent I aspired to lasting fame, I craved factual certainty, and I -thirsted for a meaningful vision of human life -- so I became a scientist. -This is like becoming an archbishop so you can meet girls. - -- M. Cartmill -% As an adolescent I aspired to lasting fame, I craved factual certainty, and I thirsted for a meaningful vision of human life -- so I became a scientist. This is like becoming an archbishop so you can meet girls. @@ -11209,9 +11104,6 @@ never really caught on. Back when I was a boy, it was 40 miles to everywhere, uphill both ways and it was always snowing. % -Back when I was a boy, it was 40 miles to everywhere, uphill both ways -and it was always snowing. -% BACKWARD CONDITIONING: Putting saliva in a dog's mouth in an attempt to make a bell ring. % @@ -14783,7 +14675,7 @@ just whipped out a quarter? % "Do you think there's a God?" "Well, SOMEbody's out to get me!" - -- Calvin and Hobbs + -- Calvin and Hobbes % "Do you think what we're doing is wrong?" "Of course it's wrong! It's illegal!" @@ -14819,9 +14711,6 @@ Documentation: Documentation is the castor oil of programming. Managers know it must be good because the programmers hate it so much. % -Documentation is the castor oil of programming. -Managers know it must be good because the programmers hate it so much. -% Does a good farmer neglect a crop he has planted? Does a good teacher overlook even the most humble student? Does a good father allow a single child to starve? @@ -14866,12 +14755,6 @@ I chase the bright elusive butterfly of love. Don't be humble, you're not that great. -- Golda Meir % -Don't be humble, you're not that great. - -- Golda Meir -% -Don't be irreplaceable. If you can't -be replaced, you cannot be promoted. -% Don't be irreplaceable, if you can't be replaced, you can't be promoted. % Don't be overly suspicious where it's not warranted. @@ -15314,9 +15197,6 @@ production of great leaders has been discontinued. Due to circumstances beyond your control, you are master of your fate and captain of your soul. % -Due to circumstances beyond your control, -you are master of your fate and captain of your soul. -% Dungeons and Dragons is just a lot of Saxon Violence. % During almost fifteen centuries the legal establishment of Christianity has @@ -16261,13 +16141,6 @@ There are no absolute continuums. There are no surfaces. There are no straight lines. -- R. Buckminster Fuller % -Everything you've learned in school as "obvious" becomes less and less -obvious as you begin to study the universe. For example, there are no -solids in the universe. There's not even a suggestion of a solid. There -are no absolute continuums. There are no surfaces. There are no -straight lines. - -- R. Buckminster Fuller -% Everything's great in this good old world; (This is the stuff they can always use.) God's in his heaven, the hill's dew-pearled; @@ -16333,10 +16206,6 @@ Excess on occasion is exhilarating. It prevents moderation from acquiring the deadening effect of a habit. -- W. Somerset Maugham % -Excess on occasion is exhilarating. It prevents -moderation from acquiring the deadening effect of a habit. - -- W. Somerset Maugham -% Excessive login messages is a sure sign of senility. % Execute every act of thy life as though it were thy last. @@ -18188,9 +18057,6 @@ furbling, v: even when you are the only person in line. -- Rich Hall, "Sniglets" % -Furious activity is no substitute for understanding. - -- H. H. Williams -% Furious activity is no substitute for understanding. -- H.H. Williams % @@ -18898,9 +18764,6 @@ Good night, Mrs. Calabash, wherever you are. Good night to spend with family, but avoid arguments with your mate's new lover. % -Good night to spend with family, -but avoid arguments with your mate's new lover. -% Good salesmen and good repairmen will never go hungry. -- R.E. Schenk % @@ -19221,10 +19084,6 @@ Hacker's Law: The belief that enhanced understanding will necessarily stir a nation to action is one of mankind's oldest illusions. % -Hacker's Law: - The belief that enhanced understanding will necessarily stir a - nation to action is one of mankind's oldest illusions. -% Hackers of the world, unite! % Hacker's Quicky #313: @@ -19341,10 +19200,6 @@ Hanson's Treatment of Time: There are never enough hours in a day, but always too many days before Saturday. % -Hanson's Treatment of Time: - There are never enough hours in a day, but always too many days - before Saturday. -% Happiness adds and multiplies as we divide it with others. % happiness, adv: @@ -22450,7 +22305,7 @@ but for what I am when I am with you. % I loved her with a love thirsty and desperate. I felt that we two might commit some act so atrocious that the world, seeing us, would find it -irresistable. +irresistible. -- Gene Wolfe, "The Shadow of the Torturer" % I married beneath me. All women do. @@ -22488,8 +22343,6 @@ week sometimes to make it up. % I must have slipped a disk -- my pack hurts! % -I must have slipped a disk; my pack hurts. -% I myself have dreamed up a structure intermediate between Dyson spheres and planets. Build a ring 93 million miles in radius -- one Earth orbit -- around the sun. If we have the mass of Jupiter to work with, and if @@ -23256,10 +23109,6 @@ I used to think that the brain was the most wonderful organ in my body. Then I realized who was telling me this. -- Emo Phillips % -I used to work in a fire hydrant factory. You couldn't park anywhere near -the place. - -- Steven Wright -% I used to work in a fire hydrant factory. You couldn't park anywhere near the place. -- Steven Wright @@ -23874,11 +23723,6 @@ If a train station is a place where a train stops, what's a workstation? % If addiction is judged by how long a dumb animal will sit pressing a lever to get a "fix" of something, to its own detriment, then I would conclude -that netnews is far more addictive than cocaine. - -- Rob Stampfli -% -If addiction is judged by how long a dumb animal will sit pressing a lever -to get a "fix" of something, to its own detriment, then I would conclude that netnews is far more addictive than cocaine. -- Rob Stampfli % @@ -24322,8 +24166,6 @@ If it happens once, it's a bug. If it happens twice, it's a feature. If it happens more than twice, it's a design philosophy. % -If it has syntax, it isn't user friendly. -% If it has syntax, it isn't user-friendly. % If it heals good, say it. @@ -25156,9 +24998,6 @@ but there's only one Maltese Falcon. If you lose your temper at a newspaper columnist, he'll get rich, or famous or both. % -If you lose your temper at a newspaper columnist, -he'll get rich or famous or both. -% If you love someone, set them free. If they don't come back, then call them up when you're drunk. % @@ -29255,8 +29094,6 @@ L'etat c'est moi. Let's do it. -- Gary Gilmore, to his firing squad % -Let's just be friends and make no special effort to ever see each other again. -% Let's just be friends and make no special effort to ever see each other again. % @@ -29264,14 +29101,6 @@ Let's just say that where a change was required, I adjusted. In every relationship that exists, people have to seek a way to survive. If you really care about the person, you do what's necessary, or that's the end. For the first time, I found that I really could change, and the qualities -I most admired in myself I gave up. I stopped being loud and bossy ... -Oh, all right. I was still loud and bossy, but only behind his back. - -- Kate Hepburn, on Tracy and Hepburn -% -Let's just say that where a change was required, I adjusted. In every -relationship that exists, people have to seek a way to survive. If you -really care about the person, you do what's necessary, or that's the end. -For the first time, I found that I really could change, and the qualities I most admired in myself I gave up. I stopped being loud and bossy... Oh, all right. I was still loud and bossy, but only behind his back." -- Kate Hepburn, on Tracy and Hepburn @@ -29701,12 +29530,6 @@ Charlie Brown: No, that's giving up. I'm still hoping that yesterday will get better. % -Linus: I guess it's wrong always to be worrying about tomorrow. Maybe - we should think only about today. -Charlie Brown: - No, that's giving up. I'm still hoping that yesterday will get - better. -% Linus' Law: There is no heavier burden than a great potential. % @@ -30095,10 +29918,6 @@ Love is always open arms. With arms open you allow love to come and go as it wills, freely, for it will do so anyway. If you close your arms about love you'll find you are left only holding yourself. % -Love is an ideal thing, marriage a real thing; a confusion of the real -with the ideal never goes unpunished. - -- Goethe -% Love is an ideal thing, marriage a real thing; a confusion of the real with the ideal never goes unpunished. -- Goethe @@ -30448,10 +30267,6 @@ Man is a military animal, Glories in gunpowder, and loves parade. -- P.J. Bailey % -Man is a rational animal who always loses his temper when he is called upon -to act in accordance with the dictates of reason. - -- Oscar Wilde -% Man is a rational animal who always loses his temper when he is called upon to act in accordance with the dictates of reason. -- Oscar Wilde @@ -31942,10 +31757,6 @@ My doctor told me to stop having intimate dinners for four. Unless there are three other people. -- Orson Welles % -My doctor told me to stop having intimate dinners for four. Unless there -are three other people. - -- Orson Welles -% My doctorate's in Literature, but it seems like a pretty good pulse to me. % My experience with government is when things are non-controversial, @@ -32735,10 +32546,6 @@ And tapes mixed up on the racks -- Ninety percent of the politicians give the other ten percent a bad reputation. -- Henry Kissinger % -Ninety percent of the time things turn out worse than you thought they would. -The other ten percent of the time you had no right to expect that much. - -- Augustine -% Ninety percent of the time things turn out worse than you thought they would. The other ten percent of the time you had no right to expect that much. @@ -33415,13 +33222,6 @@ and/or frogs falling from the sky. % Note to myself: use real bullets next time. % -Notes for a ballet, "The Spell:" ... Suddenly Sigmund hears the -flutter of wings, and a group of wild swans flies across the moon ... -Sigmund is astounded to see that their leader is part swan and part -woman -- unfortunately, divided lengthwise. She enchants Sigmund, who -is careful not to make any poultry jokes... - -- Woody Allen -% Notes for a ballet, "The Spell": ... Suddenly Sigmund hears the flutter of wings, and a group of wild swans flies across the moon ... Sigmund is astounded to see that their leader is part swan and part woman -- @@ -33536,10 +33336,6 @@ Nothing succeeds like the appearance of success. Nothing takes the taste out of peanut butter quite like unrequited love. -- Charlie Brown % -Nothing takes the taste out of peanut -butter quite like unrequited love. - -- Charlie Brown -% Nothing that's forced can ever be right, If it doesn't come naturally, leave it. That's what she said as she turned out the light, @@ -34277,8 +34073,6 @@ girl knelt by her bed to say her prayers. "God bless Mommy and Daddy and Keith and Kim," she said. As she began to get up, she quickly added, "Oh, and God, this is goodbye. We're moving to Hollywood." % -On the road, ZIPPY is a pinhead without a purpose, but never without a POINT. -% On the road, ZIPPY is a pinhead without a purpose, but never without a POINT. % @@ -35610,10 +35404,6 @@ People who go to conferences are the ones who shouldn't. People who have no faults are terrible; there is no way of taking advantage of them. % -People who have what they want are very fond of telling people who haven't -what they want that they don't want it. - -- Ogden Nash -% People who have what they want are very fond of telling people who haven't what they want that they don't want it. -- Ogden Nash @@ -35630,9 +35420,6 @@ cold baths. People who think they know everything greatly annoy those of us who do. % -People will accept your ideas much more readily if you tell them that Benjamin -Franklin said it first. -% People will accept your ideas much more readily if you tell them that Benjamin Franklin said it first. % @@ -37550,9 +37337,6 @@ Everything I am today I owe to people, whom it is now to late to punish. % QOTD: -I haven't come far enough and don't call me baby. -% -QOTD: I looked out my window, and saw Kyle Pettys' car upside down, then I thought 'One of us is in real trouble'. -- Davey Allison, on a 150 m.p.h. crash @@ -37822,10 +37606,6 @@ Reality must take precedence over public relations, for Mother Nature cannot be fooled. -- R.P. Feynman % -Reality must take precedence over public -relations, for Mother Nature cannot be fooled. - -- R.P. Feynman -% Really?? What a coincidence, I'm shallow too!! % Reappraisal, n: @@ -37866,20 +37646,6 @@ lose your job. These economic downturns are very difficult to predict, but sophisticated econometric modeling houses like Data Resources and Chase Econometrics have successfully predicted 14 of the last 3 recessions. % -Recipe for a Pan Galactic Gargle Blaster: - (1) Take the juice from one bottle of Ol' Janx Spirit - (2) Pour into it one measure of water from the seas of - Santraginus V (Oh, those Santraginean fish!) - (3) Allow 3 cubes of Arcturan Mega-gin to melt into the - mixture (properly iced or the benzine is lost.) - (4) Allow four liters of Fallian marsh gas to bubble through it. - (5) Over the back of a silver spoon, float a measure of - Qualactin Hypermint extract. - (6) Drop in the tooth of an Algolian Suntiger. Watch it dissolve. - (7) Sprinkle Zamphuor. - (8) Add an olive. - (9) Drink... but... very carefully... -% Recipe for a Pan Galactic Gargle Blaster: (1) Take the juice from one bottle of Ol' Janx Spirit (2) Pour into it one measure of water from the seas of @@ -38153,17 +37919,6 @@ Rhode's Law: and infinitely so, until such time as it becomes advantageous to assume otherwise, maybe. % -Rhode's Law: - When any principle, law, tenet, probability, happening, circumstance, -or result can in no way be directly, indirectly, empirically, or circuitously -proven, derived, implied, inferred, induced, deducted, estimated, or -scientifically guessed, it will always for the purpose of convenience, -expediency, political advantage, material gain, or personal comfort, or any -combination of the above, or none of the above, be unilaterally and -unequivocally assumed, proclaimed, and adhered to as absolute truth to be -undeniably, universally, immutably, and infinitely so, until such time as -it becomes advantageous to assume otherwise, maybe. -% Rich bachelors should be heavily taxed. It is not fair that some men should be happier than others. -- Oscar Wilde @@ -39232,11 +38987,6 @@ aircraft carrier in the Formosa Straits.' bad fiction contest. % Sherry [Thomas Sheridan] is dull, naturally dull; but it must have taken -him a great deal of pains to become what we now see him. Such an excess of -stupidity, sir, is not in Nature. - -- Samuel Johnson -% -Sherry [Thomas Sheridan] is dull, naturally dull; but it must have taken him a great deal of pains to become what we now see him. Such an excess of stupidity, sir, is not in Nature. -- Samuel Johnson @@ -39663,15 +39413,6 @@ into this. composed for Linda Wertheimer of National Public Radio. From SPY Magazine, November 1992 % -So she went into the garden to cut a cabbage leaf to make an apple pie; and -at the same time a great she-bear, coming up the street pops its head into -the shop. "What! no soap?" So he died, and she very imprudently married -the barber; and there were present the Picninnies, and the Grand Panjandrum -himself, with the little round button at top, and they all fell to playing -the game of catch as catch can, till the gunpowder ran out at the heels of -their boots. - -- Samuel Foote -% So she went into the garden to cut a cabbage leaf to make an apple pie; and at the same time a great she-bear, coming up the street pops its head into the shop. "What! no soap?" So he died, and she very imprudently @@ -39736,14 +39477,6 @@ So... "Why not, David, it might even be fun." -- Dating in Minnesota % -So you see Antonio, why worry about one little core dump, eh? In reality all -core dumps happen at the same instant, so the core dump you will have tomorrow, -why, it already happened. You see, its just a little universal recursive joke -which threads our lives through the infinite potential of the instant. So go -to sleep, Antonio, your thread could break any moment and cast you out of the -safe security of the instant into the dark void of eternity, the anti-time. -So go to sleep, ... -% So you see Antonio, why worry about one little core dump, eh? In reality all core dumps happen at the same instant, so the core dump you will have tomorrow, why, it already happened. You see, it's just a little universal @@ -40561,9 +40294,6 @@ editor will delete it and the writing will be just as it should be. Subtlety is the art of saying what you think and getting out of the way before it is understood. % -Subtlety is the art of saying what you think -and getting out of the way before it is understood -% Suburbia is where the developer bulldozes out the trees, then names the streets after them. -- Bill Vaughn @@ -40973,10 +40703,6 @@ TAXES: Of life's two certainties, the only one for which you can get an extension. % -TAXES: - Of life's two certainties, the only one for - which you can get an extension. -% Taxes are not levied for the benefit of the taxed. % TCP/IP Slang Glossary, #1: @@ -42460,9 +42186,6 @@ The final delusion is the belief that one has lost all delusions. % The finest eloquence is that which gets things done. % -The first 90% of a project takes 90% of the time, -the last 10% takes the other 90% of the time. -% The first and almost the only Book deserving of universal attention is the Bible. -- John Quincy Adams @@ -42511,10 +42234,6 @@ The first half of our lives is ruined by our parents and the second half by our children. -- Clarence Darrow % -The first half of our lives is ruined by our parents, -and the second half by our children. - -- Clarence Darrow -% The first marriage is the triumph of imagination over intelligence, and the second the triumph of hope over experience. % @@ -44940,10 +44659,6 @@ The right half of the brain controls the left half of the body. This means that only left handed people are in their right mind. % The right to be heard does not automatically include the right to be -taken seriously. - -- Hubert Humphrey -% -The right to be heard does not automatically include the right to be taken seriously. -- Hubert Humphrey % @@ -45563,10 +45278,6 @@ The trouble with opportunity is that it always comes disguised as hard work. -- Herbert V. Prochnow % -The trouble with some women is that they get all excited about nothing -- -and then marry him. - -- Cher -% The trouble with some women is that they get all excited about nothing -- and then marry him. -- Cher @@ -46386,13 +46097,6 @@ wonder. There are also those who believe that if you stick your fingers up your nose and blow, it will increase your intelligence. -- The Teachings of Ebenezum, Volume VII % -"There are those who claim that magic is like the tide; that it swells and -fades over the surface of the earth, collecting in concentrated pools here -and there, almost disappearing from other spots, leaving them parched for -wonder. There are also those who believe that if you stick your fingers up -your nose and blow, it will increase your intelligence." - -- The Teachings of Ebenezum, Volume VII -% There are three kinds of lies: lies, damned lies and statistics. -- Benjamin Disraeli % @@ -46472,10 +46176,6 @@ and bad news. The good news is that these guys are in top form. I mean I have *never* heard them sound better. They are *wailing* up here." "The bad news is that God has this girlfriend that sings..." % -There are two kinds of fool. One says, "This is old, and therefore good." -And one says "This is new, and therefore better." - -- John Brunner, "The Shockwave Rider" -% There are two kinds of fool. One says, "This is old, and therefore good." And one says, "This is new, and therefore better" -- John Brunner, "The Shockwave Rider" @@ -47093,9 +46793,6 @@ Josh Gibson. Only one thing is keeping them out of the big leagues, the pigmentation of their skin. They happen to be colored. -- Shirley Povich, 1941 % -There's a fine line between courage and foolishness. Too bad it's not -a fence. -% There's a fine line between courage and foolishness. Too bad it's not a fence. % @@ -47155,17 +46852,10 @@ along -- quite gracefully. There's a whole WORLD in a mud puddle! -- Doug Clifford % -There's always free cheese in a mouse trap. -% There's always free cheese in a mousetrap. % There's an old proverb that says just about whatever you want it to. % -There's been no top authority saying what marijuana does to you. I really -don't know that much about it. I tried it once but it didn't do anything -to me. - -- John Wayne -% There's been no top authority saying what marijuana does to you. I really don't know that much about it. I tried it once but it didn't do anything to me. @@ -48939,9 +48629,6 @@ Try to relax and enjoy the crisis. % Try to value useful qualities in one who loves you. % -Trying to be happy is like trying to build a machine for which the only -specification is that it should run noiselessly. -% Trying to be happy is like trying to build a machine for which the only specification is that it should run noiselessly. % @@ -49969,12 +49656,6 @@ socialism, because socialism is defunct. It dies all by itself. The bad thing is that socialism, being a victim of its ... Did I say socialism? -- Fidel Castro % -We are going to give a little something, a few little years more, to -socialism, because socialism is defunct. It dies all by itself. The -bad thing is that socialism, being a victim of its... -Did I say socialism? - -- Fidel Castro -% We are going to have peace even if we have to fight for it. -- Dwight D. Eisenhower % @@ -51048,9 +50729,6 @@ What good is an obscenity trial except to popularize literature? What good is having someone who can walk on water if you don't follow in his footsteps? % -What good is having someone who can walk -on water if you don't follow in his footsteps? -% What good is it if you talk in flowers, and they think in pastry? -- Ashleigh Brilliant % @@ -51580,10 +51258,6 @@ When a girl marries she exchanges the attentions of many men for the inattentions of one. -- Helen Rowland % -When a girl marries, she exchanges the attentions -of many men for the inattentions of one. - Helen Rowland -% When a lion meets another with a louder roar, the first lion thinks the last a bore. -- G.B. Shaw @@ -52154,9 +51828,6 @@ When the ax entered the forest, the trees said, "The handle is one of us!" When the blind lead the blind they will both fall over the cliff. -- Chinese proverb % -When the bosses talk about improving productivity, they are never talking -about themselves. -% When the bosses talk about improving productivity, they are never talking about themselves. % @@ -54144,11 +53815,6 @@ I met a man who wasn't there. He wasn't there again today -- I think he's from the CIA. % -Yesterday upon the stair -I met a man who wasn't there. -He wasn't there again today. -I think he's from the CIA. -% Ye've also got to remember that ... respectable people do the most astonishin' things to preserve their respectability. Thank God I'm not respectable. @@ -55359,11 +55025,6 @@ You will receive a legacy which will place you above want. % You will remember something that you should not have forgotten. % -You will remember, Watson, how the dreadful business of the Abernetty family -was first brought to my notice by the depth which the parsley had sunk into -the butter upon a hot day. - -- Sherlock Holmes -% You will remember, Watson, how the dreadful business of the Abernetty family was first brought to my notice by the |depth which the parsley had sunk into the butter upon a hot day. diff --git a/fortune/datfiles/fortunes2-o.real b/fortune/datfiles/fortunes2-o.real index 50170f9..efa5076 100644 --- a/fortune/datfiles/fortunes2-o.real +++ b/fortune/datfiles/fortunes2-o.real @@ -50,9 +50,9 @@ Leprosy, all my skin is falling off of me. I'm not half the man I used to be. Oh, how did I get leprosy? -Syphillis, it all started with a simple kiss. +Syphilis, it all started with a simple kiss. Now it even hurts to take a piss. -Oh why did I get syphillis? +Oh why did I get syphilis? Why'd she have VD? I don't know, she wouldn't say. I did something wrong, now I long for yesterday .... @@ -657,7 +657,7 @@ all is not lost! SofSqueeze can change your nickname to Electrolux in just sections) that plugs into the serial port of most home computers. Through the magic of biofeedback, SofSqueeze teaches you control over your vaginal muscles. With our exciting, easy-to-follow software you'll master the -"Cincinnati Squeeze", the "Irresistable", the "California Crusher", and, +"Cincinnati Squeeze", the "Irresistible", the "California Crusher", and, of course, the perennial favorite, "Milking Time Down on the Farm". Or, using our exclusive Interactive Mode, invent your own! SofSqueeze is made of sturdy ABS plastic, and is completely @@ -903,7 +903,7 @@ all, I'm afraid." he said. "Just last evening I went nightclubbing with a girlfriend -- we drank and danced all night and finally rolled into her place about two A.M. We went to bed immediately, and I was asleep almost as soon as my head hit the pillow. I woke around three-thirty and nudged my girl." - "Why, George," she said in suprise, "we did that fifteen minutes ago." + "Why, George," she said in surprise, "we did that fifteen minutes ago." "So you see," the old boy said sadly, "my memory is beginning to fail me." % @@ -1009,7 +1009,7 @@ hope in it. Approaching him at the club bar one day, one of them said, found his wife in bed with another man, shot them both, and then turned the gun on himself!" "Terrible," said Harry. "But it could have been worse." - "How in hell," demanded his dumfounded friend, "could it possibly + "How in hell," demanded his dumbfounded friend, "could it possibly have been worse?" "Well," said Harry, "if it had happened the night before, I'd be dead right now." @@ -1133,7 +1133,7 @@ young man to his father as he prepared to leave home. "Don't try to stop me. I'm on my way." "Who's trying to stop you?" shouted the father. "Take me along!" % - In the begining, God created the Earth and he said, "Let there be + In the beginning, God created the Earth and he said, "Let there be mud." And there was mud. And God said, "Let Us make living creatures out of mud, so the mud @@ -1146,27 +1146,6 @@ man. Mud-as-man alone could speak. "Then I leave it to you to think of one for all of this," said God. And He went away. -- Kurt Vonnegut, Between Time and Timbuktu" -% - In the morning, laughing, happy fish heads - In the evening, floating in the soup. -(chorus): -Fish heads, fish heads, roly-poly fish heads; -Fish heads, fish heads, eat them up. Yum! - You can ask them anything you want to. - They won't answer; they can't talk. -(chorus): - I took a fish head out to see a movie, - Didn't have to pay to get it in. -(chorus): - They can't play baseball; they don't wear sweaters; - They aren't good dancers; they can't play drums. -(chorus): - Roly-poly fish heads are NEVER seen drinking cappucino in - Italian restaurants with Oriental women. -(chorus): - Fishy! -(chorus): - -- Fish Heads % In what can only be described as a surprise move, God has officially announced His candidacy for the U.S. presidency. During His press conference @@ -1218,12 +1197,12 @@ Catholic girls fuck like bunnies." % Joan, the rather well-proportioned secretary, spent almost all of her vacation sunbathing on the roof of her hotel. She wore a bathing suit -the frist day, but on the second, she decided that no one could see her +the first day, but on the second, she decided that no one could see her way up there, and she slipped out of it for an overall tan. She'd hardly begun when she heard someone running up the stairs; she was lying on her stomach, so she just pulled a towel over her rear. "Excuse me, miss," said the flustered little assistant manager of -the hotel, out of breath from running up the stairs. "The Hilton doesn't +the hotel, out of breathe from running up the stairs. "The Hilton doesn't mind your sunbathing on the roof, but we would very much appreciate your wearing a bathing suit as you did yesterday." "What difference does it make," Joan asked rather calmly. "No one @@ -1240,7 +1219,7 @@ suicidal behavior is commonly called the Preying Mantis Syndrome -- and many life forms are periodically subject to its wrath. How did the preying mantis become stuck in such a awful, vicious cycle? This is probably what happened: The male mantis arrives at the residence of the female mantis. After -some courtship exercises (dinner, a movie, inserting the diaphram) they mate. +some courtship exercises (dinner, a movie, inserting the diaphragm) they mate. The female mantis, her lust for... lust being satisfied, relaxes while the male raids the refrigerator and returns home. This behavior continues until the male and female (mantissas?) establish a permanent relationship. Then the @@ -1296,7 +1275,7 @@ audience, either." Never ask your lover if he'd dive in front of an oncoming train for you. He doesn't know. Never ask your lover if she'd dive in front of an oncoming band of Hell's Angels for you. She doesn't know. Never ask how many -cigarettes your lover has smoked today. Cancer is a personal committment. +cigarettes your lover has smoked today. Cancer is a personal commitment. Never ask to see pictures of your lover's former lovers -- especially the ones who dived in front of trains. If you look like one of them, you are repeating history's mistakes. If you don't, you'll wonder what he or she saw @@ -1348,7 +1327,7 @@ multi-colored banners... and the band played appropriate music. After several more knights tried to prove their superiority... the King finally spoke out. "I have the mightiest weapon of them all!" He dropped his pants and tied, not a 10 pound, not a 20 pound, not ever a thirty pound, -but a 40 pound weight, plus a coffe pot, to himself. The weapon doth rose. +but a 40 pound weight, plus a coffee pot, to himself. The weapon doth rose. The crowds cheered... the women swooned... the children waved multi-colored banners... and the band played "God Save the Queen." % @@ -1364,7 +1343,7 @@ way it goes? Try to help someone and you get fucked." seek out a cute little coil to let him discharge. He picked up Milli-Amp and took her for a ride on his Megacycle. They rode across the Wheatstone bridge, around the sine waves, and stopped in the magnetic field by the -flowing current. Micro-Farad, attracted by Milli-Amp's charactaristic curves, +flowing current. Micro-Farad, attracted by Milli-Amp's characteristic curves, soon had her fully charged and excited, her resistance to a minimum. He laid her on the ground potential, raised her frequency, and lowered her reluctance. He pulled out his high voltage probe and inserted it into her socket, @@ -1381,8 +1360,8 @@ excite his field, so they spent the night reversing polarity and blowing each others fuses. -- Eddie Currents, "The Sex Life of an Electron" % - One of my favorite Zoo jokes has to do with a woman who, while -visiting the zoo, desided to have a little fun with the Gorilla. She walks + One of my favorite zoo jokes has to do with a woman who, while +visiting the zoo, decided to have a little fun with the Gorilla. She walks up to his cage, reaches in, and begins to fondle the beast. Needless to say, the animal becomes quite excited, and as he tries to reciprocate in kind, the woman steps back and gives him a raspberry...! @@ -1396,8 +1375,8 @@ never writes..." % One PAYDAY, MR. GOODBAR wanted a BIT O' HONEY. So he took his Miss HERSHEY behind the POWERHOUSE on the corner of 5th AVENUE and CLARK where he -there began to feel her MOUNDS. And that was an ALMOND JOY which definately -made his TOOSIE ROLL. +there began to feel her MOUNDS. And that was an ALMOND JOY which definitely +made his TOOTSIE ROLL. He let out a SNICKER as he slipped his BUTTERFINGER up her KIT KAT which of course caused the MILKY WAY. She screamed "OH, HENRY!" as she squeezed his PETER, PAUL and ZAGNUTS and said "you're better than the 3 @@ -1457,13 +1436,13 @@ motivated by Fear, Stupidity and Craziness. But I have spent enough time in jackrabbit country to know that most of them lead pretty dull lives; they are bored with their daily routines: eat, fuck, sleep, hop around a bush now and then... No wonder some of them drift over the line into cheap thrills once in -a while; there has to be a powerful adrenalin rush in crouching by the side of +a while; there has to be a powerful adrenaline rush in crouching by the side of a road, waiting for the next set of headlights to come along, then streaking out of the bushes with split-second timing and making it across to the other side just inches in front of the speeding front wheels. - Why not? Anything that gets the adrenalin moving like a 440 volt + Why not? Anything that gets the adrenaline moving like a 440 volt blast in a copper bathtub is good for the reflexes and keeps the veins free -of cholesterol ... but too many adrenalin rushes in any given time-span has +of cholesterol ... but too many adrenaline rushes in any given time-span has the same bad effect on the nervous system as too many electro-shock treatments are said to have on the brain: after a while you start burning out the circuits. @@ -2011,7 +1990,7 @@ screaming: "Holy Jesus! What are these goddamn animals?" Then it was quiet again. My attorney had taken his shirt off and was pouring beer on his chest, to facilitate the tanning process. "What the hell are you yelling about?" he muttered, staring up at the sun with his -eyes closed and covered with wraparound Spanish sungalsses. "Never mind," +eyes closed and covered with wraparound Spanish sunglasses. "Never mind," I said. "It's your turn to drive." I hit the brakes and aimed the Great Red Shark toward the shoulder of the highway. No point in mentioning the bats, I thought. The poor bastard will see them soon enough. @@ -2095,8 +2074,8 @@ into months if the captain hadn't noticed the sailor carrying food below one evening and followed him. After witnessing this unique bit of barter, he waited until the sailor had departed and then confronted the girl, demanding an explanation. She told him the whole story. - "Hmmm," mused the captian. "A clever arrangement, and I must say I -admire that young seaman's ingenuity. However, miss, I feel it is only fair + "Hmmm," mused the captain. "A clever arrangement, and I must say I +admire that young seaman's ingenuity. However, Miss, I feel it is only fair to tell you that this is the Staten Island Ferry." % "Why did you spend so much time parked in that fellow's car last @@ -2147,7 +2126,7 @@ that they are easily disposed to restore to the sword. My own belief in God, then, is just that -- a matter of belief, not knowledge. My respect for Jesus Christ arises from the fact that He seems to have been the most virtuous inhabitant of Planet Earth. But even well-educated Christians are -frustated in their thirst for certainty about the beloved figure of Jesus +frustrated in their thirst for certainty about the beloved figure of Jesus because of the undeniable ambiguity of the scriptural record. Such ambiguity is not apparent to children or fanatics, but every recognized Bible scholar is perfectly aware of it. Some Christians, alas, resort to formal lying to @@ -2191,21 +2170,6 @@ And bring me back ma prick. I canna wait for him to die 9. A beer won't leave you for a younger man either. 10. A beer won't tease you because you once liked Barry Manilow. % -10 Reasons Why a Beer is Better Than a Man: - - 1. A beer will never invite friends home for dinner without calling. - 2. A beer won't think less of you if you can't name the Steelers' - quarterback. - 3. A beer won't even act amazed if you can. - 4. You don't have to let a beer win. - 5. Just because you have dinner with a beer doesn't mean you have to - sleep with it beer, too. - 6. A beer helps with the houswork. - 7. A beer will never fumble with your bra. - 8. A beer will never take the newspaper apart before you've read it. - 9. A beer doesn't want you to raise its children. -10. A beer wouldn't mind if you wanted it to wear a condom. -% 10 Reasons Why a Beer is Better Than a Man: 1. A beer will never invite friends home for dinner without calling. @@ -2378,30 +2342,12 @@ all over him. "Ah'm big and ah'm bad and I *loves* to fuck your sister." The short guy looked him up and down and said, "I don't blame you one bit. She's *got* to be an improvement on yours." % -A bad little girl in Madrid, -A most reprehensible kid, - Told her Tante Louise - That her cunt smelled like cheese, -And the worst of it was that it did! -% A bar patron returned from the men's room grumbling to himself. "What's the trouble, buddy?" the bartender inquired. "You got John Wayne toilet paper in there!" "What do you mean?" the barkeeper asked. "It's rough, it's tough, and it doesn't take shit from nobody." % -A bather whose clothing was strewed -By breezes that left her quite nude, - Saw a man come along - And, unless I am wrong, -You expected this line to be lewd. -% -A bather whose clothing was strewed -By breezes that left her quite nude, - Saw a man come along - And, unless I'm quite wrong, -You expected this line to be lewd. -% A beachcomber of 25 had been shipwrecked on a desert island since the age of six. One day, while in search of food, he stumbled across a beautifully sensuous female lying on the beach nearly naked; she'd been washed ashore from @@ -2419,34 +2365,10 @@ beside her and proceeded to demonstrate. After they had finished, she asked how he had enjoyed it. "Great!" was the reply. "But look what it did to my clamdigger!" % -A beat schizophrenic said, "Me? -I am not I, I'm a tree." - But another, more sane, - Shouted, "I'm a great dane " -And covered his pants leg with pee. -% -A beat schizophrenic said, "Me? -I am not I, I'm a tree." - But another, more sane, - Shouted, "I'm a Great Dane!" -And covered his pants leg with pee. -% -A beautiful belle of Del Norte -Is reckoned disdainful and haughrty - Because during the day - She says: "Boys, keep away!" -But she fucks in the gloaming like forty. -% -A beautiful lady named Psyche -Is loved by a fellow named Ikey. - One thing about Ike - The lady can't like -Is his prick, which is dreadfully spikey. -% A beautiful man is paradise for the eyes, hell for the soul, and purgatory for the purse. % -A beautiful, voluptous woman goes to see a gynecologist. The doctor takes +A beautiful, voluptuous woman goes to see a gynecologist. The doctor takes one look at this woman and his professionalism is a thing of the past. Right away he tells her to undress. After she has disrobed he begins to stroke her thigh. As he does this he says to the woman, "Do you know what I'm doing?" @@ -2510,31 +2432,6 @@ suppose you could try and tell me?" and slimey..." And, as he ran one paw underneath the snake, "and you have no balls. You must be an attorney!" % -A bobby of Nottingham Junction -Whose organ had long ceased to function - Deceived his good wife - For the rest of her life -With the aid of his constable's truncheon. -% -A broken-down harlot named Tupps -Was heard to confess in her cups: - "The height of my folly - Was diddling a collie- -But I got a nice price for the pups." -% -A broken-down harlot named Tupps -Was heard to confess in her cups: - "The height of my folly - Was fucking a collie -- -But I got a nice price for the pups." -% -A burleyque dancer, a pip -Named Virginia, could peel in a zip; - But she read science fiction - And died of constriction -Attempting a Moebius strip. - -- Cyril Kornbluth, "The Unfortunate Topology" -% A businessman was awe-struck by the beautiful redhead at the hotel bar. Seeing his interest, she quietly informed him that she was a prostitute and that her price was $500. He was taken aback by the price, but after @@ -2543,18 +2440,6 @@ minutes in the bathroom and was shocked when she came out to see him masturbating furiously on the bed. "What are you doing?", she asked. "Baby, for $500, you're not going to get the easy one!" % -A busy young lady named Gloria -Was had by Sir Gerald du Maurier - And then by six men, - Sir Gerald again, -And the band at the Waldorf-Astoria. -% -A cabin boy on an old clipper -Grew steadily flipper and flipper. - He plugged up his ass - With fragments of glass -And thus circumcised his old skipper. -% A Catholic and a Methodist were carpooling to work one morning, when a brick fell out of the sky, which startled the driver and caused him to swerve off the road and into a telephone pole, totaling the car. @@ -2564,26 +2449,7 @@ himself in an accentuated manner. "Hey," said the Catholic, "I why did you cross yourself, you're not Catholic!" "Just checking," replied his friend, crossing himself again, -"spectacles, testicals, wallet, pen." -% -A cautious young fellow named Lodge -Had seatbelts installed in his Dodge. - When his date was strapped in, - He committed a sin, -Without even leaving his grodge. -% -A cautious young fellow named Lodge, -Had seatbelts installed in his Dodge. - With his date all strapped in - He committed a sin -Without even leaving the garage. - -- "A Boy and His Dog" -% -A cautious young fellow named Tunney -Had a whang that was worth any money. - When eased in half-way, - The girl's sigh made him say, -"Why the sigh?" "For the rest of it, honey." +"spectacles, testicles, wallet, pen." % A certain bartender decided to try to get a few new customers into his bar by starting a gimmick involving a horse. His claim was that if anyone could @@ -2603,108 +2469,15 @@ said, "How did you make him laugh the other two nights?" "How did you make him cry tonight?" "I proved it." % -A certain young man, it was noted, -Went about in the heat thickly-coated; - He said, "You may scoff, - But I shan't take it off; -Underneath I am horribly bloated." - -- Edward Gorey -% -A certain young person of Ghent, -Uncertain if lady or gent, - Shows his organs at large - For a small handling charge -To assist him in paying the rent. -% -A certain young sheik of Algiers -Said to his harem, "My dears, - Though you may think it odd of me, - I'm tired of just sodomy -Let's try straight fucking." (loud cheers!) -% -A chap down in Oklahoma -Had a cock that could sing La Paloma, - But the sweetness of pitch - Couldn't put off the hitch -Of impotence, size and aroma. -% -A charmer from old Amarillo, -Sick of finding strange heads on her pillow, - Decided one day - That to keep men away -She would stuff up her crevice with Brillo. -% -A chippy who worked in Black Bluff -Had a pussy as large as a muff. - It had room for both hands - And some intimate glands, -And was soft as a little duck's fluff. -% A chiseler is a man who goes stag to a wife-swapping party. % A Christian is a man who feels repentance on Sunday for what he did on Saturday and is going to do on Monday. -- Thomas Ybarra % -A clergical student named Simms -Hums liturgical tunes while he rims: - A nice piece of ass - Gets the B-Minor Mass ... -All the others get Anglican hymns. -% -A clerical student named Pryne -Through pain sought to reach the divine: - He wore a hair shirt, - Quite often ate dirt, -And bathed every Friday in brine. - -- Edward Gorey -% -A clever young man named Eugene -Invented a jack-off machine. - On the twenty-third stroke - The fuckin' thing broke -And beat both his balls to a creame. -% -A clever young man named Eugene -Invented a jack-off machine. - On the twenty-third stroke - The goddam thing broke -And beat both his balls to a creame. -% A clitoris is a lot like Antarctica; most men know it's there, but few really care. % -A cocksucking steno named Beeman -Remarked as she swallowed my semen : - "On my minuscule salary - I must watch every calorie, -So I get `ahead' eating you he-men!" -% -A computer called Illiac4 -Had a rather tough bug in its core. - It chewed up its cards - And spewed yards and yards -Of illegible tape on the floor. -% -A computer, to print out a fact, -Will divide, multiply, and subtract. - But this output can be - No more than debris, -If the input was short of exact. - -- Gigo -% -A contortionist hailing from Lynch -Used to rent out his tool by the inch. - A foot cost a quid -- - He could and he did -Stretch it to three in a pinch. -% -A corpulent maiden named Kroll -Had a notion exceedingly droll: - At a masquerade ball, - Dressed in nothing at all, -She backed in as a Parker House roll. -% A couple more shots of whiskey, women 'round here start looking good. [something about a 10 being a 4 after a six-pack? Ed.] @@ -2731,125 +2504,9 @@ penis." The man took a deep breath and replied, "Son, I've *spoiled* that woman." % -A couple was fishing near Clombe -When the maid began looking quite glum, - And said, "Bother the fish! - I'd rather coish!" -Which they did -- which was why they had come. -% -A cowhand way out in Seattle -Had a dooflicker flat as a paddle. - He said, "No, I can't fuck - A lamb or a duck, -But golly! it just fits the cattle." -% -A crusader's wife slipped from the garrison -And had an affair with a Saracen. - She was not oversexed, - Or jealous or vexed, -She just wanted to make a comparison. -% -A CS student named Lin -Had a prick the size of a pin - It was no good for girls - But just great for squirrels -Who squealed with delight with it in. -% -A cute little twerp from Samoa -Had a cock of one inch and no moa. - It was good for keyholes - And debutantes' peeholes -But not worth a damn on a whoa. -% -A daredevil skater named Lowe, -Leaps barrels arranged in the snow, - But is proudest of doing, - Some incredible screwing, -Since he's jumped thirteen girls in a row! -% -A deep-throated virgin named Netty -Was sucking a cock on the jetty. - She said, "It tastes nice, - Much better than rice, -Though not quite as good as spaghetti." -% A definition of teaching: casting fake pearls before real swine. -- Bill Cain, "Stand Up Tragedy" % -A delighted, incredulous bride -Remarked to her groom at her side : - "I never could quite - Believe till tonight -Our anatomies would coincide." -% -A dentist, young doctor Malone, -Got a charming girl patient alone, - And, in his depravity, - Filled the wrong cavity. -God, how his practice has grown. -% -A despairing old landlord named Fyfe, -With a frigid and quarrelsome wife, - Let his third-story front, - To a willing young cunt, -Who supplied him a new lease on life! -% -A desperate spinster from Clare -Once knelt in the moonlight all bare, - And prayed to her God - For a romp on the sod-- -'Twas a passerby answered her prayer. -% -A distinguished professor from Swarthmore -Got along with a sexy young sophomore. - As quick as a glance - He stripped off his pants, -But he found that the sophomore'd got off more. -% -A doctoral student from Buckingham -Wrote his thesis on cunts and on fucking'em. - But a dropout from paree - Taught him Gamahuchee -- so he added a footnote on sucking 'em. -% -A doctoral student from Buckingham -Wrote his thesis on cunts and on fucking'em. - But a dropout from paree - Taught him Gamahuchee -So he added a footnote on sucking 'em. -% -A do-it-yourselfer named Alice, -Used a dynamite stick for a phallus. - She blew her vagina - To South Carolina, -And her tits landed somewhere in Dallas. - -A cute friend of hers, Fanny Hill, -Used two dynamite sticks for a dil. - They found her vagina, - In South Carolina, -And part of her ass in Brazil. -% -A dolly in Dallas named Alice, -Whose overworked sex is all callous, - Wore the foreskin away - On uncircumcised Ray, -Through exuberance, tightness, and malice. -% -A dreary young bank clerk named Fennis -Wished to foster an aura of menace; - To make people afraid - He wore gloves of grey suede -And white footgear intended for tennis. - -- Edward Gorey -% -A dreary young bank clerk named Fennis -Wished to foster an aura of menace. - To make people afraid - He wore gloves of grey suede -And white footgear intended for tennis. - -- Edward Gorey, "Amphigorey" -% A drunk was sitting at the end of the bar in a popular single's place, watching a young, good-looking man working his way through the women. The guy didn't appear to be having much luck, and he was only spending a few @@ -2941,13 +2598,6 @@ would be willing to take part in the experiment, with three conditions. "First," he said, "my wife must never know. Second, any children must be baptized. And, third, I'd have to pay in installments." % -A guest in a household quite charmless -Was informed its eccentric was harmless: - "If you're caught unawares - At the head of the stairs, -Just remember, he's eyeless and armless." - -- Edward Gorey -% A guy comes into a bar with a frog and sets it down next to the prettiest girl there. "This is a very special frog," he informs her. "His name is Charlie." @@ -2972,43 +2622,13 @@ and repeats this sequence -- several times. Finally the bartender got so curious that he leaned over the bar and asked him what he was doing. Replied the customer, "Avoiding the middleman." % -A habit depraved and unsavory -Held the bishop of Bingham in slavery - Midst screeches and howls - He deflowered young owls -Which he kept in an underground aviary -% -A habit obscene and bizarre, -Has taken a-hold of papa. - He brings home young camels - And other odd mammals, -And gives them a go at mama. -% -A habit obscene and unsavory, -Holds a CS professor in slavery. - With maniacal howls, - He deflowers young owls, -That he keeps in an underground aviary. -% -A hacker who screwed a mag tape -Was caught and convicted of rape. - To jail he did go, - From which, to his woe -He couldn't get out with ESC. -% -A hacker-turned-pervert named Fisk -Made love to the drive of his disk. - The thing circumsized him, - Which rather suprised him. -He wasn't aware of *that* risk. -% A hand in a bird is worth two on 'er bush. % A hand in the bush is worth two on the bird. % A hard man is good to find. % -A huge Rambolike fellow walked into a tavern and took a seat in the middle of +A huge Rambo-like fellow walked into a tavern and took a seat in the middle of the bar. After downing a double in one gulp, he glared at the six men to his right and said, "You're all no-good motherfuckers. Anyone have a problem with that?" @@ -3450,7 +3070,7 @@ A non-vegetarian anti-abortionist is a contradiction in terms. % A Norse god decides to assume human form, come down from Valhalla, and check out the local action. He finds himself in the piano bar of Caesar's Boardwalk -Regency in Atlantic City, and sits down to sip an Acquavit or two. After a few +Regency in Atlantic City, and sits down to sip an Aquavit or two. After a few minutes, an extremely attractive young woman, having been taken with his form and features, sends a drink down to him, then joins him. The chemistry between them is immediate and total. They have the next drink in her room, and spend @@ -3560,19 +3180,6 @@ A pretty woman can do anything; an ugly woman must do everything. % A proctologist is a doctor who puts in a hard day at the orifice. % -A programmer down in Moline -Said, I'm the match for any machine. - My secret's aversion, - To loops and recursion, -Just acres of in-line routine. - -- W.J. Wilson -% -A progressive professor named Winners -Held classes each evening for sinners. - They were graded and spaced - So the vile and debased -Would not be held back by beginners. -% A rabbi and a priest are sitting together on a train, and the rabbi leans over and asks, "So, how high can you advance in your organization?" The priest replies, "Well, if I am lucky, I guess I could become a @@ -3583,7 +3190,7 @@ might be made an Archbishop." "Is there any way that you might go higher than that?" "If all the Saints should smile, I guess I could be made a Cardinal." "Could you be anything higher than a Cardinal?" - Hesitating a little bit, the priest said, "I supose that I could + Hesitating a little bit, the priest said, "I suppose that I could be elected Pope, but only if it's God's will." "And could you be anything higher than that, is there any way to go up from being the Pope?" @@ -3621,8 +3228,8 @@ you must have told the bitch to go fuck herself!" % A Scotsman clad in a kilt walks up to the counter in an Apothecary. From his pocket he takes a plaid condom that has been heavily used, torn, patched, -sewn, and is currently split down one side. He asks the proprieter, "How much -to replace this, Ian?" The proprieter says, "Why, Angus, that'l be four +sewn, and is currently split down one side. He asks the proprietor, "How much +to replace this, Ian?" The proprietor says, "Why, Angus, that'l be four pence." Then the Scotsman asks, "How much to repair?" The prop. looks the condom over carefully, and says "Three pence to repair." The Scotsman ponders for a moment, then says, "I'll be back." @@ -3717,7 +3324,7 @@ wanted to try out a pig himself. He had watched several miners walk upstairs to the trysting rooms with squealing piglets under their arms. Now, he was game to make his move. He wandered out to the back of the saloon and chose a nice fat, pink sow. As he walked to the stairs, the entire saloon went -quiet. In the embarassing hush, all eyes were upon him. +quiet. In the embarrassing hush, all eyes were upon him. "What's the matter? I thought all you fellows did this!" "Yeah, but that's Black Bart's girl," replied the barkeep. % @@ -3753,12 +3360,6 @@ but business is business." % A toast to the kisses you've snatched and vice-versa. % -A trapper named Francois Lefebrve -Once captured and buggered a beabrve. - The result of this fuck - Was a three titted duck, -A canoe, and an Irish retriebrve. -% A traveling circus was performing in a small town, around the turn of the century, when many of the circus animals were still considered to be very rare and exotic. One night one of the elephants escaped. It was hungry @@ -3940,28 +3541,10 @@ received a telegram from their sister. It read: I liked the couch falling apart when we sat on it. I was amused when the shower went cold five minutes after it started. But I'm - going to kill whoever put the novicaine into the KY jelly... + going to kill whoever put the novocaine into the KY jelly... % A.A.A.A.A.: An organization for drunks who drive. % -Aboard the good ship Venus, The cabin boy, the captain's joy, -The mast it was a penis, A cunning little nipper, - Her figurehead They filled his ass, - A whore in bed, With broken glass, -Good grief you should have seen us! And circumcized the skipper. - -The first mate's name was Higgins, The captain's daughter Mabel, -And Higgins was a biggins, They screwed when they were able, - Once round the deck, They nailed her tits, - Twice up the mast, Those nasty shits, -And the rest was used for riggins'! Right to the captain's table. - -The engineer's name was Carter, The second mate's name was Andy, -And Carter was a farter, By God, he was a dandy, - When the wind wouldn't blow, They broke his cock, - And the ship couldn't go, With chunks of rock, -Carter the farter would start her! For conking in the brandy! -% AC/DC is a rock band. -- Bisexuality, 101 % @@ -4019,7 +3602,7 @@ After I run your program, let's make love like crazed weasels, OK? % After Joan and Max had been married for 25 years, Max became disinterested in sex, and his libido began to wan dramatically. In desperation, Joan -hauled him to a marriage couselor, who listened patiently to Joan's complaints +hauled him to a marriage counselor, who listened patiently to Joan's complaints and Max's protestations. Max claimed that he was being nagged unmercifully to fulfill Joan's needs, and that after awhile every marriage tended to become less physical. Joan said that that wasn't true and that she had @@ -4085,7 +3668,7 @@ Al Gore resembled a Vulcan desperately in need of a blow job. % Alaska, where Moosehead isn't a beer, it's a misdemeanor. -Q: You know how to figure out if your lover's been "invovlved"? +Q: You know how to figure out if your lover's been "involved"? A: Antler marks on their hips. % Alcohol is like love: the first kiss is magic, the second is intimate, @@ -4334,19 +3917,12 @@ American on the shoulder and says, "Mate, I guess I never will understand you Americans. You drink your beer cold, drive on the right side of the street, and you just threw the wrong bitch out the window!" % -An angst-ridden amorist, Fred, -Saw sartorial changes ahead. - His mind kept on ringing - With fishy girls singing; -Soft fruit also filled him with dread. - -- J. Walker, "The Love Song Of J. Alfred Prufrock" -% An Army travels on her stomach. % An encounter with a beautiful woman is good medicine for the well organized logical mind -- a little jolt never hurt. Note that the anarchists have been saying this for years about the A-bomb and civilization. - -- Encyclopadia Apocryphia + -- Encyclopedia Apocryphia % An office party is not, as is sometimes supposed the Managing Director's chance to kiss the tea-girl. It is the tea-girl's chance to kiss the @@ -4373,7 +3949,7 @@ lewdly darted the tip of his tongue into each of my nostrils, one after the other, and with such cleverness he provoked two or three sneezes which redoubled the flow he desired and was consuming so hungrily. But ask me for no details bearing upon this fellow, Messieurs, nothing appeared, and whether -because he did nothing, or becaues he did it all in his drawers, there was +because he did nothing, or because he did it all in his drawers, there was nothing to be seen, and amidst the multitude of his kisses and lecherous lickings there was nothing outstanding which might have denoted an ecstasy, and consequently it is my opinion that he did not discharge. All my clothes @@ -4383,12 +3959,6 @@ and least initiated girl without her being able to suppose there was anything lewd in it at all. -- Marquis de Sade % -And let me the canakin clink, clink; -and let me the canakin clink. - A soldier's a man; - O, man's life's but a span, -Why then, let a soldier drink. -% And now, the Bing Crosby show, brought to you by the makers of Ex-Lax. ... a brief pause, and then Bing! % @@ -4453,7 +4023,7 @@ there, but the third nun wouldn't touch it. % Another stupid gay joke!!! You see, this gay man walks into a Texas bar and orders a strawberry -daquiri. The bartender looks him over with amusement and says: "We don't +daiquiri. The bartender looks him over with amusement and says: "We don't serve your kind, buddy, why don't you get out of here before the boys come in and kick your ass?" The guy whimpers a little and lisps, "Pleasse misssture I am soooo @@ -4517,7 +4087,7 @@ was possible not to follow through, you'd still be getting screwed. % As long as your ass is pointed at the ground, don't fuck with me. % -As my dear autie used to say, "Love makes the world go 'round, but sex +As my dear auntie used to say, "Love makes the world go 'round, but sex makes the ride fun." % As near as I can tell, you're not any crazier @@ -4559,7 +4129,7 @@ as soon as you notice any of the following symptoms: -- An overwhelming sense of peace and happiness. -- Visions of the faces of deceased family members. -- A glorious figure in white, beckoning from the end of a tunnel of -white mist (do not confuse this with traffic control or maintainance officers, +white mist (do not confuse this with traffic control or maintenance officers, who wear dark blue and safety orange.) Once the feeling has passed, inspect your surroundings. If still in your car, you have probably suffered a stroke and should have someone drive @@ -4670,7 +4240,7 @@ Balls Law: % BALTIMORE: Where the women wear turtleneck - sweators to hide their flea collars. + sweaters to hide their flea collars. % Bankers do it with interest (penalty for early withdrawal). % @@ -4761,7 +4331,7 @@ generally is a magnificent erotic instrument. The famous gentleman in erotic prints who is keeping six women occupied is using tongue, penis, both hands, and both big toes. Use the toe in mammary or armpit intercourse or any time you are astride her, or sit facing as she lies or sits. Make sure the nail -isn't sharp. In a restuarant, in these days of tights one can surreptitiously +isn't sharp. In a restaurant, in these days of tights one can surreptitiously remove a shoe and sock, reach over, and keep her in almost continuous orgasm with all four hands fully in view on the table top and no sign of contact-- A party trick which really rates as advanced sex. She has less scope, but @@ -4842,7 +4412,7 @@ week was cut short by an ingenious device designed by two computer science students. A three-foot bar of extruded aluminum was precisely machined, with a hole milled down the center of precisely the dimensions of one of the small Gideon bibles. The end capped off, a CO2 canister was connected -to provide up to 2,000 PSIG. Prelimary estimates during field testing +to provide up to 2,000 PSIG. Preliminary estimates during field testing revealed a muzzle velocity of approximarly 120-150 MPH for bibles exiting the tube. Sufficient ammunition was obtained during a previous visit to campus by another religious organization, and the system was first used on @@ -5114,12 +4684,6 @@ ascetically as possible... that is the only possible way for me to endure marriage. But she? -- Franz Kafka % -Coitus upon a cadaver -Is the ultimate way you can have 'er. - Her inanimate state - Means a man needn't wait, -And eliminates all the palaver. -% COLD: When the local flashers are handing out written descriptions. % @@ -5184,10 +4748,10 @@ Condoms are like listening to a symphony with cotton in your ears. [Taking a shower in raincoat? Ed.] % -Condoms are the feminists' revenge on men for diaphrams. +Condoms are the feminists' revenge on men for diaphragms. -- Robin Williams % -Confucious say: +Confucius say: man who lay girl on hill, not on level. man who pull out too fast leave rubber. man who go to bed with sex problem wake up with solution in hand. @@ -5202,7 +4766,7 @@ Confucious say: a smart man knows on which side his broad is better. man who arrives late to party will find himself beaten to the punch! % -Confucious say: +Confucius say: man who screws near graveyard is fucking near dead. man who fishes in other man's well often catch crabs. man and mouse the same, both end up in pussy. @@ -5214,7 +4778,7 @@ Confucious say: man who lie under car, get tired -- man who stand behind car, get exhausted. % -Confucious say: +Confucius say: woman who put man in dog house find him in cat house. woman who spring on inner-spring this spring, have off-spring next spring. @@ -5223,13 +4787,13 @@ Confucious say: man who kicked in testicles get left holding bag. man who suck nipples make clean breast of things. woman who slide down bannister make monkey shine. - woman's irginity like balloon, one prick and all gone. + woman's virginity like balloon, one prick and all gone. Kotex not best thing on earth, but next to best. squirrel who run up woman's leg not find nuts. eplileptic woman who give blow-job may bite big one. seven days on honeymoon make one hole weak. % -Confucious say: +Confucius say: woman who ride bicycle peddle ass around town. fool man climb tree to get cherries; wise man spread limbs. woman who fly upside down in airplane have big crack up. @@ -5327,7 +4891,7 @@ as alcohol consumption increases and time, t, approaches last call. and so basic that we often forget to mention it: because it is false, and because good teachers understand exactly why it is false. What could be more destructive of that most fragile yet most precious commodity in our -entire intellectualy heritage -- good teaching -- than a bill forcing +entire intellectual heritage -- good teaching -- than a bill forcing honorable teachers to sully their sacred trust by granting equal treatment to a doctrine not only known to be false, but calculated to undermine any general understanding of science as an enterprise? @@ -5336,22 +4900,10 @@ general understanding of science as an enterprise? crew, n: Eight big men and their cute little cox. % -Cried Miss Pratt : "What are you staring at? -I know - you don't have to say that! - All you guys want of me - Is a poke where I pee, -And it's pounding my ass mighty flat!" -% Crinklaw's Observation: Nowadays the order of life is reversed: Sex is first enjoyed, marriage follows, and after marriage comes abstinence. % -Cum Hilde autem ambulabat -Homo qui aedificabat. - Dixit volebat. Debet et potebat. - Sic ille ducebat. Statim faciebat. -Sed virginem pine necebat. -% Cunnilingus is next to cleanliness. % Curiousity killed the cat, but satisfaction brought her back. @@ -5371,12 +4923,6 @@ Of a bicycle built for two. % Dallas still lives. God MUST be dead. % -Dame Catherine of Ashton-on-Lynches -Got on with her grooms and her wenches: - She went down on the gents, - And pronged the girl's vents -With a clitoris reaching six inches. -% Dames lie about anything -- just for practice. -- Raymond Chandler % @@ -5409,19 +4955,13 @@ you can all go to hell, fuck you, fuck you, fuck you..." % Dance is the vertical expression of a horizontal intention. % -Dave has an areoplane, +Dave has an aeroplane, In which he likes to frisk. Oh what a foolish boy, His silly *. % David was just a shepherd who liked to get his rocks off in leather. % -De Hispanice puella verumque -Simplex oris verborumque - Tulit potens vagina - Hominum agmina -Iterum iterum iterumque. -% Dear Abby: I have two brothers. One was sent to the electric chair when I was a child. My mother died in an insane asylum. My father is a pimp and my @@ -5539,12 +5079,6 @@ Did you hear about the nearsighted fetishist who got off on the wrong foot? Did you hear about the new sorority girl doll? You put a ring on her finger and her hips expand. % -Did you hear about young Henry Lockett? -He was blown down the street by a rocket. - The force of the blast - Blew his balls up his ass, -And his pecker was found in his pocket. -% Did you hear they cancelled Easter this year? Found the body. % @@ -5666,12 +5200,6 @@ Due to a mixup in urology, orange juice will not be served this morning. % Dull women have immaculate homes. % -DuPont, I.G., Monsanto, and Shell -Built a world-circling pussy cartel, - And by planned obsolescence, - So controlled detumescence, -A poor man could not get a smell. -% During the darkest days of World War II, when each night brought waves of Luftwaffe bombers raining death and destruction on a near-defenseless London, Prime Minister Churchill went on the air to address the British people. "I @@ -5740,21 +5268,9 @@ as a male schlemiel. Erogenous zone, n: The skin you touch to love. % -Es giebt ein Arbeiter von Tinz, -Er schlaft mit ein Madel von Linz. - Sie sagt, "Halt sein' plummen, - Ich hore Mann kommen." -"Jacht, jacht," sagt der Plummer, "Ich binz." -% eternity, n: The length of time between when you come and he leaves. % -Ethnologists up with the Sioux -Wired home for two punts, one canoe. - The answer next day, - Said, "Girls on the way, -But what the hell's a `panoe'?" -% Evangelists do it with Him watching. % Even bytes get lonely for a little bit. @@ -5827,7 +5343,7 @@ cats. about it. They keep reasonable hours. You *never* see a cat up before noon. They know how to relax. Ever heard of a cat with an ulcer? - What are the chances of a cat starting a nuclear war? Pretty neglible. + What are the chances of a cat starting a nuclear war? Pretty negligible. It's not that they can't, they just know that there are much better things to do with ones time. Like lie in the sun and sleep. Or go exploring the world. % @@ -5837,12 +5353,6 @@ Except for 75% of the women, everyone in the whole world wants to have sex. exotic dancer, n: A girl who brings home the bacon a strip at a time. % -Exuberant Sue from Anjou -Found that fucking affected her hue. - She presented to sight - Nipples pink, bottom white; -But her asshole was purple and blue. -% falsie salesman, n: Fuller bust man. % @@ -5951,12 +5461,6 @@ He's so neat, he's so cool, Walks across my swimming pool. Has anybody... % -Flappity, floppity, flip -The mouse on the Mobius strip; - The strip revolved, - The mouse dissolved -In a chronodimensional skip. -% Flirt, n: A girl whose favorite man is the next one. % @@ -5981,12 +5485,6 @@ appearance on the great stage of life, uh, you can applaud if you want to, Mr. Joe Gideon!! -- All That Jazz % -Fond of equestrians, Mabel -Looked for true love in the stable. - But she found the studs, - For her were all duds, -Now she's out with the leg of a table. -% For a gay time, call 632-9483. Ask for Brucie. % For a good time, call 632-9484. Ask for Cathy. @@ -6023,24 +5521,6 @@ sweetheart?" He looked at her and replied, "How should I know -- I'm no cocksucker!" % -For the sores on his prick he used Dial. -That failed; he gave Lava a trial. - But the one remedy - For contagious V.D. -Is the wonder drug sulfa-denial. -% -For the sores on his prick he used Dial. -That failed; he gave Lava a trial. - But the one remedy - For contagious V.D. -Is the wonder drug sulfa-denial. -% -"For the tenth time, dull Daphnis," said Chloe, -"You have told me my bosom is snowy; - You have made much fine verse on - Each part of my person, -Now do something -- there's a good boy!" -% fornication, n: Term used by people who don't have anybody to screw with. % @@ -6176,7 +5656,7 @@ there. He mentions that his wife is from Green Bay. You: FORTUNE TESTS THE GREAT MANAGERS: #9 You are making a sales presentation to a group of corporate executives -in the plushest office you've ever seen. The enchillada casserole and +in the plushest office you've ever seen. The enchilada casserole and egg salad sandwich you had for lunch react, creating severe pressure. Your sphincter loses control and you break wind, causing the glass bookcase doors to shatter and a secretary to pass out. You: @@ -6276,12 +5756,6 @@ Fuck you and anybody who looks like you. % Fuck'em if they can't take a joke! % -Fucking is a filthy deed. -- I like it. -It satisfies a normal need. -- I like it. - It makes you sick, it makes you well, - It turns your spine to fucking jell, -It damns your soul to Eternal Hell! -- I like it. -% fuck-me-pumps, n: Stiletto heels of a certain length, usually black patent leather. The proper designation is "throw-me-down-and-fuck-me" pumps. Shoes with @@ -6478,18 +5952,6 @@ dilemmas shall be fewer in number in the future, when the generations a-coming that such things take time, and the turkeys are showing more resilience than expected, and may be with us for a long time yet. % -God's plan had a great beginning, -But man spoiled his chances by sinning - We trust that the story - Will end in God's glory -But at present the other side's winning. -% -God's plan made a hopeful beginning -But man spoiled his chances by sinning. - We trust that the story - Will end in God's glory -But at present, the other side's winning. -% Going into politics is as fatal to a gentleman as going into a bordello is fatal to a virgin. -- H.L. Mencken, "A Carnival of Buncombe" @@ -6527,14 +5989,14 @@ able to get loose. Good day for water sports. Take a bath with a friend. % Good evening Ladies and Gentlemen! -Here's a little number I tossed up in the Carribean recently... +Here's a little number I tossed up in the Caribbean recently... Isn't it awfully nice to have a Penis, isn't it frightfully good to have a Dong. It's swell to have a Stiffy, it's divine to have a Dick, -from the tinyest little Tadger, +from the tiniest little Tadger, to the world's greatest Prick. So, breeches for your Willy or John-Thomas, @@ -6559,7 +6021,7 @@ good, he crowed, "Good Morning Sun!", and was startled when a great booming voice came back to him, "Good morning Comrade! Good morning to you and the great Soviet Socialist Republic!". Of course, this surprised him, but great politician that he is, he considers the political ramifications. -Gorbachev then woke up Reza and his closest aides, brought them into his +Gorbachev then woke up Raisa and his closest aides, brought them into his bedroom, and shouted out "Good morning, Comrade Sun!". Again a booming reply, "Good morning, Comrade. Good morning to you and the rest of the Party!" Everyone was quite excited about this, and Gorbachev sat down to his @@ -6707,30 +6169,6 @@ damn about anything , which is why they are able to produce "Laverne and Shirley" week after week. -- Dave Barry % -Have you heard about Magda Lupescu, -Who came to Rumania's rescue? - It's a wonderful thing - To be under a king-- -Is democracy better, I esk you? -% -Have you heard of knock-kneed Samuel McGuzzum -Who married Samantha, his bow-legged cousin? - Some people say, - Love finds a way, -But for Sam and Samantha it doesn'. -% -Have you heard of the lady named Cox -Who had a capacious old box? - When her lover was in place - She said, "Please turn your face. -I look like a gal, but I screw like a fox." -% -Have you heard of those trollops of Birmingham -And the scandal that's currently concerning'em? - How they lift the frock - And tickle the cock -Of the bishop while he was confirming 'em? -% Have you seen how Sonny's burning, Like some bright erotic star, He lights up the proceedings, @@ -6837,18 +6275,6 @@ great!" The man replied, "Man, it ain't nothin'! You shoulda been here a week ago and seen the guy with the chicken!" % -He hated to mend, so young Ned -Called in a cute neighbor instead. - Her husband said, "Vi, - When you stitched up his torn fly, -Did you have to bite off the thread?" -% -He played smooch and stinkfinger with Daisy -Till this virgin was gotch-eyed and hazy. - Then his gargantuan pole in - Her pink, tight, and swollen -Young cunt just about drove her crazy. -% He used to kiss her on her lips, but it's all over now. % He was not only a great swordsman, but also a cunning linguist. @@ -6933,7 +6359,7 @@ Hear about... wrong foot? % Hear about... - the doctor that prescribed sex for insommia? His patients didn't + the doctor that prescribed sex for insomnia? His patients didn't get any more sleep, but they had more fun staying awake. % Hear about... @@ -7108,7 +6534,7 @@ Hear about... the over-eager bride who came, walking down the aisle? % Hear about... - the perverted australian who left his wife and returned to Sydney? + the perverted Australian who left his wife and returned to Sydney? % Hear about... the poor Greek fisherman who got his upper torso wedged into @@ -7242,18 +6668,6 @@ Help Stamp Out Rape! (Say Yes.) HENPECKED HUSBAND: One who's afraid to tell his pregnant wife that he's sterile. % -Her brother, a bastard named Ben, -Could rotate his pecker, and then - He would shoot through his rear - Which made him dear -Of the girls, and the envy of men. -% -Her daughter, thought worried Ms. Coffin, -Had morals the city might soften. - So she phoned and asked, "Lynn, - Are you living in sin?" -Lynn said, "No -- but I visit there often." -% Her kisses left something to be desired: the rest of her. % Here I sit, my cheeks a flexin', @@ -7358,12 +6772,6 @@ Opened its door. Fun is in store. % Hire the handicapped -- they're fun to watch! % -His shy bride admitted to Crandall -That for years she'd worked off with a candle, - But a cock like his dick - Gave her ten times the kick, -Though it stained her wee peehole to handle! -% Home is where the hurt is. -- Strange de Jim % @@ -7492,18 +6900,6 @@ week, I find myself the greatest Man in the World! except that Idol of all my Adorations, his Royal and Imperial Majesty, NAPOLEONE! -- William Cobbett, British journalist % -I dined with Lord Hughing Fitz-Bluing -Who said, "Do you squirm when you're screwing?" - I replied, "Simple shagging - Without any wagging -Is only for screwing canoeing." -% -"I do love a lay every day, -So whenever you're coming this way - Just phone in advance - And I'll jerk off my pants, -And we're set for a sexy soiree!" -% I don't care who you are, Fatso. Get those reindeer off my roof. % I don't discriminate on the basis of sex. @@ -7601,7 +6997,7 @@ Was over a barrel When Tarantula took to the hills. ["Lick it!"] And I really got hot When I saw Jeanette Scott -Fight a triffid that spits poison and kills. +Fight a trifid that spits poison and kills. Science fiction, double feature Doctor X will build a creature. @@ -7648,12 +7044,6 @@ is to bring a New Yorker home first. % I may not be able to walk, but I drive from a sitting position. % -I met a young man in Chungking -Who had a very long thing -- - But you'll guess my surprise - When I found that its size -Just measured a third-finger ring! -% I never believed in Santa Claus because I knew no white dude would come into my neighborhood after dark. -- Dick Gregory @@ -7662,12 +7052,6 @@ I never did give anybody hell. I just told the truth and they thought it was hell. -- Harry S. Truman % -I never had Miss Defauw, -But it wouldn't have been quite so raw - If she'd only said "No" - When I wanted her so; -But she didn't -- she laughed and said "Naw!" -% I never met a woman I couldn't drink pretty. % I never trust a man unless I've got his pecker in my pocket. @@ -7676,24 +7060,6 @@ I never trust a man unless I've got his pecker in my pocket. I never trust a man unless I've got his pecker in my pocket. -- Lyndon Johnson % -I once had the wife of a Dean -Seven times while the Dean was out skiin'. - She remarked with some gaiety, - "Not bad for the laiety, -Though the Bishop once managed thirteen." -% -I once met a lassie named Ruth -In a long distance telephone booth. - Now I know the perfection - Of an ideal connection -Even if somewhat uncouth. -% -I once was annoyed by a queer -Who made his intentions quite clear. - Said I, "I'm no prude, - So don't think me rude, -But I'm already stewed, screwed, and tattooed." -% I only date queers. -- Bisexuality, 101 @@ -7814,44 +7180,6 @@ And have myself an illegitimate child I wish I were a fascinating lady Instead I'm the minister's child % -I wish that my room had a floor; -I don't so much care for a door, - But this walking around - Without touching the ground -Is getting to be quite a bore! - -- Gelett Burgess -% -I wish that my room had a floor; -I don't so much care for a door, - But this walking around - Without touching the ground -Is getting to be quite a bore! - -- Gelett Burgess -% -I wonder what my wife will want tonight; -Wonder if the wife will fuss and fight? - I wonder can she tell - That I've been raising hell; -Wonder if she'll know that I've been tight? - -My wife is just as nice as can be, -I hope she doesn't feel too nice toward me. - For an afternoon of joy, - Is hell on the old boy, -I wonder what the wife will want tonight! -% -I wooed a stewed nude in Bermuda, -I was lewd, but my God! she was lewder. - She said it was crude - To be wooed in the nude-- -I persued her, subdued her, and screwed her! -% -I would like to say, Mister Bunce, -I'm a great connoisseur of hot cunts. - And in all my lewd life - I've met none like your wife, -So why leave her to me, you big dunce? -% I wouldn't fuck her with your prick. % I wouldn't mind dying -- it's that business of @@ -7875,23 +7203,11 @@ I'd like to meet the man who invented sex and see what he's working on now. man as its logo." -- Bill Cain, "Stand Up Tragedy" % -I'd rather have fingers than toes, -I'd rather have ears than a nose, - And a happy erection - Brought just to perfection -Makes me terribly sad when it goes. -% I'd walk a mile for a Camel, two for a hump. % If being bi increases your chance of getting a date, does being poly increase your chance of getting dumped? % -If continence causes neurosis -And intercourse causes thrombosis - I'd rather expire - Fulfilling desire -Than live in a state of psychosis. -% If girls are all sugar and spice, why do they taste like anchovies? % If God doesn't destroy San Francisco, @@ -8003,12 +7319,6 @@ If you live in New York, even if you're Catholic, you're Jewish. % If you were attacked by a homosexual, would you beat him off? % -If your thesis is utterly vacuous, -Employ first-order predicate calculus. - With sufficient formality, - The sheerest banality, -Will be hailed by all as miraculous! -% If you're Catholic you've only got two choices: periodic abstinence and complete continence; (you know, rhythm and blues). % @@ -8027,37 +7337,6 @@ like one or the other of you planned. If you're really into astrology, tell me, what happens when Mercury is in the Fish, and Jupiter enters the Virgin? % -If you're speaking of actions immoral -The how about giving the laurel - To doughty Queen Esther, - No three men could best her -- -One fore, and one aft, and one oral. -% -Il y a une jeune fille amoureuse -D'un homme qu'a une conduite honteuse; - Il la mene chaque soir - A son caveau noir -Et la bat avec plaintes crapuleuses. - -- Edward Gorey -% -Il y avait un jeune homme de dijon, -Qui n'avait que peu de religion. - Il dit:"quant a' moi, - Je deteste tous les trois, -Le pere, et le fils, et le pigeon-" -% -Il y avait un plombier, Francois, -Qui plombait sa femme dans le Bois. - Dit-elle, "Arretez! - J'entends quelqu'un venait." -Dit le plombier, en plombant, "C'est moi." -% -Il y avait une madame de Lahore -Dont la figure n'etait la meilleure, - Mais la vagine tres forte, - Toujours ouverte la porte, -Encore, et encore, et encore. -% "I'll tell ya, Jeb," Wilbur said to his friend, "the tractor business ain't doin' too well. I ain't sold one all month. "You think you've got problems?" Jeb replied. "The other day, I went @@ -8187,7 +7466,7 @@ impotent loser, n: In 1953, Stalin dies. The politburo holds a special meeting to decide what to do about the body. Nobody will let it be buried near their home. Finally they decide: - "Aha! Call Israel! Offer them ten million rubels; they'll let us + "Aha! Call Israel! Offer them ten million rubles; they'll let us bury Stalin in Israel! Off goes the message and the politburo waits... Finally a telegram comes back: "NO CHANCE STOP ONE RESURRECTION HERE ALREADY" @@ -8215,12 +7494,6 @@ In days of old, when knights were bold, They tied their socks around their cocks And babies were prevented. % -In Duluth there's a hostess, forsooth, -Who doesn't know gin from vermouth, - But this lubricant lapse - Isn't noticed, perhaps -Because nobody does in Duluth. -% In France they piss on Main Street (In pissoirs, Mama, not cheap display). -- Joni Mitchell @@ -8228,30 +7501,6 @@ In France they piss on Main Street In light of the New Morality, Playboy Inc. is offering a new version of its magazine, for married men. Every month it has the same centerfold. % -In my sweet little Alice Blue gown -Was the first time I ever laid down, - I was both proud and shy - As he opened his fly -And the moment I saw it I thought I would die. - -Oh it hung almost down to the ground, -As it went in I made not a sound, - The more that he shoved it - The more that I loved it, -As he came on my Alice Blue gown. -% -In my sweet little night gown of blue, -On the first night that I slept with you, - I was both shy and scared - As the bed was prepared, -And you played peekaboo with my ribbons of blue. - -As we both watched the break of day, -And in peaceful submission I lay, - You said you adored it - But dammit, you tore it, -My sweet little night gown of blue. -% In outer space, nobody can hear you fart. % In regards to Oral Roberts' claim that God told him that he would die unless @@ -8323,7 +7572,7 @@ Infatuation, n: When you're in love, there's a lump in your throat. When you're infatuated, there's a lump in your pants. % -Inspite of all evidence to the contrary, the entire universe +In spite of all evidence to the contrary, the entire universe is composed of only two basic substances: magic and bullshit. % ==================== @@ -8491,12 +7740,6 @@ Especially in a paternity hearing. It takes leather balls to play rugby. (Blood makes the grass grow!) % -It takes little strain and no art -To bang out an echoing fart. - The reaction is hearty - When you fart at a party, -But the sensitive persons depart. -% It used to be a man's world, and the woman's place was in the home. They can kiss that shit goodbye. % @@ -8635,7 +7878,7 @@ It's a bitch being butch. It's a funny thing that when a woman hasn't got anything on earth to worry about, she goes off and gets married. % -It's a question of Napleon brandy versus Ripple. +It's a question of Napoleon brandy versus Ripple. I am mellow and amber and I go down real smooth. -- Rita Moreno, commenting in Newsweek on the sex appeal of older women versus younger women @@ -8693,7 +7936,7 @@ And fuck some more! I would dance and I'd be merry If I only had a dong! -- to "If I Only Had A Brain", The Wizard of Oz % -I've been told that it's far more sensous to have a woman leave something +I've been told that it's far more sensuous to have a woman leave something on rather than being totally nude. Myself, I've always felt that the lights were more than enough. % @@ -9125,7 +8368,7 @@ raped, his house burned, and all his cattle rustled. When he told his distant neighbors about the tragedy, a few of them reported that the only stranger they had seen in the area for weeks was a tall desperado wearing a black hat and a red neckerchief. - The cowboy saddled his fastest horse and set out to find the villian. + The cowboy saddled his fastest horse and set out to find the villain. He searched for months but couldn't catch up with the culprit; in town after dusty town he was told that a man fitting the description had been there but had just departed; usually after some heinous crime. @@ -9164,12 +8407,6 @@ twang of a bedspring. Love is two minutes and fifty-two seconds of squishy sounds. -- Johnny Rotten % -Love letters no longer they write us, -To their homes they so seldom invite us. - It grieves me to say, - They have learned with dismay, -We can't cure their `vulva pruritus'. -% Luser, n: Someone who picks up a female hitch-hiker walking home from a date. @@ -9238,12 +8475,6 @@ Marijuana is like Coors beer. If you could buy the damn stuff at a Georgia filling station, you'd decide you wouldn't want it. -- Billy Carter % -Marlene wanted Joy to relent, -She said, "AIDS is so hard to prevent. - If you want to get laid, - Then we'll have to tribade!" -(But Joy didn't know what she meant.) -% Marriage has driven more than one man to sex. -- Peter De Vries % @@ -9316,12 +8547,6 @@ May the fairy god-camel leave a lump on your pillow! Maybe if the guy who developed Twinkies hadn't had such a low opinion of himself they would have been an inch or two longer! % -McCoy's a seducer galore, -And of virgins he has quite a score. - He tells them, "My dear, - You're the Final Frontier, -Where man never has gone before." -% McGowan's Madison Avenue Axiom: If an item is advertised as "under $50", you can bet your ass it's not $19.95. @@ -9519,19 +8744,13 @@ the door. Before the butler could say anything, the parrot yelled, "Okay, you chicken-fuckers, up here on the piano with me!" % -Mrs. Kelly is partial to cocks; -Mr. Kelly likes rye on the rocks. - When he's under the weather - They can't get together, -So others get into her box. -% Murphy's Discovery: Do you know Presidents talk to the country the way men talk to women? They say, "Trust me, go all the way with me, and everything will be all right." And what happens? Nine months later, you're in trouble! % -Musing on her present and past professions as "dominant/sadomasichism +Musing on her present and past professions as "dominant/sadomasochism fantasy fulfiller" and dental hygienist, Sybil said, "I couldn't really understand why I wanted to be a dental hygienist, but years later, after being in the SM world a long time, I figured it out: I'm in uniform, @@ -9566,13 +8785,6 @@ My idea of a wild party is where you throw the girls' panties at the wall and they stick. -- Johnny Bob % -My jaw aches, my pussy is sore. -I simply can't fuck any more; - I'm covered with sweat, - And you haven't come yet, -And my God, it's a quarter to four! - -- The Gray-haired Woman's Complaint -% My mother didn't breast-feed me. She said she liked me as a friend. -- Rodney Dangerfield % @@ -9619,20 +8831,6 @@ And that's when I almost died, They nearly knocked me down to be the first in town To get their Elephant Shit On Rye! % -`My trip? It was vile. Balaclava -I loathed. Etna was crawling with lava. - The ship was all white - But it creaked in the night, -And the band, they did not know la java." - -- Edward Gorey -% -`My trip? It was vile. Balaclava -I loathed. Etna was crawling with lava. - The ship was all white - But it creaked in the night, -And the band, they did not know la java." - -- Edward Gorey -% My wife and I only smoke after sex. I've had the same pack since 1967. She's up to three packs a day. -- Rodney Dangerfield @@ -9662,7 +8860,7 @@ navel, n: Necessity is the mother of strange bedfellows. Watch who you sleep with. % -necrophelia, n: +necrophilia, n: Dead boring. incest, n: @@ -9783,7 +8981,7 @@ have chosen to see it as a final and clinching proof of the non-existence of God. The argument follows: "I refuse to prove that I exist," says God, "for proof denies faith, and without faith I am nothing." "But," says Man, "the Babel fish is a dead giveaway, isn't it? It could not have evolved -by chance, thus proving that you exist, therefore by your own arguements, +by chance, thus proving that you exist, therefore by your own arguments, you don't. QED." "Oh, dear," says God, "I hadn't thought of that," and promptly vanishes in a puff of logic. -- D. Adams @@ -9795,7 +8993,7 @@ What would they do if I made no landfall?" -- Jimmy Buffet, "Landfall" % Nurse Jones is a regular on the newsgroup [alt.sex.bondage], and -occasionally has problems with folks harrassing her. She came up +occasionally has problems with folks harassing her. She came up with this in response to one... Fortunately, my ego isn't as fragile as that woodpecker's wing. @@ -9827,12 +9025,6 @@ Obscenity is a crutch for lazy Motherfuckers. % Obscenity is the crutch of inarticulate motherfuckers. % -Oden the bardling averred -His muse was the bum of a bird, - And his Lesbian wife - Would finger his fife -While Fisherwood waited as third. -% Of course, I speak of nothing else but that classic of understated yet wildly exciting eroticism, "The Windflower," by Laura London. Ms. London is the author of such other philosophical block-busters as "Bad Baron's Daughter," @@ -9851,12 +9043,6 @@ sensationally sensual, golden-haired captor -- Devon." Of course, most people eventually give up bowling for sex. The balls are lighter and you don't have to change your shoes. % -Of his face she thought not very much, -But then, at the very first touch, - Her attitude shifted -- - He was terribly gifted -At frigging and fucking and such. -% Oh, baby, put two fingers here and one finger there and call me bitch. % Oh give me a home, where the bookmakers roam, @@ -9881,24 +9067,6 @@ Oh John, let's. Oh John. Oh. % -Oh, pity the Duchess of Kent! -Her cunt is so dreadfully bent, - The poor wench doth stammer, - "I need a sledgehammer -To pound a man into my vent." -% -Oh pity the prince, Montezuma -He tried to make love to a puma. - Seems the puma, in play, - Tore his testes away - -- An example of animal huma. -% -Oh pity the prince, Montezuma -He tried to make love to a puma. - Seems the puma, in play, - Tore his testes away -- -An example of animal huma. -% Oh what a tangled web we weave when first we practice to conceive. -- Don Herold % @@ -9973,18 +9141,6 @@ You see, he had a bone of his own. Olmstead's Law: After all is said and done, a hell of a lot more is said than done. % -On a cannibal isle near Malaysia -Lives a lady they call Anastasia. - Not russian elite- - She's eager to eat -Whatever or whoever lays her. -% -On a ship wrecked far out at sea, -The girl said, "I can't seem to pee." - "Aha!" said the mate, - "That settles the fate -Of the captain, the pilot, and me." -% On an isolated stretch of beach near Cannes, a beautiful French girl threw herself into the sea and drowned despite a young man's attempt to save her. The man dragged the half-nude body ashore and left it on the sand while he @@ -10000,12 +9156,6 @@ On Brassieres: Salvation Army: Raises the fallen. American: Makes mountains out of molehills. % -On day a Monterey daughter -Did scuba down under the water. - She later turned up - The mom of a pup, -And they say t'was a otter that gotter. -% On one hot dusty day in 1860, a lone Mexican bandit crossed the border into Texas. After robbing a small bank and shooting up the town, he led the posse on a merry chase through the desert. On the sixth day of the chase he was @@ -10025,24 +9175,6 @@ me where the money is, or I'm gonna blow his brains all over the desert!" under the big tree at the pass!" Interpreter-to-sheriff: "He says you ain't got the balls..." % -On the breast of a lady named Gail, -Was tattooed the price of her tail. - And on her behind, - For the sake of the blind, -Was the same information -- in Braille. -% -On the breasts of a harlot from Yale -Was tatooed the price of her tail - And on her behind, - For the sake of the blind, -Was the same information in Braille. -% -On the porch of a dude named Horatio, -His girl got a yen for fellatio. - As she sucked on his dingus - He tried cunnilingus -But the cops ran 'em off of that patio. -% Ona day Ima gonna to Detroit to a bigga hotel. Ina morning I go down to eat breakfast. I tella waitress I wanna two piss's toast. She bringa me only one piss. I tella her I wanna two piss ona my plate. She says you @@ -10062,12 +9194,6 @@ Once a woman has given you her heart you can never get rid of the rest of her. -- Vanbrugh % -Once a young gay from Khartoum, -Took a lesbian up to his room. - They argued all night - Over who had the right -To do what, and with which, and to whom. -% Once I belonged to a group that really had THE WORD. I fought like hell for them. But another group came along and exposed the word of my group as shallow and degenerate. They had a better word. So I quit the first @@ -10186,12 +9312,6 @@ Since the composite numbers are formed from primes, their qualities are derived from those primes. So, for instance, the number 6 is "odd but true", while the powers of 2 are all extremely odd numbers. % -Once was a hooker named Gail, -Busted and sent-off to jail, - She liked the jailer, - He wanted to nail her, -So Gail made bail with her tail. -% Once you come out as a Pagan bisexual married leatherdyke, the rest of life is that much easier. % @@ -10281,7 +9401,7 @@ inquired. "Because he likes to fuck pigs." % "One day I got on the usual bus, and when I stepped in, I saw the most -gorgeous blond chinese girl... I sat beside her... I said 'Hi,' and she +gorgeous blond Chinese girl... I sat beside her... I said 'Hi,' and she said 'Hi,' and then I said 'Nice day, isn't it,' and she said 'Yeah, I guess'... I said 'What do you mean "you guess"?'... she said 'I saw my analyst today and he says I have a problem.'... so I asked 'What's the @@ -10314,18 +9434,6 @@ walked away. An onlooking pedestrian then walked up to the officer and asked, "Officer, why didn't you tell that man where thirty-third and Sacramento was?" The police officer replied, "Thure, thure, and dit the thit ticked out of me!" % -One evening a guru had coitus -With an actress, a whore and a poetess. - When asked what position - He used for coition, -He answered serenely, "the loetus." -% -One evening a guru had coitus -With an actress, a whore and a poetess. - When asked what position - He used for coition, -He answered serenely, "the lotus." -% One fall day, two men were out in the woods hunting. Feeling a sudden need to relieve himself, George went over to a nearby clump of bushes, unzipped his fly, and started in when a poisonous snake lunged out of the bushes and @@ -10352,18 +9460,6 @@ another woman even less appealing than the first. Seeing his look of wide-eyed amazement, the woman on the floor snapped, "Don't look at me like that, I was only the bridesmaid." % -One night a girl had an affair -With a fellow all covered with hair. - His enormous red whang - Gave her a wonderful bang -- -She'd been diddled by Smokey the bear. -% -One night a girl had an affair -With a fellow all covered with hair. - Then she picked up his hat - And realized that -She'd been had by Smokey the Bear. -% One of my favorite jokes, a telling commentary on Jewish mothers' capacity to lay on guilt, involves the mother who gave her son two neckties on Chanuka. "The boy hurried into his bedroom, ripped off the tie he was wearing, @@ -10482,12 +9578,6 @@ an infant's life, she probably would elect to save the infant's life, without ever considering whether there were men on base. -- Dave Barry, "Sports is a Drag" % -Our staff proctologist, Dr. Barr, -Has invented a new kind of car. - With a tank full of shit - There's no stopping it -- -For short trips, two poots take you far. -% Our team usually puts the other woman at second base, where the maximum possible number of males can get there on short notice to help out in case of emergency. As far as I can tell, our second basewoman is a pretty good @@ -10636,12 +9726,6 @@ that slave dealers pay large sums for her' Thus Richard Burton. It has nothing to do with 'race' but a lot to do with practice. See exercises. -- The Joy of Sex % -Poor Alice who lived in Corvallis -Had heard of, but not seen, the male phallus. - At her first sight of one - She started to run, -And last was seen sprinting through Dallas. -% Posterity will ne'er survey A nobler grave than this; Here lie the bones of Castlereagh; @@ -10652,13 +9736,6 @@ Postulate #1: Nothing is better than sex. Postulate #2: Masturbation is better than nothing. Conclusion: Masturbation is better than sex. % -Pour guerir un acces de fievre -Un jeune homme poursuivit un lievre; - Il le prit a son trou, - Et fit faire un ragout -Des entrailles et des pattes au genievre. - -- Edward Gorey -% Pouring out his troubles to his best friend over a couple of triple martinis, Brad had to confess that things weren't going too well at home. "My wife and I just don't hit it off at night," he was saying to Bart. "I hate to admit @@ -10695,7 +9772,7 @@ Though he shot at the target, he missed her. % Printers do it without wrinkling the sheets. % -Prior to this year's Rock & Roll Hall of Fame cermony, [Cash] went to +Prior to this year's Rock & Roll Hall of Fame ceremony, [Cash] went to the bathroom. "I was standing at the urinal, and Keith Richards walked in... He said, 'Look at this, I'm pissing with Johnny Cash. We need a picture of this.' I said, 'No, Keith, we *don't* need a picture of this.'" @@ -10871,7 +9948,7 @@ A: "I'm afraid we don't know, but make my stipend tax-free, give my credit for answering this incredibly vital question." % Q: How many heterosexual males does it take to screw in a light - bulb, in San Fransisco? + bulb, in San Francisco? A: Both of them. % Q: How many lesbians does it take to screw in a lightbulb? @@ -10904,7 +9981,7 @@ A: Sheep don't have strings. Q: What do two WASPs say after making love? A: Thank you very much. It'll never happen again. % -Q: What do you call a blind, deaf-mute, quadraplegic Virginian? +Q: What do you call a blind, deaf-mute, quadriplegic Virginian? A: Trustworthy. % Q: What do you call a nun who has had a sex change operation? @@ -10956,7 +10033,7 @@ A: Will the defendant please rise? % Q: What does friendship among Soviet nationalities mean? A: It means that the Armenians take the Russians by the hand; the - Russians take the Ukrainians by the hand; the Ukranians take + Russians take the Ukrainians by the hand; the Ukrainians take the Uzbeks by the hand; and they all go and beat up the Jews. % Q: What goes @@ -11128,7 +10205,7 @@ Q: Why do dogs lick their private parts? A: Because they can. % Q: Why do ducks have webbed feet? -A: To stamp out forest firest. +A: To stamp out forest fires. Q: Why do elephants have big flat feet? A: To stamp out flaming ducks. @@ -11307,7 +10384,7 @@ QOTD: -- Mark-Jason Dominus % QOTD: - No, honey, I've never been circumsized; it's simply wear and tear. + No, honey, I've never been circumcised; it's simply wear and tear. % QOTD: "One day, I'd like to wake up in the morning to find that every gay @@ -11404,7 +10481,7 @@ Readers Ask: Vampires are a source of great irritation to the average homeowner and it is usually to one's advantage to remove these pests as rapidly as possible. If -a professional exterminater specializing in the undead is unavailable, it is +a professional exterminator specializing in the undead is unavailable, it is possible to handle the situation with common household items. However, much of the common folklore of vanquishing the undead needs clarifying. First, driving a sharpened Louisville Slugger through a vampire's heart will NOT kill @@ -11542,158 +10619,6 @@ two new uses for sheep. Meat and wool. % Runners do it alone. % -Said a dainty young whore named Ms. Meggs, -"The men like to spread my two legs, - Then slip in between, - If you know what I mean, -And leave me the white of their eggs." -% -Said a decadent wench of Bombay : -"This has been a most wonderful day. - Three cherry tarts, - At least twenty farts, -Two shits, and a bloody fine lay." -% -Said a girl who upon her divan -Was attacked by a virile young man: - "Such excess of passion - Is quite out of fashion" -And she fractured his wrist with her fan. - -- Edward Gorey -% -Said a happy young man of Fort Drum : -"What care I for this shortage of gum? - My favorite chew - Is a condom or two, -With a goodly amount of fresh come." -% -Said a horny young girl from Milpitas, -"My favorite sport is coitus." - But a fullback from State, - Made her period late, -And now she has athlete's fetus. -% -Said a lecherous fellow named Shea, -When his prick wouldn't rise for a lay, - "You must seize it, and squeeze it, - And tease it, and please it, -For Rome wasn't built in a day." -% -Said a lesbian lady, "It's sad; -Of all the girls that I've had, - None gave me the thrill - Of real rapture until -I learned how to be a tribade." -% -Said a madam named Mamie La Farge -To a sailor just off of a barge, - "We have one girl that's dead, - With a hole in her head-- -Of course there's a slight extra charge." -% -Said a modest young miss to de Sade, -I'm simply too shy and afraid - To take part in your pranks. - But to show you my thanks, -I'd just love to become your first aide. -% -Said a pornographistic young poet -"Although I perhaps do not show it, - My interest in sin - Is wearing quite thin, -And I'll soon tell those fuckers to stow it." -% -Said a swinging young chick named Lyth -Whose virtue was largely a myth, - "Try as hard as I can, - I can't find a man -That it's fun to be virtuous with!" -% -Said a swinging young chick named Lyth -Whose virtue was largely a myth, - "Try as hard as I can, - I can't find a man -That it's fun to be virtuous with." -% -Said a swinging young chick named Lyth -Whose virtue was largely a myth, - "Try as hard as I can, - I can't find a man -That it's fun to be virtuous with!" -% -Said crew girl Angelica Bauer : -"The captain's withdrawn, cold, and sour." - Uhura said, "No, - At night that's not so-- -He doesn't withdraw for an hour." -% -Said Einstein, "I have an equation -Which to some may seem rabelaisian: - Let v be virginity - Approaching infinity; -Let p be a constant persuasion; - -Let p over p be inverted -With the square root of mu inserted - N times into v ... - The result, Q E D, -Is a relative!" Einstein asserted. -% -Said Einstein, "I have an equation -Which to some may seem Rabelaisian: - Let V be virginity - Approaching infinity; -Let P be a constant persuasion; - -"Let V over P be inverted -With the square root of Mu inserted - N times into V ... - The result, Q.E.D., -Is a relative!" Einstein asserted. -% -Said Francesca, "My lack of volition -Is leading me straight to perdition; - But I haven't the strength - To go to the length -Of making an act of contrition." - -- Edward Gorey -% -Said President Jobcock one day : -"War's better than love, I should say. - Instead of a virgin, - It's murder I'm urgin'-- -You get lots more blood that-a-way." -% -Said sneering Mohammed el-Din : -"Only infidel dogs put it in. - Back home in Arabia - We nibble the labia -Till the juice dribbles off of our chin." -% -Said the cunt-lapping Bey of Algiers, -In a cunt halfway up to his ears : - "This nautch is delicious, - And without doubt nutritious. -She's my best-tasting wife in ten years!" -% -Said the Duchess of Danzer at tea, -"Young man, do you fart when you pee?" - I replied with some wit, - "Do you belch when you shit?" -I think that was one up for me. -% -Said the nun as the bishop withdrew, -"This must be our final adieu, - For the vicar is slicker, - And thicker, and quicker, -And two inches longer than you." -% -Saint Peteer was once heard to boast -That he'd had all the heavenly host : - The Father and Son, - And then - just for fun - -The hole in the Holy Ghost. -% Sam Lefkovitz is having an intimate party to celebrate his thirty immensely profitable years in the construction business. "You know," he laments to his friends, "over the years I have @@ -11719,12 +10644,6 @@ Save Soviet Jewry -- Win Valuable Prizes!!!! % Save the whales. Club a seal instead. % -Says an airlining wanton named Vi: -"I'm a pantyless stew when I fly. - To a muffer's delight, - I'll take head on a flight, -So the guy can have pie in the sky." -% schnuffel, n.: A dog's practice of continuously nuzzling in your crotch in mixed company. @@ -11793,7 +10712,7 @@ a nice guy and all that, but, well, that she's a lesbian. Confused, he asks her what that means. "Well," she replies, "you see that woman at the corner table?" "Yeah..." - "I'd like to walk over to her, and unbottom her blouse." + "I'd like to walk over to her, and unbuttom her blouse." "Yeah..." "And then I'd like to kiss her and suck on her nipples... and then I'd like to take off her skirt... and run my hand over her thighs..." @@ -11868,7 +10787,7 @@ You can do each while thinking about the other. Sex appeal is 50% what you've got and 50% what people think you've got. -- Sophia Loren % -Sex is a biological function; kissing is a committment. +Sex is a biological function; kissing is a commitment. % Sex is better than grass, if you have the right pusher. % @@ -11943,12 +10862,6 @@ I Loved Her Face, But I Left Her Behind For You She asked me if I loved her still. "Yes," I replied. "I've never had you any other way." % -She begged and she pleaded for more. -I said, "We've already had four, - And I'm sure that you've heard, - Though it's somewhat absurd, -That eros spelt backwards is sore." -% She called her parakeet Onan, because he spilled his seed. -- Dorothy Parker % @@ -11957,29 +10870,11 @@ candidates for president. -- John Greenway, "The American Tradition", on feminist Elizabeth Gould Davis % -She made a thing of soft leather, -And topped off the end with a feather. - When she poked it inside her - She took off like a glider, -And gave up her lover forever. -% She never liked zippers, she said, Until she opened one in bed. % -She stood there and peeled off her clothes, -And begged for a bang : goodness knows - I am surely impure - And I sizzled to scrure, -But the push had gone out of my hose. -% She was a farmer's daughter but she couldn't keep her calves together. % -She was coming round the mountain doin' ninety, -When the chain on her motorcycle broke, - Now she's lying in the grass, - With the muffler up her ass, -And her tits a-playin' Dixie on the spokes. -% She was only: a coal digger's daughter, but she'll always be mine. a statistician's daughter, but she knew all the standard deviations. @@ -11989,12 +10884,6 @@ She was only: a fireman's daughter, but her face was a cause for alarm. a banker's daughter, but she opened her drawers for cash. % -She was peeved, and called her beau "Mr." -Not because, when she came in, he kr., - But she knew, just before - She opened the door, -This same Mr. had kr. sr. -% She was wearing a very tight skirt, and when she tried to board the Fifth Avenue bus she found she couldn't lift her leg. She reached back and unzipped her zipper. It didn't seem to do any good, so she reached back @@ -12004,12 +10893,6 @@ her on the top step. "Well, lady," he said, "by the time you unzipped my fly for the second time I thought we'd become good friends." % -She wasn't what one could call pretty -And other girls offered her pity, - So nobody guessed - That her Wasserman test -Involved half the men in the city. -% She's fine, upstanding, and wonderful laying down. % She's looking for: He's looking for: Foreplay: @@ -12060,12 +10943,6 @@ to attach a partner's hands. Don't pull down the fixture, however -- it isn't weightbearing. See Discipline. -- The Joy of Sex % -Sighed a neat little package named Annie : -"I've the tits and the twat and the fanny, - Plus the yen, but the men - Only call now and then-- -Can it be I've B.O. in my cranny?" -% Sir Francis Drake circumcised the world with a 100 foot clipper. % Sixteen'll get you twenty. @@ -12083,12 +10960,6 @@ Snow White: "Gee guys, I've always dreamed of getting ten inches... but not an inch-and-a-half at a time! % -"Snyder's got a stiff ticket," said Kay, -"Come on, take it out, and let's play." - He pulled it on out, - But she started to pout, -His ticket was only a quarter-inch stout. -% So, good night, you moonlit ladies, Rock-a-bye sweet baby James. Deep greens and blues are the colors I choose, @@ -12096,12 +10967,6 @@ Won't you let me go down in my dreams? And rock-a-bye sweet baby James. -- James Taylor, "Rock-a-bye Sweet Baby James" % -So here was this fellow of Strensall -Whose pecker was shaped like a pencil, - Anemic, 'tis true, - But an interesting screw, -Inasmuch as the tip was prehensile. -% So, how's your love life? Still holding your own? % @@ -12233,7 +11098,7 @@ Some women should be beaten regularly, like gongs. Something better... 13 (sympathetic): Oh, What happened? Did your parents lose a bet with God? -14 (complememtary): You must love the little birdies to give them this to +14 (complimentary): You must love the little birdies to give them this to perch on. 15 (scientific): Say, does that thing there influence the tides? 16 (obscure): Oh, I'd hate to see the grindstone. @@ -12345,7 +11210,7 @@ And sure enough she'll take you home and make you wanna die. -- Crosby, Stills, Nash, "Fair Game" % Taoism: Shit Happens. -Confucianism: Confucious say, "Shit Happens". +Confucianism: Confucius say, "Shit Happens". Buddhism: If shit happens, it isn't really shit. Hinduism: This shit has happened before. Protestantism: Shit happens, but it happens to someone else. @@ -12402,26 +11267,8 @@ Test makers do it: TEXAN: A wet-back that didn't make Oklahoma. % -Thank God for the Duchess of Gloucester, -She obliges all who accost her. - She welcomes the prick - Of Tom, Harry or Dick, -Or Baldwin, or even Lord Astor. -% That girl could suck the chrome off a bumper. % -That Harvard don down at El Djim -- -Oh, wasn't it nasty of him, - With the whole harem randy, - The sheik himself handy, -To muss up a young camel's quim. -% -That naughty old Sappho of Greece -Said: "What I prefer to a piece - Is to have my pudenda - Rubbed hard by the enda -The little pink nose of my niece." -% That reminds me of a friend of mine who went north to work on the Alaskan pipeline. Before he went up there, he was just a skinny little runt. When he got back, he was a husky fucker. @@ -12431,12 +11278,6 @@ of her particular order. The indoctrination period, which went on for hours, began with "No washing of undies in the founts," and ended with "Lights out at nine. Candles out at ten." % -The acrobats - Tom and Louise- -Do an act in the nude on their knees. - They crawl down the aisle - While screwing dog-style, -As the orchestra plays Kilmer's "Trees." -% The attractive and grief-stricken widow had been living in seclusion at the home of her deceased husband's younger brother for several weeks. One evening, when she could no longer control her emotions, she barged into her brother-in- @@ -12448,19 +11289,6 @@ my panties and bra." Once more James obeyed her command. and boldly announced, "I have only one more request, James. Don't ever let me catch you wearing my things again." % -The babe, with a cry brief and dismal, -Fell into the water baptismal; - Ere they'd gathered its plight, - It had sunk out of sight, -For the depth of the font was abysmal. - -- Edward Gorey -% -The bedsprings next door jounce and creak : -They have kept me awake for a week. - Why do newlyweds - Select squeaky beds -To develop their fucking technique? -% The best way to cut off a cat's tail is to repossess his Jaguar. % The Bible says that woman was the last thing God made. @@ -12471,12 +11299,6 @@ The big difference between sex for money and sex for free is that sex for money usually costs a lot less. -- Brendan Francis % -The bishop of Alexandretta -Loved a girl and he couldn't forget her. - So he thought he'd enshrine her - As the Holy Vagina -In the Church of the Sacred French Letter. -% The blacksmith told me before he died, And I have no reason to believe that he lied, That no matter how he tried, @@ -12531,12 +11353,6 @@ over everyone. And just at that point you, Brother Edward, you hollered, "Yeh." "Well, when you hollered 'Sheee-itt!' that was a _faux_pas_." % -The bustard's a remarkable fowl -With surely no reason to growl - He escapes what would be - Illegitimacy -By the grace of a fortunate vowel. -% The butcher, the baker, the candlestick make her, why can't I? % The computer is the ultimate polluter: @@ -12545,12 +11361,6 @@ Its shit is indistinguishable from the food it produces. The country girl who became a city madam has obviously gone from rags to rigids. % -The cruelest of creatures' the crab -With claws that can pinch you or stab, - And then when you dine - On crab and white wine -It gets you as well with the tab. -% The difference between a lawyer and a rooster is that the rooster gets up in the morning and clucks defiance. % @@ -12571,47 +11381,15 @@ is that the cactus has the pricks on the outside. The difference between women and girls is as much as twenty years in some states. % -The Dowager Duchess of Spout -Collapsed at the height of a rout; - She found strength to say - As they bore her away: -"I should never have taken the trout." - -- Edward Gorey -% The early worm gets the bird. % The ecumenical movement has reached a milestone with the agreement on the text of the first Jewish-Catholic prayer -- one that begins "Oy vay, Maria". % -The Enterprise crew when off work -Will fuck like an Ottoman Turk. - Uhura the Zulu - Is shcked up with Sulu, -And Spock shares a crew girl with Kirk. -% -The Enterprise girls, so one hears, -Have chased Spock for several years. - His look of disdain - Has spared them great pain, -For his prick is as sharp as his ears. -% The Father, the Son and the Holy Ghost would never throw the Devil out of Heaven as long as they still need him as a fourth for bridge. -- New Libertarian Notes, #19 % -The fearless old bishop of Brest -Put his faith in the Lord to the test. - He fucked whores in the apse - With chancres and claps, -But first they were sprinkled and blessed. -% -The first child of a Mrs. Keats-Shelley -Came to light with its face in its belly; - Her second was born - With a hump and a horn, -And her third was as shapeles as jelly. - -- Edward Gorey -% The first time we slept together she drove a recreational vehicle into the bedroom. -- Richard Lewis @@ -12639,12 +11417,6 @@ The Fortune Travel Agency offers a special... Vacation in Hell! % The fucking ain't worth the fighting. % -The genital area of Ann -Will accommodate any size man, - From the wee that cause titters - To the mighty twat-splitters -That cause screams peasants hear in Japan. -% The girls that go to see a man's etchings may not know art, but they know what they like. % @@ -12690,12 +11462,6 @@ The greatest lies of all time: (9) We have a really challenging assignment for you. (10) I'm from the government, and I'm here to help you. % -The Grecians were famed for fine art, -And buildings and stonework so smart. - They distinguished with poise - The men from the boys, -And used crowbars to keep them apart. -% The hacker as a mate/lover and the signs of trouble: -- The morning after note reads: @@ -12775,24 +11541,6 @@ entered the chamber, I heard the princess say, quite formally, 'I offer you my honor.' Then the prince said, with equal courtliness, 'I honor your offer.' And that's the way it went all night long -- honor, offer, honor, offer. % -The King named Oedipus Rex -Who started this fuss about sex - Put the world to great pains - By the spots and the stains -Which he made on his mother's pubex. -% -The King plugged the Queen's ass with mustard -To make her fuck hot, but got flustered, - And cried, "Oh, my dear, - I am coming, I fear, -But the mustard will make you come `plus tard'." -% -The kings of Peru were the Incas, -Who were known far and wide as great drincas. - They worshipped the sun - And had lots of fun, -But the peasants all thought they were stincas. -% The largest gay community in the U.S. (as a percentage of total population) is not in San Francisco, but in Iowa Falls, Minnesota (pop. 763), a small town in which virtually everyone is gay. In 1976, a group of about 100 @@ -12905,14 +11653,8 @@ adopted children. % The moving finger having writ... gestures. % -The moyel who treated young Alec -Was cross-eyed and hydrocephalic. - Presented the child - His aim was so wild -He rendered the poor boy biphallic. -% The nervous young bride became irritated by her husband's lusty advances on -their wedding night and reprimanded him severly. +their wedding night and reprimanded him severely. "I demand proper manners in bed," she declared, "just as I do at the dinner table." Amused by his wife's formality, the groom smoothed his rumpled hair @@ -12922,18 +11664,6 @@ hint of a smile. "Very good, darling," the husband whispered. "Now would you be so kind as to please pass the pussy?" % -The new cinematic emporium -Is not just a super-sensorium, - But a highly effectual - Heterosexual -Mutual masturbatorium. -% -The new local cinematorium -Is not only a super sensorium, - But a highly effectual - Heterosexual -Mutual masturbatorium. -% The new priest was so nervous about performing his first mass that he could hardly speak. He asked his Monsignor how he could relax. The Monsignor replied that it might help relax him to add just a bit of vodka to the water @@ -12978,36 +11708,6 @@ dust, his plumage riddled with buckshot. "Dammit, Emmy," said the farmer. "That's the last rooster we buy from Ferguson. Four of 'em this month, and every one's been queer." % -The nipples of Sarah Sarong -When excited are twelve inches long - This embarassed her lover - Who was pained to discover -She expected no less of his dong -% -The notorious Duchess of Peels -Saw a fisherman fishing for eels. - Said she, "Would you mind? -- - Shove one up my behind. -I am anxious to know how it feels." -% -The office brown-noser named Bunky -Would claim he was nobody's flunky. - But when the chips were all down, - His proboscis was brown, -And there hung many strands which were gunky. -% -The old archeologist, Throstle, -Discovered a marvelous fossil. - He knew from its bend - And the knot on the end, -T'was the penis of Paul the Apostle. -% -The once was a man from Bombay -Who modeled his cunts out of clay - So hot was his prick - That he turned them to brick -And rubbed all his foreskin away. -% The only difference between your current lover and a doorknob is that a doorknob warms up when you hold it. % @@ -13029,7 +11729,7 @@ lamp-post. % The only way I can lose this election is if I'm caught in bed with a dead girl or a live boy. - -- Edwin Edwards, Louisian governor + -- Edwin Edwards, Louisiana governor % The only way to behave to a woman is to make love to her if she is pretty and to someone else if she is plain. @@ -13056,16 +11756,9 @@ The outraged husband discovered his wife in bed with another man. "That seems like a fair question," said the wife, rolling over. "What IS your name?" % -The partition of Vavasour Scowles -Was a sickener: they came on his bowels - In a firkin; his brain - Was found clogging a drain, -And his toes were inside of some towels. - -- Edward Gorey -% The penis mightier than the sword. % -the perfect worman: +the perfect woman: Four feet tall, no teeth and a flat head so you can rest your drink. @@ -13110,12 +11803,6 @@ of a four-letter word for `woman' that ends in `u-n-t'?" "Aunt," replies the Cardinal. "Say, thanks," says the Pope. "You got an eraser?" % -The prick of the engineer, Scott, -Fell off from Saturnian rot. - He went to the basement - And made a replacement -Of tungsten and plastic and snot. -% The priest at Sunday mass noticed that Michael took a ten-dollar bill and two one-dollar bills from the collection plate, instead of putting something in. He thought to himself, I'd better watch out for Michael. The next week he @@ -13125,7 +11812,7 @@ as Michael came out, he accosted his and said, singles two weeks in a row, instead of putting money into the collection?" Michael replied, "Father, I'm embarrassed, but I did it because I wanted to go downtown for a blow job." - The priest looked suprised but said to Michael, "Listen, don't do + The priest looked surprised but said to Michael, "Listen, don't do that anymore. I'll be watching you from now on." When he got back to the rectory, the priest was still perplexed. Finally he decided to call Mother Agatha at the convent. He said, "Mother, @@ -13146,12 +11833,6 @@ The public is an old woman. Let her maunder and mumble. The quality of a blow-job is determined by the length of sheet you have to pull out of your ass. % -The randy old Bey of Algiers -Who'd confined his cock-poking to queers, - Tried a cunt for a change, - And remarked : "It felt strange ... -Just think what I've missed all these years!" -% The real problem with fucking a sheep is that you have to walk around in front every time you want to kiss her. % @@ -13165,19 +11846,6 @@ rhythm method of birth control is that it doesn't work. % The reason that sex is so popular is that it's centrally located. % -The Reverend Henry Ward Beecher -Called a girl a most elegant creature. - So she laid on her back - And, exposing her crack, -Said, "Fuck that, you old Sunday School Teacher!" -% -The Reverend Henry Ward Beecher -Called a hen a most elegant creature. - The hen, pleased with that, - Laid an egg in his hat -- -And thus did the hen reward Beecher. - -- Oliver Wendell Holmes -% The REVERSE function works on the opposite SEXPR. % The rich man uses vaseline, @@ -13217,12 +11885,6 @@ her eyes, and he'd be screwing a machine, an inanimate object, a public toilet. Just like with any other woman for him, really. -- Rudy Rucker, "Software" % -The Shah of the Empire of Persia -Lay for days in a sexual merger. - When the nautch asked the Shah, - "Won't you ever withdraw?" -He replied with a yawn, "It's inertia." -% The shy young man had been married for three months when he reported to his doctor that his marriage was still in name only. The doctor, after hearing the sad tale, told him that waiting until bedtime to make advances was causing @@ -13236,43 +11898,12 @@ was as if an electric current ran through us. I leaped to my feet, swept the dishes from the table and then and there consummated our marriage! There's just one problem, however. We can't go back to The Four Seasons again..." % -The sight of his guests filled Lord Cray -At breakfast with horrid dismay, - So he launched off the spoons - The pits from his prunes -At their heads as they neared the buffet. - -- Edward Gorey -% -The skater, Barbara Ann Scott -Is so fuckingly "winsome" a snot, - That when posed on her toes - She elaborately shows -Teeth, fat ass, titties and twat. -% -The spouse of a pretty young thing -Came home from the wars in the spring. - He was lame but he came - With his dame like a flame -- -A discharge is a wondeful thing. -% -The star of that X-rated hit -Plays a nurse with a throat full of clit. - This serves as a palace - For each turgid phallus-- -Some say that the plot is pure shit. -% The Stealth Condom -- they'll never see you coming. % The struggling for knowledge has a pleasure in it like that of wrestling with a fine woman. -- Lord Halifax % -The Sultan was peeved with his harem, -And cooked up a scheme for to scare'em. - He caught a big mouse - Which he loosed in the house. -(Such confusion is called harem-scarem). -% The sun was shining brightly The breeze was blowing briskly, And I could hardly wait, It made the flowers sway, To ponder at my window The garden was enchanting @@ -13284,23 +11915,11 @@ I beckoned him to come and light And then I closed the window Upon my window sill. And smashed his fucking head. -- "Good Morning", Debbie Smith % -"The testes are cooler outside," -Said the doc to the curious bride, - "For the semen must no - Get too fucking hot, -And the bag fans your bum on the ride." -% -"The testes are cooler outside," -Said the doc to the curious bride, - "For the semen must not - Get too fucking hot, -And the bag fans your bum on the ride." -% -The three faithful things in life are money, a dog and an old woman. +The three faithful things in life are money, a dog, and an old woman. % The three most important parts of a stove: lifter, leg, and poker. % -The three sexual positions during preganancy. +The three sexual positions during pregnancy. During the first four months: Missionary style During the second four months: Doggie style @@ -13346,7 +11965,7 @@ The other ran his own hand over his head and nonchalantly retorted, The two things that you should never lend out are your car or your woman. Someone's bound to throw a rod in either one. % -The Unitarians are really just a bunch of athiests who really +The Unitarians are really just a bunch of atheists who really like going to church. % The Utah version of this joke goes: @@ -13356,7 +11975,7 @@ that you ran all the way here, losing your breath?" The Council member finally regains his breath, and says "The Savior is in the lobby!!" The President immediate starts for the door, crying "It has come! The -prophecies are fullfilled! We are all about to be uplifted!" +prophecies are fulfilled! We are all about to be uplifted!" The Council member says "Wait! You didn't let me finish! She's... black, and SHE IS PISSED!" % @@ -13392,18 +12011,6 @@ The whole religious complexion of the modern world is due to the absence from Jerusalem of a lunatic asylum. -- Havelock Ellis % -The wife of young Richard of Limerick -Complained to her husband, "My quim, Rick, - Still grows in diameter - Each time that you ram at her; -How can your poor tool stay so slim, Rick?" -% -The woman who lives on the moon -Is still cherishing the balloon - Of an earthling who'd come - And given her some, -But had dribbled away all too soon. -% The woman you buy -- and she is the least expensive -- takes a great deal of money. The woman who gives herself takes all your time. -- Balzac @@ -13413,43 +12020,13 @@ almost fifty percent of the languages of the Galaxy, and many people have attempted to explain why. Usually these explanations get bogged down in silly puns about "standing erect". % -The work of Mess Sergeant Potgieter -Is not merely reading a meter. - By orders of Kirk - A part of his work -Is dosing the food with saltpeter. -% The world is an 8000 mile in diameter spherical pile of shit. % -The world is so full of a number of things, -I'm sure we should all be as happy as kings. - I'll tell you a story-- - It won't take me long-- -Of a brother and sister whose tale is my song. - -There was an old fellow and what do you think? -He lived on the cheese that he scraped from his dink. - He whacked it, he hacked it, - He ate it with glee- -Was there ever a fellow so happy as he? - -This charming old chap had a sister as well : -She was ugly and gaunt, with a horrible smell. - Her cunt was so dirty - It stank like a beast, -And the odor killed flies as they gathered to feast. - -What a wonderful family! What marvellous style! -I'll bet you and I aren't close by a mile. - Their odor and diet - Won't soon be forgotton, -And one day you and I may be equally rotten. -% The young girl was having a heart-to-heart talk with her mother on her first visit home since starting college. "Mom, I have to tell you," the girl confessed. "I lost my virginity last weekend." - "I'm not suprised," said her mother. "It was bound to happen sooner + "I'm not surprised," said her mother. "It was bound to happen sooner or later. I just hope it was a romantic and pleasurable experience." "Well, yes and no," the pretty student remarked. "The first eight guys felt great, but after them my pussy got real sore." @@ -13521,12 +12098,6 @@ There are so many people wanting a piece of my ass that some of them are having to take turns. -- T.K. % -There are some things we mustn't expose, -So we hide them away in our clothes. - Oh, it's shocking to stare - At what's certainly there-- -But why this is so, heaven knows. -% There are three women on the fast track in a particular company. The president realizes it's time to promote one of them, but they're all so competent that he's not sure which one to choose. So he devises a little @@ -13559,18 +12130,6 @@ woman's breasts. One is not enough and three are too many. There is a new model of car being sold in San Francisco -- the pervertible. The top doesn't go down, but the driver does. % -There is a young faggot named Mose -Who insists that you fuck his long nose. - And you'll double the joy - Of this lecherous boy -If you'll tickle his balls with your toes. -% -There is a young lady named Aird, -Whose bottom is always kept bared. - When asked why she pouts, - She says "The Boy Scouts, -All beg me to please Be Prepared!" -% There is nothing as overrated as a bad lay, or as underrated as a great shit. % @@ -13608,7 +12167,7 @@ front page before discarding it?" be on the front page." -- Attributed to FDR. % -There was a young man hitchiking along a road one day. A car stopped and the +There was a young man hitchhiking along a road one day. A car stopped and the driver opened the door and asked, "What political party are you with?" He replied, "Why, I'm a Democrat." And the driver slammed the door and rode off. The guy was pretty @@ -13762,7 +12321,7 @@ desperate search. Just as his bowels threatened to erupt, he spotted a one-foot by one-foot hole in the floor. Now, at the end of his control, he decided to take advantage of the hole. He dropped his pants, hunched over it, and did his thing. Thoroughly relieved and relaxed, he sauntered down the -steps to find, to his suprise, that the crowded bar was now empty. +steps to find, to his surprise, that the crowded bar was now empty. "Hey!" he yelled to the seemingly empty room, "Where is everyone?" From behind the bar a voice responded, "Hey! Where were you when the shit hit the fan?" @@ -13863,7 +12422,7 @@ During the next few weeks, he listened particularly closely to his son's prayers, but noticed nothing unusual. Then, one night, the boy ended his prayers with, "God specially bless Grandmom, who won't be with us much longer." Although the shock of the original incident had worn off during the intervening -weeks, he nontheless phoned his mother to inquire as to her health. He went to +weeks, he nonetheless phoned his mother to inquire as to her health. He went to bed reassured, only to be awakened in the night by his sister calling with the news that their mother had died suddenly in the night. The father had a series of psychological tests done; nothing unusual was uncovered. About a month @@ -14222,13 +12781,6 @@ good for a man's virility?" "Well, take it from me, that's a lot of foolishness. I ate a dozen of them the other night, and only nine worked." % -Un moine au milieu de la messe A monk in the middle of mass -S'eleva et cria en detresse; Stood up and cried out in distress; - "La vie religieuse, "The religious life - C'est sale et affreuse," Is dirty and horrid," -Et se poignarda dans les fesses. And stabbed himself in the ass. - -- Edward Gorey -% Uncle Sam comes off as the perverted relative who'll offer you a bit of candy, but if you won't bend over for him, you get a beating. % @@ -14500,48 +13052,6 @@ The bigger the better! The tighter the sweater! And the boys will think more of us! % -We sailed on the good ship Venus, -My God, you should have seen us - With a figurehead - Of a whore in bed -And the mast an upright penis - -The captain of the lugger -Was known as a filthy bugger - Declared unfit - To shovel shit -From one ship to another - -The first mate's name was Cooper, -By god he was a trooper - He jerked and jerked - Until he worked -Himself into a stupor - -The cabin boy was chipper, -A dandy little nipper - He shoved cracked glass - Inside his ass -And circumcised the skipper - -The captain's wife was Charlotte, -Born and bred a harlot - Her thighs at night - Were lily white -By morning they were scarlet - -The captain's youngest daughter -Slipped into the water - Her plaintive squeals - Announced that eels -Had found her sexual quarter - -The ship's dog's name was Rover, -They turned the poor beast over - And ground and ground - That faithful hound -From Tenerief to Dover -% We took some pictures of the girls, but they weren't developed. -- Groucho Marx % @@ -14620,12 +13130,6 @@ about it or anything, I don't tie myself up first, I just, I just kinda spend a little time with myself. -- Tom Waits, "Nighthawks at the Diner" % -Well buggered was a boy named Delpasse -By all of the lads in his class - He said, with a yawn, - "Now the novelty's gone -And it's only a pain in the ass." -% Well, God gave me a bust. What am I supposed to do with it? -- Martha Mitchell % @@ -14662,12 +13166,6 @@ I think I got it some more! Got a bad scratch fever... -- Ted Nugent, "Cat Scratch Fever" % -"Well, I took your advice, Doc", said Knopp, -"And told my wife to try it on top. - She bounced for an hour, - Till she ran out of power, -And the kids, who'd grown bored, made us stop." -% Well, I went to a party, and what did they do? They took off their socks and they took off their shoes. They took off their shirts, and they took off their pants, @@ -14749,7 +13247,7 @@ a mule in the ass all you want, and he's still not gonna be a racehorse. Well, you see, it's such a transitional creature. It's a piss-poor reptile and not very much of a bird. -- Melvin Konner, from "The Tangled Wing", quoting a - zoologist who has studied the archeopteryx and found it + zoologist who has studied the Archaeopteryx and found it "very much like people". % Well, you see there was this neighborhood that had a priest, a minister, and @@ -14813,7 +13311,7 @@ What the fuck, over? % What the hell, go ahead and put all your eggs in one basket. % -What this department needs is a really good inflatible doll. +What this department needs is a really good inflatable doll. % What with chromodynamics and electroweak too Our Standardized Model should please even you, @@ -14854,7 +13352,7 @@ Doo-doo, doo-doo. -- Foghorn Leghorn, to "Camptown Ladies" % What's the worst thing about being an atheist? -Noone to talk to when you're having an orgasm. +No one to talk to when you're having an orgasm. % When a girl admits she's had a checkered career, it's your move. % @@ -15114,9 +13612,6 @@ Why I am an atheist: 4. We should all strive to be like God. 5. We should all be atheists. % -Why is it that there are so many more horses' asses than there are horses? - -- G. Gordon Liddy -% Why is it that there are so many more horses' asses than there are horses? -- G. Gordon Liddy @@ -15203,7 +13698,7 @@ Would you rather have a 5-inch hard or an 8-inch floppy? % Writers do it between periods. % -"Yeah, I used to be into necrophelia, bestiality and sadism, but then I +"Yeah, I used to be into necrophilia, bestiality and sadism, but then I realized I was just flogging a dead horse." % Yesterday is a memory, @@ -15307,7 +13802,7 @@ But it's OK, Scorpio. A kick in the ass is at least one step forward. SAGITTARIUS (Nov. 22 - Dec. 21) You've been on a diet for two weeks and all you've lost is two weeks. -My advice is to drink copius amounts of beer just to get the thought of food +My advice is to drink copious amounts of beer just to get the thought of food out of your mind. Remember, a good reducing exercise consists of placing both hands against the table edge and pushing back. diff --git a/fortune/datfiles/limerick b/fortune/datfiles/limerick index 7f8919c..05c3ab7 100644 --- a/fortune/datfiles/limerick +++ b/fortune/datfiles/limerick @@ -1,8 +1,8 @@ -A computer called Illiac4 -Had a rather tough bug in its core. - It chewed up its cards - And spewed yards and yards -Of illegible tape on the floor. +A UNIX saleslady, Lenore, +Enjoys work, but she likes the beach more. + She found a good way + To combine work and play: +She sells C shells by the seashore. % A computer, to print out a fact, Will divide, multiply, and subtract. @@ -11,6 +11,18 @@ Will divide, multiply, and subtract. If the input was short of exact. -- Gigo % +A crusader's wife slipped from the garrison +And had an affair with a Saracen. + She was not oversexed, + Or jealous or vexed, +She just wanted to make a comparison. +% +A dozen, a gross, and a score, +Plus three times the square root of four, + Divided by seven, + Plus five times eleven, +Equals nine squared plus zero, no more. +% A dreary young bank clerk named Fennis Wished to foster an aura of menace; To make people afraid @@ -24,12 +36,24 @@ Was caught and convicted of rape. From which, to his woe He couldn't get out with ESC. % +A limerick packs laughs anatomical +Into space that is quite economical. + But the good ones I've seen + So seldom are clean, +And the clean ones so seldom are comical. +% A linguist thought it a farce That memory space was so sparse. One day they increased it. Said he as he seized it: "At last! Enough core for the parse". % +A new dramatist of the absurd +Has a voice that will shortly be heard. + I learn from my spies + He's about to devise +An unprintable three-letter word. +% A progressive professor named Winners Held classes each evening for sinners. They were graded and spaced @@ -42,9 +66,95 @@ Found programming UNIX a hurdle Ran as slow as did he, And that's not saying much for the turtle. % +A wonderful bird is the pelican. +His mouth can hold more than his belican. + He can take in his beak + Enough food for a week. +And I'm darned if I know how the helican. +% +Despising machines to a man, +The Luddites joined up with the Klan, + And ride out by night + In a sheeting of white +To lynch all the robots they can. + -- C. M. and G. A. Maxson +% +Flappity, floppity, flip +The mouse on the m"obius strip; + The strip revolved, + The mouse dissolved +In a chronodimensional skip. +% +If you stick a stock of liquor in your locker, +It is slick to stick a lock upon your stock. + Or some joker who is slicker, + Will trick you of your liquor, +If you fail to lock your liquor with a lock. +% +Limericks are art forms complex, +Their topics run chiefly to sex. + They usually have virgins, + And masculine urgin's, +And other erotic effects. +% +System/3! System/3! +See how it runs! See how it runs! + Its monitor loses so totally! + It runs all its programs in RPG! + It's made by our favorite monopoly! +System/3! +% +There once was a girl named Irene +Who lived on distilled kerosene + But she started absorbin' + A new hydrocarbon +And since then has never benzene. +% +There once was a member of Mensa +Who was a most excellent fencer. + The sword that he used + Was his -- (line is refused, +And has now been removed by the censor). +% +There once was an old man from Esser, +Who's knowledge grew lesser and lesser. + It at last grew so small, + He knew nothing at all, +And now he's a College Professor. +% +There was a young lady from Hyde +Who ate a green apple and died. + While her lover lamented + The apple fermented +And made cider inside her inside. +% There was a young lady from Niger Who smiled as she rode on a tiger; They returned from the ride With the lady inside, And the smile on the face of the tiger. % +There was a young man who said "God, +I find it exceedingly odd, + That the willow oak tree + Continues to be, +When there's no one about in the Quad." + +"Dear Sir, your astonishment's odd, +For I'm always about in the Quad; + And that's why the tree, + Continues to be," +Signed "Yours faithfully, God." +% +There was a young poet named Dan, +Whose poetry never would scan. + When told this was so, + He said, "Yes, I know. +It's because I try to put every possible syllable into that last line that I can." +% +A computer called Illiac4 +Had a rather tough bug in its core. + It chewed up its cards + And spewed yards and yards +Of illegible tape on the floor. +% diff --git a/fortune/datfiles/limerick-o.real b/fortune/datfiles/limerick-o.real index 1798d23..5a6ef8e 100644 --- a/fortune/datfiles/limerick-o.real +++ b/fortune/datfiles/limerick-o.real @@ -1,3 +1,57 @@ +"For the tenth time, dull Daphnis," said Chloe, +"You have told me my bosom is snowy; + You have made much fine verse on + Each part of my person, +Now do something -- there's a good boy!" +% +"Fucked by the finger of Fate!" +Bewailed a young fellow named Tate. + "Since dating Miss Baugh, + My whole tongue has been raw-- +It must have been something I ate." +% +"I do love a lay every day, +So whenever you're coming this way + Just phone in advance + And I'll jerk off my pants, +And we're set for a sexy soiree!" +% +"Snyder's got a stiff ticket," said Kay, +"Come on, take it out, and let's play." + He pulled it on out, + But she started to pout, +His ticket was only a quarter-inch stout. +% +"The testes are cooler outside," +Said the doc to the curious bride, + "For the semen must no + Get too fucking hot, +And the bag fans your bum on the ride." +% +"Well, I took your advice, Doc", said Knopp, +"And told my wife to try it on top. + She bounced for an hour, + Till she ran out of power, +And the kids, who'd grown bored, made us stop." +% +'Tis a custom in Castellamare +To fuck in the back of a lorry. + The chassis and springs + Are like woodwinds and strings +In the midst of a musical soiree. +% +A CS student named Lin +Had a prick the size of a pin + It was no good for girls + But just great for squirrels +Who squealed with delight with it in. +% +A Frenchman who lived in Alsace +Had sex with a virgin named Grace. + When he popped her cherry, + She made things hairy +By bleeding all over his face. +% A bad little girl in Madrid, A most reprehensible kid, Told her Tante Louise @@ -5,6 +59,12 @@ A most reprehensible kid, And the worst of it was that it did! % A bather whose clothing was strewed +By breezes that left her quite nude, + Saw a man come along + And, unless I am wrong, +You expected this line to be lewd. +% +A bather whose clothing was strewed By breezes that left her quite nude, Saw a man come along And, unless I'm quite wrong, @@ -17,7 +77,7 @@ I am not I, I'm a tree." And covered his pants leg with pee. % A beautiful belle of Del Norte -Is reckoned disdainful and haughrty +Is reckoned disdainful and haughty Because during the day She says: "Boys, keep away!" But she fucks in the gloaming like forty. @@ -53,13 +113,7 @@ Was heard to confess in her cups: Was diddling a collie- But I got a nice price for the pups." % -A broken-down harlot named Tupps -Was heard to confess in her cups: - "The height of my folly - Was fucking a collie -- -But I got a nice price for the pups." -% -A burleyque dancer, a pip +A burlesque dancer, a pip Named Virginia, could peel in a zip; But she read science fiction And died of constriction @@ -134,6 +188,12 @@ Had a pussy as large as a muff. And some intimate glands, And was soft as a little duck's fluff. % +A clergical student named Simms +Hums liturgical tunes while he rims: + A nice piece of ass + Gets the B-Minor Mass ... +All the others get Anglican hymns. +% A clerical student named Pryne Through pain sought to reach the divine: He wore a hair shirt, @@ -145,13 +205,7 @@ A clever young man named Eugene Invented a jack-off machine. On the twenty-third stroke The fuckin' thing broke -And beat both his balls to a creame. -% -A clever young man named Eugene -Invented a jack-off machine. - On the twenty-third stroke - The goddam thing broke -And beat both his balls to a creame. +And beat both his balls to a cream. % A cocksucking steno named Beeman Remarked as she swallowed my semen : @@ -189,12 +243,6 @@ And had an affair with a Saracen. Or jealous or vexed, She just wanted to make a comparison. % -A CS student named Lin -Had a prick the size of a pin - It was no good for girls - But just great for squirrels -Who squealed with delight with it in. -% A cute little twerp from Samoa Had a cock of one inch and no moa. It was good for keyholes @@ -243,18 +291,6 @@ Got along with a sexy young sophomore. He stripped off his pants, But he found that the sophomore'd got off more. % -A doctoral student from Buckingham -Wrote his thesis on cunts and on fucking'em. - But a dropout from paree - Taught him Gamahuchee -- so he added a footnote on sucking 'em. -% -A doctoral student from Buckingham -Wrote his thesis on cunts and on fucking'em. - But a dropout from paree - Taught him Gamahuchee -So he added a footnote on sucking 'em. -% A do-it-yourselfer named Alice, Used a dynamite stick for a phallus. She blew her vagina @@ -267,6 +303,12 @@ Used two dynamite sticks for a dil. In South Carolina, And part of her ass in Brazil. % +A doctoral student from Buckingham +Wrote his thesis on cunts and on fucking'em. + But a dropout from paree + Taught him Gamahuchee +So he added a footnote on sucking 'em. +% A dolly in Dallas named Alice, Whose overworked sex is all callous, Wore the foreskin away @@ -315,12 +357,6 @@ Just didn't know what he was missin', And neglecting his cock, And using it merely for pissin'. % -A Frenchman who lived in Alsace -Had sex with a virgin named Grace. - When he popped her cherry, - She made things hairy -By bleeding all over his face. -% A frustrated lady named Alice Used a dynamite stick for a phallus. They found her vagina @@ -339,18 +375,6 @@ Scientifically played with himself, He labled it: son, And filed him away on a shelf. % -A geneticist living in Delft -Scientifically played with himself, - And when he was done - He labled it: son, -And filed him away on a shelf. -A gentleman, otherwise meek, -Detested with passion the leek; - When offered one out - He dealt such a clout -To the maid, she was down for a week. - -- Edward Gorey -% A gentleman, otherwise meek, Detested with passion the leek; When offered one out @@ -401,12 +425,6 @@ Was said to be great in the sack. Put girls in a coma And two gave them epileptic attacks. % -A graduate student named Zac -Was said to be great in the sack. - An inch of his boner - Put girls in a coma -And two gave them epileptic attacks. -% A greedy young lady from Sidney Liked it in up to her kidney, Till a man from Quebec @@ -438,12 +456,6 @@ Has taken a-hold of papa. And other odd mammals, And gives them a go at mama. % -A habit obscene and unsavory, -Holds a CS professor in slavery. - With maniacal howls, - He deflowers young owls, -That he keeps in an underground aviary. -% A hacker-turned-pervert named Fisk Made love to the drive of his disk. The thing circumsized him, @@ -487,12 +499,6 @@ Once had an affair with a ghost. The poor ectoplasm Cried, "Goodie, I feel it ... almost." % -A hearty young fellow named Yost -Once had an affair with a ghost. - At the height of the spasm - The poor ectoplasm -Cried, "Goodie, I feel it... almost." -% A hidebound young virgin named Carrie Would say, when the fellows got hairy : "Keep your prick in your pants @@ -535,12 +541,6 @@ Weaveth all night at her loom. When her lord and his wench Pull a chain in the neighbouring room. % -A lad, at his first copulation, -Cried, "What a sensation! Inflation, - Gyration, elation - Throughout the duration, -I guess I'll give up masturbation." -% A lad from far-off Transvaal Was lustful, but tactful withal. He'd say, just for luck, @@ -553,6 +553,12 @@ Had erogenous zones in his mind. By solving equations, (Of course, in the end, he went blind.) % +A lad, at his first copulation, +Cried, "What a sensation! Inflation, + Gyration, elation + Throughout the duration, +I guess I'll give up masturbation." +% A lady born under a curse Used to drive forth each day in a hearse; From the back she would wail @@ -598,18 +604,6 @@ To revise her existence misspent. Where she stayed through the following Lent. -- Edward Gorey % -A lady while dining at Crewe -Found an elephant's whang in her stew. - Said the waiter, "Don't shout, - And don't wave it about, -Or the others will all want one too." -% -A lady, while dining in Crewe, -Found an elephant's whang in her stew. - Said the waiter, "Don't shout - Or wave it about -Or the others will ask for one, too." -% A lady who signs herself "Vexed" Writes to say she believes she's been hexed: "I don't mind my shins @@ -623,6 +617,12 @@ Was famed for her area pubic. She replied in surprise, "Are you speaking of square feet, or cubic?" % +A lady, while dining in Crewe, +Found an elephant's whang in her stew. + Said the waiter, "Don't shout + Or wave it about +Or the others will ask for one, too." +% A lass at the foot of her class Asked a brainier chick how to pass. She replied, "With no fuss @@ -665,12 +665,6 @@ Once rode through the streets in the nude. Agnificent bottom" And slapped it as hard as they could. % -A lovely young maid from St. Jude -Once rode through the streets in the nude. - The police cried, "Whatam-- - Agnificent bottom" -And slapped it as hard as they cude. -% A lusty young maid from Seattle Got pleasure by sleeping with cattle; Till she found a bull @@ -735,7 +729,7 @@ A mathematician named Hall Has a hexahedronical ball, And the cube of its weight Times his pecker's, plus eight -Is his phone number -- give him a call... +Is his phone number -- give him a call. % A mathematician named Klein Thought the Mobius band was divine. @@ -779,18 +773,18 @@ Has a voice that will shortly be heard. He's about to devise An unprintable three-letter word. % -A newlywed couple from Goshen -Spent their honeymoon sailing the ocean. - In twenty-eight days - They got laid eighty ways -- -Imagine such fucking devotion! -% A newly-wed man of Peru Found himself in a terrible stew: His wife was in bed Much deader than dead, And so he had no one to screw. % +A newlywed couple from Goshen +Spent their honeymoon sailing the ocean. + In twenty-eight days + They got laid eighty ways -- +Imagine such fucking devotion! +% A notorious whore named Ms. Hearst, In the pleasures of men was well-versed. Reads the sign o'er the head @@ -816,12 +810,6 @@ Tied her infantine charge to a kite; And watched till it flew out of sight. -- Edward Gorey % -A pansy who lived in Khartoum -Took a lesbian up to his room. - They argued all night - Over who had the right -To do what, with which, and to whom. -% A passionate red-haired girl When you kissed her, her senses would whirl, And her twat would get wet, @@ -901,18 +889,6 @@ Once sat herself down on a molehill. Ms. Vogel's ok, but the mole's ill. % A pretty young lady named Vogel -Once sat herself down on a molehill. - A curious mole - Nosed into her hole -- -Ms. Vogel's okay, but the mole's ill. -% -A pretty young lady named Vogel -Once sat herself down on a molehill. - A curious mole - Nosed into her hole- -Ms. Vogel's ok, but the mole's ill. -% -A pretty young lady named Vogel Once sat herself down on a molehill. A curious mole Nosed into her hole -- @@ -936,12 +912,11 @@ Made her home on a purple pagoda. Of her halls with the balls And the tools of the fools who be-stroda'. % -A programmer down in Moline -Said, I'm the match for any machine. - My secret's aversion, - To loops and recursion, -Just acres of in-line routine. - -- W.J. Wilson +A progressive professor named Winners +Held classes each evening for sinners. + They were graded and spaced + So the vile and debased +Would not be held back by beginners. % A rapist who reeked of cheap booze Attempted to ravish Miss Hughes. @@ -961,18 +936,18 @@ Had no qualms about taking a chance, To get screwed in the nude, So she always went home with damp pants. % -A remarkable race are the Persians; -They have such peculiar diversions. - They make love the whole day - In the usual way -And save up the nights for perversions. -% A remarkable race are the Persians, They have such peculiar diversions. They screw the whole day In the regular way, And save up the nights for perversions. % +A remarkable race are the Persians; +They have such peculiar diversions. + They make love the whole day + In the usual way +And save up the nights for perversions. +% A responsive young girl from the East In bed was an able artiste. She had learned two positions @@ -1099,12 +1074,6 @@ Went down on her beau in the garden. Don't swallow that mess " And she replied, "Ulp, beg your pardon?" % -A sweetheart named Teresa Arden -Went down on her beau in the garden. - He said, "Good lord, Tess, - Don't swallow that mess!" -And she replied, "Ulp, beg your pardon?" -% A systems programmer named Sprotic Found his software intensely erotic. In jealous distress @@ -1166,11 +1135,11 @@ Was worn out from her toes to her dome. But she said, "Nothing doing; One of you has to go home!" % -A trapper named Francois Lefebrve -Once captured and buggered a beabrve. +A trapper named Francois Lefevre +Once captured and buggered a beaver. The result of this fuck Was a three titted duck, -A canoe, and an Irish retriebrve. +A canoe, and an Irish retriever. % A tutor who tooted a flute Tried to tutor two tutors to toot @@ -1203,13 +1172,6 @@ She used it for many a bunt. It took twenty-two men and a big Stillson wrench, To get the thing out of her cunt. % -A water pipe suited miss Hunt; -She used it for many a bunt. - But the unlucky wench - Got it caught in her trench --- -It took twenty-two men and a big Stillson wrench, -To get the thing out of her cunt. -% A weary old lecher named Blott Took a luscious young blond to his yacht. Too lazy to rape her, @@ -1234,24 +1196,18 @@ Had a hole as big as a basket. In it now, you could hide, And include with your luggage your mascot. % +A widow who fancied a man some +Was diddled three times in a hansome. + When she clamored for more + Her young man became sore +And exclaimed "My name's Simpson not Samson." +% A widow whose singular vice Was to keep her late husband on ice Said, "It's been hard since I lost him -- I'll never defrost him! Cold comfort, but cheap at the price." % -A wonderful bird is the pelican. -His mouth can hold more than his belican. - He can take in his beak - Enough food for a week. -And I'm darned if I know how the helican. -% -A wonderful bird is the pelican. -His mouth can hold more than his belican. - He can take in his beak - Enough food for a week. -I'm darned if I know how the helican. -% A wonderful tribe are the Sweenies, Renowned for the length of their peenies. The hair on their balls @@ -1271,17 +1227,17 @@ Her daily his wife's plaintive prayer: Between these lips covered with hair." % A worried young man from Stamboul -Discovered red spots on his tool. - Said the doctor, a cynic, - "Get out of my clinic -Just wipe off the lipstick, you fool." -% -A worried young man from Stamboul Founds lots of red spots on his tool. Said the doctor, a cynic, "Get out of my clinic; Just wipe off the lipstick, you fool!" % +A young Juliet of St. Louis +On a balcony stood acting screwy. + Her Romeo climbed, + But he wasn't well timed, +And half-way up, off he went -- blooey! +% A young bride and groom of Australia Remarked as they joined genitalia : "Though the system seems odd, @@ -1294,12 +1250,6 @@ That although of penis devoid, By eating a foetus, And his parents were quite overjoyed. % -A young Juliet of St. Louis -On a balcony stood acting screwy. - Her Romeo climbed, - But he wasn't well timed, -And half-way up, off he went -- blooey! -% A young lad named Lester McGraw Caught a stranger on top of his Maw. As he watched him stick her @@ -1356,6 +1306,12 @@ Was so big that there weren't any bigger. Was so heavy it could Scarcely lift up its head. It lacked vigor. % +A young man of Llanfairpwllgwyngyll +While bent over plucking a dingle + Had the whole of Eisteddfod + Taking turns at his pod +While they sang some impossible jingle. +% A young man of acumen and daring, Who'd amassed a great fortune in herring, Was left quite alone @@ -1363,12 +1319,6 @@ Who'd amassed a great fortune in herring, That their use at his board was unsparing. -- Edward Gorey % -A young man of Llanfairpwllgwyngyll -While bent over plucking a dingle - Had the whole of Eisteddfod - Taking turns at his pod -While they sang some impossible jingle. -% A young man with passions quite gingery Tore a hole in his sister's best lingerie. He slapped her behind @@ -1405,6 +1355,24 @@ Her mother she kissed her and blessed her. He's a stunning good fuck, For I've had him myself down in Leicester." % +Aboard the good ship Venus, The cabin boy, the captain's joy, +The mast it was a penis, A cunning little nipper, + Her figurehead They filled his ass, + A whore in bed, With broken glass, +Good grief you should have seen us! And circumcised the skipper. + +The first mate's name was Higgins, The captain's daughter Mabel, +And Higgins was a biggins, They screwed when they were able, + Once round the deck, They nailed her tits, + Twice up the mast, Those nasty shits, +And the rest was used for riggins'! Right to the captain's table. + +The engineer's name was Carter, The second mate's name was Andy, +And Carter was a farter, By God, he was a dandy, + When the wind wouldn't blow, They broke his cock, + And the ship couldn't go, With chunks of rock, +Carter the farter would start her! For conking in the brandy! +% According to experts, the oyster In its shell - a crustacean cloister - May frequently be @@ -1423,6 +1391,31 @@ For his dong was unspeakably long. Quaffed his yard and a half, And ecstatically burst into song. % +An AI researcher named Bluth +Wrote, to find out the sexual truth, + Eroticon VI, + Which he taught certain tricks +Which I'm sure can't be found in Knuth. +% +An ARPAnaut name of Corvette +Had a fetish involving the net. + As he fondled his IMP + His cock went from limp +To as hard as concrete which has set. +% +An Argentine gaucho named Bruno +Who said, "Fucking is one thing I do know. + Women are fine + And sheep are divine +But llamas are numero uno." +% +An Edwardian father named Udgeon, +Whose offspring provoked him to dudgeon, + Used on Saturday nights + To turn down the lights, +And chase them around with a bludgeon. + -- Edward Gorey +% An aesthete from South Carolina Had a cock that tickled like China, But while shooting his load @@ -1435,12 +1428,6 @@ Likes to jack off the young men she loves. If the fellows insist But she really prefers to wear gloves. % -An AI researcher named Bluth -Wrote, to find out the sexual truth, - Eroticon VI, - Which he taught certain tricks -Which I'm sure can't be found in Knuth. -% An amazon giantess named Dunne Let a midget screw her for fun. But the poor little runt @@ -1453,6 +1440,13 @@ Once dreamed she was raped in a chariot A monk and three tailors, Mohammed and Judas Iscariot. % +An angst-ridden amorist, Fred, +Saw sartorial changes ahead. + His mind kept on ringing + With fishy girls singing; +Soft fruit also filled him with dread. + -- J. Walker, "The Love Song Of J. Alfred Prufrock" +% An anonymous woman we knew Was dozing one day in her pew; When the preacher yelled "Sin!" @@ -1462,33 +1456,15 @@ As soon as the service is through." An architect fellow named Yoric Could, when feeling euphoric, Display for selection - Three kinds of erection- + Three kinds of erection -- Corinthian, ionic, and doric. % -An architect fellow named Yoric -Could, when feeling euphoric, - Display for selection - Three kinds of erection- -Corinthian,ionic,and doric. -% An ardent young man named Magruder Once wooed a girl nude in Bermuda. She thought it quite lewd To be wooed in the nude, But magruder was shrewder, he screwed her. % -An Argentine gaucho named Bruno -Who said, "Fucking is one thing I do know. - Women are fine - And sheep are divine -But llamas are numero uno." -% -An ARPAnaut name of Corvette -Had a fetish involving the net. - As he fondled his IMP - His cock went from limp -To as hard as concrete which has set. -% An arrogant wench from Salt Lake Liked to tease all the boys on the make. She was finally the prize @@ -1501,12 +1477,6 @@ Once painted his ass like a Dahlia. The colour - devine, The scent - ah, that was a failia. % -An artist who lived in Australia -Once painted his ass like a Dahlia. - The drawing was fine, - The colour - divine, -The scent - ah, that was a failia. -% An eager young hacker named Gus Once buggered a VAX Unibus. The hardware went bad, @@ -1519,13 +1489,6 @@ Once buggered a VAX Unibus. But not the young lad He didn't expect all that fuss! % -An Edwardian father named Udgeon, -Whose offspring provoked him to dudgeon, - Used on Saturday nights - To turn down the lights, -And chase them around with a bludgeon. - -- Edward Gorey -% An envious girl named McMeanus Was jealous of her lover's big penis. It was small consolation @@ -1650,6 +1613,12 @@ Said, "Darling, that's not the right place!" And did on her back, What he couldn't have done face to face. % +And let me the canakin clink, clink; +and let me the canakin clink. + A soldier's a man; + O, man's life's but a span, +Why then, let a soldier drink. +% And then there's the story that's fraught With disaster -- of balls that got caught, When a chap took a crap @@ -1688,6 +1657,12 @@ Asked a supplicant priest of the pontiff, In the eastertide sun?" His holiness murmured, "Gut yontiff." % +At Vassar, sex isn't injurious, +Though of love we are never penurious. + Thanks to vulcanized aids, + Though we may die old maids, +At least we shall never die curious. +% At a contest for farting in Butte One lady's exertion was cute : It won the diploma @@ -1700,6 +1675,13 @@ Showed an absolute absence of etiquette Through the skirt of her dress And wiping the mess with her petticoat. % +At the Villa Nemetia the sleepers +Are disturbed by a phantom in weepers; + It beats all night long + A dirge on a gong +As it staggers about in the creepers. + -- Edward Gorey +% At the end of all civilization Is the planet Terminus's location. There's a girl there whose feat, @@ -1712,19 +1694,6 @@ A sailor was fucking a whore. `Long and hard' ain't no joke; This means months 'til I get back ashore." % -At the Villa Nemetia the sleepers -Are disturbed by a phantom in weepers; - It beats all night long - A dirge on a gong -As it staggers about in the creepers. - -- Edward Gorey -% -At Vassar, sex isn't injurious, -Though of love we are never penurious. - Thanks to vulcanized aids, - Though we may die old maids, -At least we shall never die curious. -% At whist drives and strawberry teas Fan would giggle and show off her knees; But when she was alone @@ -1732,13 +1701,6 @@ Fan would giggle and show off her knees; And weep from a sense of unease. -- Edward Gorey % -Augustus, for slpashing his soup, -Was put for the night on the stoop; - In the morning he'd not - Repented a jot, -And next day he was dead of the croup. - -- Edward Gorey -% Augustus, for splashing his soup, Was put for the night on the stoop; In the morning he'd not @@ -1752,6 +1714,48 @@ The grass served as mattress for madam, On the sex that today They would bounce on box springs, if they had 'em. % +Coitus upon a cadaver +Is the ultimate way you can have 'er. + Her inanimate state + Means a man needn't wait, +And eliminates all the palaver. +% +Cried Miss Pratt : "What are you staring at? +I know - you don't have to say that! + All you guys want of me + Is a poke where I pee, +And it's pounding my ass mighty flat!" +% +Cum Hilde autem ambulabat +Homo qui aedificabat. + Dixit volebat. Debet et potebat. + Sic ille ducebat. Statim faciebat. +Sed virginem pine necebat. +% +Dame Catherine of Ashton-on-Lynches +Got on with her grooms and her wenches: + She went down on the gents, + And pronged the girl's vents +With a clitoris reaching six inches. +% +De Hispanice puella verumque +Simplex oris verborumque + Tulit potens vagina + Hominum agmina +Iterum iterum iterumque. +% +Did you hear about young Henry Lockett? +He was blown down the street by a rocket. + The force of the blast + Blew his balls up his ass, +And his pecker was found in his pocket. +% +DuPont, I.G., Monsanto, and Shell +Built a world-circling pussy cartel, + And by planned obsolescence, + So controlled detumescence, +A poor man could not get a smell. +% Each Friday his engines abort, But Scotty is never caught short. He fills his machines @@ -1765,18 +1769,41 @@ When he sits on the foot of my bed; But for the seventeen years he's been dead. -- Edward Gorey % -Each night Father fills me with dread -When he sits on the foot ofmy bed; - I'd not mind that he speaks - In gibbers and squeaks, -But for the seventeen years he's been dead. - -- Edward Gorey +Es giebt ein Arbeiter von Tinz, +Er schlaft mit ein Madel von Linz. + Sie sagt, "Halt sein' plummen, + Ich hore Mann kommen." +"Jacht, jacht," sagt der Plummer, "Ich binz." % -From deep in the crypt at St. Giles -Came a bellow that echoed for miles. - Said the rector, "My gracious, - Has Father Ignatius -Forgotten the Bishop has piles!?" +Ethnologists up with the Sioux +Wired home for two punts, one canoe. + The answer next day, + Said, "Girls on the way, +But what the hell's a `panoe'?" +% +Exuberant Sue from Anjou +Found that fucking affected her hue. + She presented to sight + Nipples pink, bottom white; +But her asshole was purple and blue. +% +Flappity, floppity, flip +The mouse on the Mobius strip; + The strip revolved, + The mouse dissolved +In a chronodimensional skip. +% +Fond of equestrians, Mabel +Looked for true love in the stable. + But she found the studs, + For her were all duds, +Now she's out with the leg of a table. +% +For the sores on his prick he used Dial. +That failed; he gave Lava a trial. + But the one remedy + For contagious V.D. +Is the wonder drug sulfa-denial. % From Number Nine, Penwiper Mews, There is really abominable news; @@ -1785,6 +1812,12 @@ There is really abominable news; But nobody seems to know whose. -- Edward Gorey % +From deep in the crypt at St. Giles +Came a bellow that echoed for miles. + Said the rector, "My gracious, + Has Father Ignatius +Forgotten the Bishop has piles!?" +% From the bathing machine came a din As of jollification within; It was heard far and wide, @@ -1792,17 +1825,229 @@ As of jollification within; Had a definite flavour of gin. -- Edward Gorey % -"Fucked by the finger of Fate!" -Bewailed a young fellow named Tate. - "Since dating Miss Baugh, - My whole tongue has been raw-- -It must have been something I ate." +Fucking is a filthy deed. -- I like it. +It satisfies a normal need. -- I like it. + It makes you sick, it makes you well, + It turns your spine to fucking jell, +It damns your soul to Eternal Hell! -- I like it. % -In the case of a lady named Frost, -Whose cunt's a good two feet acrost, - It's the best part of valor - To bugger the gal, or -You're apt to fall in and get lost. +God's plan had a great beginning, +But man spoiled his chances by sinning + We trust that the story + Will end in God's glory +But at present the other side's winning. +% +God's plan made a hopeful beginning +But man spoiled his chances by sinning. + We trust that the story + Will end in God's glory +But at present, the other side's winning. +% +Have you heard about Magda Lupescu, +Who came to Rumania's rescue? + It's a wonderful thing + To be under a king-- +Is democracy better, I esk you? +% +Have you heard of knock-kneed Samuel McGuzzum +Who married Samantha, his bow-legged cousin? + Some people say, + Love finds a way, +But for Sam and Samantha it doesn'. +% +Have you heard of the lady named Cox +Who had a capacious old box? + When her lover was in place + She said, "Please turn your face. +I look like a gal, but I screw like a fox." +% +Have you heard of those trollops of Birmingham +And the scandal that's currently concerning'em? + How they lift the frock + And tickle the cock +Of the bishop while he was confirming 'em? +% +He hated to mend, so young Ned +Called in a cute neighbor instead. + Her husband said, "Vi, + When you stitched his torn fly, +Did you have to bite off the thread?" +% +He hated to mend, so young Ned +Called in a cute neighbor instead. + Her husband said, "Vi, + When you stitched up his torn fly, +Did you have to bite off the thread?" +% +He played smooch and stinkfinger with Daisy +Till this virgin was gotch-eyed and hazy. + Then his gargantuan pole in + Her pink, tight, and swollen +Young cunt just about drove her crazy. +% +Her brother, a bastard named Ben, +Could rotate his pecker, and then + He would shoot through his rear + Which made him dear +Of the girls, and the envy of men. +% +Her daughter, thought worried Ms. Coffin, +Had morals the city might soften. + So she phoned and asked, "Lynn, + Are you living in sin?" +Lynn said, "No -- but I visit there often." +% +His shy bride admitted to Crandall +That for years she'd worked off with a candle, + But a cock like his dick + Gave her ten times the kick, +Though it stained her wee peehole to handle! +% +I dined with Lord Hughing Fitz-Bluing +Who said, "Do you squirm when you're screwing?" + I replied, "Simple shagging + Without any wagging +Is only for screwing canoeing." +% +I met a young man in Chungking +Who had a very long thing -- + But you'll guess my surprise + When I found that its size +Just measured a third-finger ring! +% +I never had Miss Defauw, +But it wouldn't have been quite so raw + If she'd only said "No" + When I wanted her so; +But she didn't -- she laughed and said "Naw!" +% +I once had the wife of a Dean +Seven times while the Dean was out skiin'. + She remarked with some gaiety, + "Not bad for the laiety, +Though the Bishop once managed thirteen." +% +I once met a lassie named Ruth +In a long distance telephone booth. + Now I know the perfection + Of an ideal connection +Even if somewhat uncouth. +% +I once was annoyed by a queer +Who made his intentions quite clear. + Said I, "I'm no prude, + So don't think me rude, +But I'm already stewed, screwed, and tattooed." +% +I wish that my room had a floor; +I don't so much care for a door, + But this walking around + Without touching the ground +Is getting to be quite a bore! + -- Gelett Burgess +% +I wonder what my wife will want tonight; +Wonder if the wife will fuss and fight? + I wonder can she tell + That I've been raising hell; +Wonder if she'll know that I've been tight? + +My wife is just as nice as can be, +I hope she doesn't feel too nice toward me. + For an afternoon of joy, + Is hell on the old boy, +I wonder what the wife will want tonight! +% +I wooed a stewed nude in Bermuda, +I was lewd, but my God! she was lewder. + She said it was crude + To be wooed in the nude-- +I pursued her, subdued her, and screwed her! +% +I would like to say, Mister Bunce, +I'm a great connoisseur of hot cunts. + And in all my lewd life + I've met none like your wife, +So why leave her to me, you big dunce? +% +I'd rather have fingers than toes, +I'd rather have ears than a nose, + And a happy erection + Brought just to perfection +Makes me terribly sad when it goes. +% +If continence causes neurosis +And intercourse causes thrombosis + I'd rather expire + Fulfilling desire +Than live in a state of psychosis. +% +If you're speaking of actions immoral +The how about giving the laurel + To doughty Queen Esther, + No three men could best her -- +One fore, and one aft, and one oral. +% +If your thesis is utterly vacuous, +Employ first-order predicate calculus. + With sufficient formality, + The sheerest banality, +Will be hailed by all as miraculous! +% +Il y a une jeune fille amoureuse +D'un homme qu'a une conduite honteuse; + Il la mene chaque soir + A son caveau noir +Et la bat avec plaintes crapuleuses. + -- Edward Gorey +% +Il y avait un jeune homme de dijon, +Qui n'avait que peu de religion. + Il dit:"quant a' moi, + Je deteste tous les trois, +Le pere, et le fils, et le pigeon-" +% +Il y avait un plombier, Francois, +Qui plombait sa femme dans le Bois. + Dit-elle, "Arretez! + J'entends quelqu'un venait." +Dit le plombier, en plombant, "C'est moi." +% +Il y avait une madame de Lahore +Dont la figure n'etait la meilleure, + Mais la vagine tres forte, + Toujours ouverte la porte, +Encore, et encore, et encore. +% +In Duluth there's a hostess, forsooth, +Who doesn't know gin from vermouth, + But this lubricant lapse + Isn't noticed, perhaps +Because nobody does in Duluth. +% +In my sweet little Alice Blue gown +Was the first time I ever laid down, + I was both proud and shy + As he opened his fly +And the moment I saw it I thought I would die. + +Oh it hung almost down to the ground, +As it went in I made not a sound, + The more that he shoved it + The more that I loved it, +As he came on my Alice Blue gown. +% +In my sweet little night gown of blue, +On the first night that I slept with you, + I was both shy and scared + As the bed was prepared, +And you played peekaboo with my ribbons of blue. + +As we both watched the break of day, +And in peaceful submission I lay, + You said you adored it + But dammit, you tore it, +My sweet little night gown of blue. % In the Garden of Eden lay Adam, Complacently stroking his madam, @@ -1810,11 +2055,17 @@ Complacently stroking his madam, For on all of the earth There were only two balls -- and he had 'em. % -In the garden of Eden lay Adam, -Complacently stroking his madam - And loud was his mirth - For on all of the earth -There were only two balls and he had'em. +In the Garden of Eden sat Adam, +Massaging the bust of his madam, + He chuckled with mirth, + For he knew that on earth, +There were only two boobs and he had 'em. +% +In the case of a lady named Frost, +Whose cunt's a good two feet acrost, + It's the best part of valor + To bugger the gal, or +You're apt to fall in and get lost. % In the little French town of Le'Beau, Lived a maiden exceedingly droll. @@ -1834,6 +2085,488 @@ Flagged her down and asked, "Give me a lift?" She fondled him gently, And the lift that he'd asked for was swift! % +It takes little strain and no art +To bang out an echoing fart. + The reaction is hearty + When you fart at a party, +But the sensitive persons depart. +% +Love letters no longer they write us, +To their homes they so seldom invite us. + It grieves me to say, + They have learned with dismay, +We can't cure their `vulva pruritus'. +% +Marlene wanted Joy to relent, +She said, "AIDS is so hard to prevent. + If you want to get laid, + Then we'll have to tribade!" +(But Joy didn't know what she meant.) +% +McCoy's a seducer galore, +And of virgins he has quite a score. + He tells them, "My dear, + You're the Final Frontier, +Where man never has gone before." +% +Mrs. Kelly is partial to cocks; +Mr. Kelly likes rye on the rocks. + When he's under the weather + They can't get together, +So others get into her box. +% +My jaw aches, my pussy is sore. +I simply can't fuck any more; + I'm covered with sweat, + And you haven't come yet, +And my God, it's a quarter to four! + -- The Gray-haired Woman's Complaint +% +Oden the bardling averred +His muse was the bum of a bird, + And his Lesbian wife + Would finger his fife +While Fisherwood waited as third. +% +Of his face she thought not very much, +But then, at the very first touch, + Her attitude shifted -- + He was terribly gifted +At frigging and fucking and such. +% +Oh pity the prince, Montezuma +He tried to make love to a puma. + Seems the puma, in play, + Tore his testes away -- +An example of animal huma. +% +Oh, pity the Duchess of Kent! +Her cunt is so dreadfully bent, + The poor wench doth stammer, + "I need a sledgehammer +To pound a man into my vent." +% +On a cannibal isle near Malaysia +Lives a lady they call Anastasia. + Not russian elite- + She's eager to eat +Whatever or whoever lays her. +% +On a ship wrecked far out at sea, +The girl said, "I can't seem to pee." + "Aha!" said the mate, + "That settles the fate +Of the captain, the pilot, and me." +% +On day a Monterey daughter +Did scuba down under the water. + She later turned up + The mom of a pup, +And they say t'was a otter that gotter. +% +On the breasts of a harlot from Yale +Was tattooed the price of her tail + And on her behind, + For the sake of the blind, +Was the same information in Braille. +% +On the porch of a dude named Horatio, +His girl got a yen for fellatio. + As she sucked on his dingus + He tried cunnilingus +But the cops ran 'em off of that patio. +% +Once a young gay from Khartoum +Took a lesbian up to his room. + They argued all night + Over who had the right +To do what, and with which, and to whom. +% +Once was a hooker named Gail, +Busted and sent-off to jail, + She liked the jailer, + He wanted to nail her, +So Gail made bail with her tail. +% +One evening a guru had coitus +With an actress, a whore and a poetess. + When asked what position + He used for coition, +He answered serenely, "the loetus." +% +One evening a guru had coitus +With an actress, a whore and a poetess. + When asked what position + He used for coition, +He answered serenely, "the lotus." +% +One night a girl had an affair +With a fellow all covered with hair. + His enormous red whang + Gave her a wonderful bang -- +She'd been diddled by Smokey the bear. +% +One night a girl had an affair +With a fellow all covered with hair. + Then she picked up his hat + And realized that +She'd been had by Smokey the Bear. +% +Our staff proctologist, Dr. Barr, +Has invented a new kind of car. + With a tank full of shit + There's no stopping it -- +For short trips, two poots take you far. +% +Poor Alice who lived in Corvallis +Had heard of, but not seen, the male phallus. + At her first sight of one + She started to run, +And last was seen sprinting through Dallas. +% +Pour guerir un acces de fievre +Un jeune homme poursuivit un lievre; + Il le prit a son trou, + Et fit faire un ragout +Des entrailles et des pattes au genievre. + -- Edward Gorey +% +Said Einstein, "I have an equation +Which to some may seem Rabelaisian: + Let V be virginity + Approaching infinity; +Let P be a constant persuasion; + +"Let V over P be inverted +With the square root of Mu inserted + N times into V ... + The result, Q.E.D., +Is a relative!" Einstein asserted. +% +Said Einstein, "I have an equation +Which to some may seem rabelaisian: + Let _V be virginity + Approaching infinity; +Let _P be a constant persuasion; + +"Let _V over _P be inverted +With the square root of _M_u inserted + _N times into _V ... + The result, Q.E.D., +Is a relative!" Einstein asserted. +% +Said Francesca, "My lack of volition +Is leading me straight to perdition; + But I haven't the strength + To go to the length +Of making an act of contrition." + -- Edward Gorey +% +Said President Jobcock one day : +"War's better than love, I should say. + Instead of a virgin, + It's murder I'm urgin'-- +You get lots more blood that-a-way." +% +Said a dainty young whore named Ms. Meggs, +"The men like to spread my two legs, + Then slip in between, + If you know what I mean, +And leave me the white of their eggs." +% +Said a decadent wench of Bombay : +"This has been a most wonderful day. + Three cherry tarts, + At least twenty farts, +Two shits, and a bloody fine lay." +% +Said a girl who upon her divan +Was attacked by a virile young man: + "Such excess of passion + Is quite out of fashion" +And she fractured his wrist with her fan. + -- Edward Gorey +% +Said a happy young man of Fort Drum : +"What care I for this shortage of gum? + My favorite chew + Is a condom or two, +With a goodly amount of fresh come." +% +Said a horny young girl from Milpitas, +"My favorite sport is coitus." + But a fullback from State, + Made her period late, +And now she has athlete's fetus. +% +Said a lecherous fellow named Shea, +When his prick wouldn't rise for a lay, + "You must seize it, and squeeze it, + And tease it, and please it, +For Rome wasn't built in a day." +% +Said a lesbian lady, "It's sad; +Of all the girls that I've had, + None gave me the thrill + Of real rapture until +I learned how to be a tribade." +% +Said a madam named Mamie La Farge +To a sailor just off of a barge, + "We have one girl that's dead, + With a hole in her head-- +Of course there's a slight extra charge." +% +Said a modest young miss to de Sade, +I'm simply too shy and afraid + To take part in your pranks. + But to show you my thanks, +I'd just love to become your first aide. +% +Said a pornographistic young poet +"Although I perhaps do not show it, + My interest in sin + Is wearing quite thin, +And I'll soon tell those fuckers to stow it." +% +Said a swinging young chick named Lyth +Whose virtue was largely a myth, + "Try as hard as I can, + I can't find a man +That it's fun to be virtuous with." +% +Said crew girl Angelica Bauer : +"The captain's withdrawn, cold, and sour." + Uhura said, "No, + At night that's not so-- +He doesn't withdraw for an hour." +% +Said sneering Mohammed el-Din : +"Only infidel dogs put it in. + Back home in Arabia + We nibble the labia +Till the juice dribbles off of our chin." +% +Said the Duchess of Danzer at tea, +"Young man, do you fart when you pee?" + I replied with some wit, + "Do you belch when you shit?" +I think that was one up for me. +% +Said the cunt-lapping Bey of Algiers, +In a cunt halfway up to his ears : + "This nautch is delicious, + And without doubt nutritious. +She's my best-tasting wife in ten years!" +% +Said the nun as the bishop withdrew, +"This must be our final adieu, + For the vicar is slicker, + And thicker, and quicker, +And two inches longer than you." +% +Saint Peter was once heard to boast +That he'd had all the heavenly host : + The Father and Son, + And then - just for fun - +The hole in the Holy Ghost. +% +Says an airlining wanton named Vi: +"I'm a pantyless stew when I fly. + To a muffer's delight, + I'll take head on a flight, +So the guy can have pie in the sky." +% +She begged and she pleaded for more. +I said, "We've already had four, + And I'm sure that you've heard, + Though it's somewhat absurd, +That eros spelt backwards is sore." +% +She made a thing of soft leather, +And topped off the end with a feather. + When she poked it inside her + She took off like a glider, +And gave up her lover forever. +% +She stood there and peeled off her clothes, +And begged for a bang : goodness knows + I am surely impure + And I sizzled to scrure, +But the push had gone out of my hose. +% +She was coming round the mountain doin' ninety, +When the chain on her motorcycle broke, + Now she's lying in the grass, + With the muffler up her ass, +And her tits a-playin' Dixie on the spokes. +% +She was peeved, and called her beau "Mr." +Not because, when she came in, he kr., + But she knew, just before + She opened the door, +This same Mr. had kr. sr. +% +She wasn't what one could call pretty +And other girls offered her pity, + So nobody guessed + That her Wasserman test +Involved half the men in the city. +% +Sighed a neat little package named Annie : +"I've the tits and the twat and the fanny, + Plus the yen, but the men + Only call now and then-- +Can it be I've B.O. in my cranny?" +% +So here was this fellow of Strensall +Whose pecker was shaped like a pencil, + Anemic, 'tis true, + But an interesting screw, +Inasmuch as the tip was prehensile. +% +Thank God for the Duchess of Gloucester, +She obliges all who accost her. + She welcomes the prick + Of Tom, Harry or Dick, +Or Baldwin, or even Lord Astor. +% +That Harvard don down at El Djim -- +Oh, wasn't it nasty of him, + With the whole harem randy, + The sheik himself handy, +To muss up a young camel's quim. +% +That naughty old Sappho of Greece +Said: "What I prefer to a piece + Is to have my pudenda + Rubbed hard by the enda +The little pink nose of my niece." +% +The Dowager Duchess of Spout +Collapsed at the height of a rout; + She found strength to say + As they bore her away: +"I should never have taken the trout." + -- Edward Gorey +% +The Enterprise crew when off work +Will fuck like an Ottoman Turk. + Uhura the Zulu + Is shacked up with Sulu, +And Spock shares a crew girl with Kirk. +% +The Enterprise girls, so one hears, +Have chased Spock for several years. + His look of disdain + Has spared them great pain, +For his prick is as sharp as his ears. +% +The Grecians were famed for fine art, +And buildings and stonework so smart. + They distinguished with poise + The men from the boys, +And used crowbars to keep them apart. +% +The King named Oedipus Rex +Who started this fuss about sex + Put the world to great pains + By the spots and the stains +Which he made on his mother's pubex. +% +The King plugged the Queen's ass with mustard +To make her fuck hot, but got flustered, + And cried, "Oh, my dear, + I am coming, I fear, +But the mustard will make you come `plus tard'." +% +The Reverend Henry Ward Beecher +Called a girl a most elegant creature. + So she laid on her back + And, exposing her crack, +Said, "Fuck that, you old Sunday School Teacher!" +% +The Reverend Henry Ward Beecher +Called a hen a most elegant creature. + The hen, pleased with that, + Laid an egg in his hat -- +And thus did the hen reward Beecher. + -- Oliver Wendell Holmes +% +The Shah of the Empire of Persia +Lay for days in a sexual merger. + When the nautch asked the Shah, + "Won't you ever withdraw?" +He replied with a yawn, "It's inertia." +% +The Sultan was peeved with his harem, +And cooked up a scheme for to scare'em. + He caught a big mouse + Which he loosed in the house. +(Such confusion is called harem-scarem). +% +The acrobats - Tom and Louise- +Do an act in the nude on their knees. + They crawl down the aisle + While screwing dog-style, +As the orchestra plays Kilmer's "Trees." +% +The babe, with a cry brief and dismal, +Fell into the water baptismal; + Ere they'd gathered its plight, + It had sunk out of sight, +For the depth of the font was abysmal. + -- Edward Gorey +% +The bedsprings next door jounce and creak : +They have kept me awake for a week. + Why do newlyweds + Select squeaky beds +To develop their fucking technique? +% +The bishop of Alexandretta +Loved a girl and he couldn't forget her. + So he thought he'd enshrine her + As the Holy Vagina +In the Church of the Sacred French Letter. +% +The bustard's a remarkable fowl +With surely no reason to growl + He escapes what would be + Illegitimacy +By the grace of a fortunate vowel. +% +The cruelest of creatures' the crab +With claws that can pinch you or stab, + And then when you dine + On crab and white wine +It gets you as well with the tab. +% +The fearless old bishop of Brest +Put his faith in the Lord to the test. + He fucked whores in the apse + With chancres and claps, +But first they were sprinkled and blessed. +% +The first child of a Mrs. Keats-Shelley +Came to light with its face in its belly; + Her second was born + With a hump and a horn, +And her third was as shapeless as jelly. + -- Edward Gorey +% +The genital area of Ann +Will accommodate any size man, + From the wee that cause titters + To the mighty twat-splitters +That cause screams peasants hear in Japan. +% +The kings of Peru were the Incas, +Who were known far and wide as great drincas. + They worshipped the sun + And had lots of fun, +But the peasants all thought they were stincas. +% The late Brigham Young was no neuter -- No faggot, no fairy, no fruiter. Where ten thousand virgins @@ -1846,12 +2579,6 @@ State that apes there have pricks thick as rope, From the top of one tree To the top of the next -- what a scope! % -The limerick, a verse form iniquitous, -Has nonetheless been ubiquitous. - Once Congress in session, - Declared its suppression, -But people got around that by writing the last line with no rhyme or meter. -% The limerick is furtive and mean; You must keep her in close quarantine, Or she sneaks to the slums @@ -1859,12 +2586,47 @@ You must keep her in close quarantine, Disorderly, drunk, and obscene. -- Morris Bishop % -The limerick is furtive and mean; -You must keep her in close quarantine, - Or she sneaks to the slums - And promptly becomes -Disorderly, drunk, and obscene. - -- Morris Bishop +The limerick, a verse form iniquitous, +Has nonetheless been ubiquitous. + Once Congress in session, + Declared its suppression, +But people got around that by writing the last line with no rhyme or meter. +% +The moyel who treated young Alec +Was cross-eyed and hydrocephalic. + Presented the child + His aim was so wild +He rendered the poor boy biphallic. +% +The new cinematic emporium +Is not just a super-sensorium, + But a highly effectual + Heterosexual +Mutual masturbatorium. +% +The new local cinematorium +Is not only a super sensorium, + But a highly effectual + Heterosexual +Mutual masturbatorium. +% +The nipples of Sarah Sarong +When excited are twelve inches long + This embarrassed her lover + Who was pained to discover +She expected no less of his dong +% +The notorious Duchess of Peels +Saw a fisherman fishing for eels. + Said she, "Would you mind? -- + Shove one up my behind. +I am anxious to know how it feels." +% +The office brown-noser named Bunky +Would claim he was nobody's flunky. + But when the chips were all down, + His proboscis was brown, +And there hung many strands which were gunky. % The old archeologist, Throstle, Discovered a marvelous fossil. @@ -1872,12 +2634,152 @@ Discovered a marvelous fossil. And the knot on the end, T'was the penis of Paul the Apostle. % +The once was a man from Bombay +Who modeled his cunts out of clay + So hot was his prick + That he turned them to brick +And rubbed all his foreskin away. +% +The partition of Vavasour Scowles +Was a sickener: they came on his bowels + In a firkin; his brain + Was found clogging a drain, +And his toes were inside of some towels. + -- Edward Gorey +% +The prick of the engineer, Scott, +Fell off from Saturnian rot. + He went to the basement + And made a replacement +Of tungsten and plastic and snot. +% +The randy old Bey of Algiers +Who'd confined his cock-poking to queers, + Tried a cunt for a change, + And remarked : "It felt strange ... +Just think what I've missed all these years!" +% +The sight of his guests filled Lord Cray +At breakfast with horrid dismay, + So he launched off the spoons + The pits from his prunes +At their heads as they neared the buffet. + -- Edward Gorey +% +The skater, Barbara Ann Scott +Is so fuckingly "winsome" a snot, + That when posed on her toes + She elaborately shows +Teeth, fat ass, titties and twat. +% +The spouse of a pretty young thing +Came home from the wars in the spring. + He was lame but he came + With his dame like a flame -- +A discharge is a wonderful thing. +% +The star of that X-rated hit +Plays a nurse with a throat full of clit. + This serves as a palace + For each turgid phallus-- +Some say that the plot is pure shit. +% +The wife of young Richard of Limerick +Complained to her husband, "My quim, Rick, + Still grows in diameter + Each time that you ram at her; +How can your poor tool stay so slim, Rick?" +% +The woman who lives on the moon +Is still cherishing the balloon + Of an earthling who'd come + And given her some, +But had dribbled away all too soon. +% +The work of Mess Sergeant Potgieter +Is not merely reading a meter. + By orders of Kirk + A part of his work +Is dosing the food with saltpeter. +% +The world is so full of a number of things, +I'm sure we should all be as happy as kings. + I'll tell you a story-- + It won't take me long-- +Of a brother and sister whose tale is my song. + +There was an old fellow and what do you think? +He lived on the cheese that he scraped from his dink. + He whacked it, he hacked it, + He ate it with glee- +Was there ever a fellow so happy as he? + +This charming old chap had a sister as well : +She was ugly and gaunt, with a horrible smell. + Her cunt was so dirty + It stank like a beast, +And the odor killed flies as they gathered to feast. + +What a wonderful family! What marvellous style! +I'll bet you and I aren't close by a mile. + Their odor and diet + Won't soon be forgotten, +And one day you and I may be equally rotten. +% There a young man from the Coast Who had an affair with a ghost. At the height of orgasm Said the pallid phantasm, "I think I can feel it -- almost!" % +There are some things we mustn't expose, +So we hide them away in our clothes. + Oh, it's shocking to stare + At what's certainly there-- +But why this is so, heaven knows. +% +There is a young faggot named Mose +Who insists that you fuck his long nose. + And you'll double the joy + Of this lecherous boy +If you'll tickle his balls with your toes. +% +There is a young lady named Aird, +Whose bottom is always kept bared. + When asked why she pouts, + She says "The Boy Scouts, +All beg me to please Be Prepared!" +% +There once was a Duchess of Beever +Who slept with her golden retriever. + Said the potted old Duke : + "Such tricks make me puke! +Were it not for her money, I'd leave her." +% +There once was a Duchess of Bruges +Whose cunt was incredibly huge. + Said the king to this dame + As he thunderously came: +"Mon Dieu! Apres moi, le deluge!" +% +There once was a Scot named McAmeter +With a tool of prodigious diameter. + It was not the size + That cause such surprise; +'Twas his rhythm -- iambic pentameter. +% +There once was a Swede in Minneapolis, +Discovered his sex life was hapless: + The more he would screw + The more he'd want to, +And he feared he would soon be quite sapless. +% +There once was a Usenetter named Mark, +Whose gender was kept in the dark. + He/she/it said with a nod, + "My ancestors were odd!" +Did Noah need two for the ark? +% There once was a bishop from Birmingham Who deflowered young girls while confirming 'em. As they knelt on the hassock @@ -1909,6 +2811,12 @@ Who soon found her fucking the pony. Sighed she, "Just a yard-long bologna." % There once was a couple named Kelley, +Who lived their life belly to belly. + Because in their haste + They used Library Paste, +Instead of Petroleum Jelly. +% +There once was a couple named Kelley, Who lived their life belly to belly. Because in their haste They used library paste, @@ -1926,30 +2834,18 @@ Who saw all his patients alone. He filled the wrong cavity, And my, how his practice has grown! % -There once was a Duchess of Beever -Who slept with her golden retriever. - Said the potted old Duke : - "Such tricks make me puke! -Were it not for her money, I'd leave her." -% -There once was a Duchess of Bruges -Whose cunt was incredibly huge. - Said the king to this dame - As he thunderously came: -"Mon Dieu! Apres moi, le deluge!" -% -There once was a fag of Khartoom -Who spent the night in a Lesbians room. - They argued all night, - Over who had the right, -To do what, and with which, and to whom. -% There once was a fairy named Avers Who encircled his cock with lifesavers. Though buggers all claimed That their asses were maimed, Sixy-niners all cheered the new flavors. % +There once was a feisty young terrier +Who liked to bite girls on the derriere. + He'd yip and he'd yap, + Then leap up and snap; +And the fairer the derriere the merrier. +% There once was a fellow named Bob Who in sexual ways was a snob. One day he was swimmin' @@ -2041,12 +2937,6 @@ Who got laid by a big alligator. 'Cause after he laid her, he ate her. % There once was a girl from Madras -Who had such a beautiful ass - - It was not round and pink - ( as you bastards think ) -But had two ears, a tail, and ate grass. -% -There once was a girl from Madras Who had such a beautiful ass - It was not round and pink (As you bastards think) @@ -2252,17 +3142,11 @@ Pa followed the pair to Pawtucket, "You're welcome to Nan." But as for the bucket, Pawtucket. % -There once was a man from Nantucket, -Whose cock was so long he could suck it. - He said with a grin, - As he wiped off his chin, -If my ear were a cunt I could fuck it! -% There once was a man from Nantucket Whose dick was so long he could suck it. He said with a grin As he wiped off his chin, -"If my ear was a cunt, I could fuck it." +"If my ear was a cunt, I could fuck it!" % There once was a man from Racine, Who invented a screwing machine. @@ -2282,6 +3166,12 @@ Who could put it up to her kidney. Put it up to her neck; He had a big one, now didn't he? % +There once was a man named Eugene +Who invented a screwing machine + Concave and convex + It served either sex +And it played with itself in between. +% There once was a man named Lodge, who had seatbelts installed in his Dodge. When his date was strapped in, @@ -2295,12 +3185,6 @@ Who canoed with a girl in Bermuder. So McGru took an oar and subduder. % There once was a man named McSweeny -Who spilled lots of gin on his weeney - So just to be couth - He added vermouth -And slipped his best girl a martini. -% -There once was a man named McSweeny Who spilled some raw gin on his weeny. Just to be couth, He added vermouth, @@ -2342,11 +3226,11 @@ A person of dubious gender. For permission to view His remarkable double pudenda. % -There once was a plumber from Leigh -Who was plumbing his maid by the sea. +There once was a plumber from Leigh, +Who was plumbing his maid by the sea, Said she, "Please stop plumbing, I think someone's coming!" -Said he, "Yes, I know love, it's me." +Said he, "Yes I know love, it's me." % There once was a pretty young Mrs. Whose tearful but short story thrs. @@ -2378,12 +3262,6 @@ A swell guy, as long as he lasted, In a basket, aloft, Or a breeches-buoy swung from the masthead. % -There once was a Scot named McAmeter -With a tool of prodigious diameter. - It was not the size - That cause such surprise; -'Twas his rhythm -- iambic pentameter. -% There once was a son-of-a-bitch, Neither clever, nor handsome, nor rich, Yet the girls he would dazzle, @@ -2396,18 +3274,6 @@ Who had a huge Vulcanized cock. Whose name was Uhura Just fainted away from the shock. % -There once was a Swede in Minneapolis, -Discovered his sex life was hapless: - The more he would screw - The more he'd want to, -And he feared he would soon be quite sapless. -% -There once was a Usenetter named Mark, -Whose gender was kept in the dark. - He/she/it said with a nod, - "My ancestors were odd!" -Did Noah need two for the ark? -% There once was a whore from Regina Who had a stupendous vagina. To save herself time, @@ -2527,12 +3393,6 @@ Whose prick was much like a ballon. She thought she was pregnant too soon. % There was a gay countess of Bray, -And you may think it odd when I say, - That in spite of high station, - Rank and education, -She always spelled cunt with a 'k'. -% -There was a gay countess of Bray, And you may think it odd when I say, That in spite of high station, Rank and education, @@ -2598,6 +3458,24 @@ Who never said, "No, I don't wanna." She would shoot LSD, And on weekends she smoked marijuana. % +There was a young German named Ringer +Who was screwing an opera singer. + Said he with a grin, + "Well, I've sure got it in!" +Said she, "You mean that ain't your finger?" +% +There was a young Jew of Far Rockaway +Whose screams could be heard for a block away. + Perceiving his error, + The Rabbi in terror +Cried, "God! I have cut his whole cock away!" +% +There was a young Scot in Madrid +Who got fifty-five fucks for a quid. + When they said, "Are you faint?" + He replied, "No, I ain't, +But I don't feel as good as I did." +% There was a young belle of old Natchez Whose garments were always in patchez. When comment arose @@ -2610,18 +3488,18 @@ Whose bush did so greatly increase He must hunt needle in stack. 'Twas as bad as being obese. % -There was a young bride, a Canuck, -Told her husband, "Let's do more than suck. - You say that I, maybe, - Can have my first baby-- -Let's give up this Frenchin' and fuck!" -% There was a young bride of Antigua Whose husband said, "Dear me, how big you are!" Said the girl, "What damn'd rot! Why, you've only felt my twot, My legs and my arse and my figua!" % +There was a young bride, a Canuck, +Told her husband, "Let's do more than suck. + You say that I, maybe, + Can have my first baby-- +Let's give up this Frenchin' and fuck!" +% There was a young chap in Arabia Who courted a widow named Fabia. "Yes, my tongue is as long @@ -2759,12 +3637,6 @@ Whose cock was so big it had ribs. And to suck it took art, While to fuck it took forty-two trips. % -There was a young fellow named dick -Who had a magnificent prick. - It was shaped like a prism - And shot so much gism -It made every cocksucker sick. -% There was a young fellow named Feeney Whose girl was a terrible meany. The hatch of her snatch @@ -2899,6 +3771,12 @@ Whose girl was a terrible meanie, Had a catch that would latch, She could only be screwed by Houdini. % +There was a young fellow named dick +Who had a magnificent prick. + It was shaped like a prism + And shot so much gism +It made every cocksucker sick. +% There was a young fellow of Burma Whose betrothed had good reason to murmur. But now that he's married he's @@ -2971,12 +3849,6 @@ Who said, "There is one thing I do know, And children devine, But the llama is numero uno." % -There was a young German named Ringer -Who was screwing an opera singer. - Said he with a grin, - "Well, I've sure got it in!" -Said she, "You mean that ain't your finger?" -% There was a young girl from Annista Who dated a lecherous mister. He fondled her titty, @@ -3145,12 +4017,6 @@ Who wanted to dance in the ballet. When she kicked off her drawers, But her hair and her bush didn't tally. % -There was a young girl named Saphire -Who succumbed to her lovers desire. - She said, "It's a sin, - But now that it's in, -Could you shove it a few inches higher?" -% There was a young girl named Sapphire Who succumbed to her lover's desire. She said, "It's a sin, @@ -3170,6 +4036,12 @@ Who took grain to the mill to get grist with. And united the organs they pissed with. % There was a young girl of Angina +Who stretched catgut across her vagina. + From the love-making frock + (With the proper sized cock) +Came Tocata and Fugue in D minor. +% +There was a young girl of Angina Who stretched catgut across her vagina. From the love-making frock (With the proper sized cock) @@ -3303,12 +4175,6 @@ Whose people all thought her a virgin, With her twat very red, And the head of a kid just emergin'. % -There was a young girl, very sweet, -Who thought sailors' meat quite a treat. - When she sat on their lap - She unbuttoned their flap, -And always had plenty to eat. -% There was a young girl who begat Three babies named Nat, Pat and Tat. T'was fun in the breeding @@ -3321,6 +4187,12 @@ Three brats, by name Nat, Pat, and Tat. But hell in the feeding, When she found there was no tit for Tat. % +There was a young girl, very sweet, +Who thought sailors' meat quite a treat. + When she sat on their lap + She unbuttoned their flap, +And always had plenty to eat. +% There was a young harlot from Kew Who filled her vagina with glue. She said with a grin, @@ -3351,18 +4223,6 @@ Made a fortune performing at stud, A double-beat metre, And a load like the Biblical Flood. % -There was a young Jew of Far Rockaway -Whose screams could be heard for a block away. - Perceiving his error, - The Rabbi in terror -Cried, "God! I have cut his whole cock away!" -% -There was a young lad - name of Durcan -Who was always jerkin' his gherkin. - His father said, "Durcan - Stop jerkin' your gherkin -Your gherkin's for ferkin', not jerkin'. -% There was a young lad from Nahant Who was made like the Sensitve Plant. When asked, "Do you fuck?" @@ -3464,11 +4324,6 @@ Who claimed she had men on her brain. It was not on her brain that he'd lain. % There was a young lady from Munich -Who had an affair with a eunuch. - At the height of their passion - He dealt her a ration -% -There was a young lady from Munich Who had an affair with a eunuch. At the height of their passion He dealt her a ration @@ -3842,12 +4697,6 @@ And her lover before her was kneeling. Take your hands off my quim; I much prefer fucking to feeling." % -There was a young lady of fashion -Who had oodles and oodles of passion. - To her lover she said, - As they climbed into bed, -"Here's one thing the bastards can't ration!" -% There was a young lady of Fez Who was known to the public as "Jez." Jezebel was her name, @@ -3855,35 +4704,23 @@ Who was known to the public as "Jez." She excelled at (so everyone says). % There was a young lady of Gaza -Who shaved her cunt bare with a razor. - The crabs, in a lump, - Made tracks to her rump - -This passing parade did amaze her. -% -There was a young lady of Gaza -Who shaved her cunt bare with a razor. - The crabs, in a lump, - Made tracks to her rump - -This passing parade did amaze her. -% -There was a young lady of Gaza Who shaved her cunt bare with a razor. The crabs, in a lump, Made tracks to her rump-- This passing parade did amaze her. % -There was a young lady of Gloucester, -Met a passionate fellow who tossed her. - She wasn't much hurt, - But he dirtied her skirt, -So think of the anguish it cost her. -% There was a young lady of Gloucester Whose friends they thought they had lost her Till they found on the grass The marks of her arse, And the knees of the man who had crossed her. % +There was a young lady of Gloucester, +Met a passionate fellow who tossed her. + She wasn't much hurt, + But he dirtied her skirt, +So think of the anguish it cost her. +% There was a young lady of Kent, Who admitted she knew what it meant When men asked her to dine, @@ -3923,7 +4760,7 @@ His whang while it sang a duet. There was a young lady of Norway Who hung by her toes in a doorway. She said to her beau - "Just look at me Joe + "Just look at me, Joe, I think I've discovered one more way." % There was a young lady of Rhyll @@ -3962,6 +4799,12 @@ Who professed to lack sexual feeling. Just touched her clitoris, And she had to be scraped off the ceiling. % +There was a young lady of fashion +Who had oodles and oodles of passion. + To her lover she said, + As they climbed into bed, +"Here's one thing the bastards can't ration!" +% There was a young lady who said, As her bridegroom got into the bed, "I'm tired of this stunt, @@ -3969,7 +4812,7 @@ As her bridegroom got into the bed, You can get up my bottom instead." % There was a young lady whose cunt -Could accomodate a small punt. +Could accommodate a small punt. Her mother said, "Annie, It matches your fanny, Which never was that of a runt." @@ -3986,12 +4829,6 @@ The cheeks of her ass were so fat Whenever she farted, And also whenever she shat. % -There was a young lass from Surat. -The cheeks of her ass were so fat - That they had to be parted - Whenever she farted, -And also whenever she shat. -% There was a young laundress named Wrangle Whose tits tilted up at an angle. "They may tickle my chin," @@ -4010,6 +4847,12 @@ Who had strange ideas about marriage. And sucked off her brother And ate up her sister's miscarriage. % +There was a young man from Bel-Air +Who was screwing his girl on the stair, + But the banister broke, + So he doubled his stroke, +And finished her off in mid-air. +% There was a young man from Bel-Aire Who was screwing his girl on the stair. But the banister broke @@ -4028,12 +4871,6 @@ Whose bowels responded to Moxie. He would tune up his ass, Till he played like the band at the Roxy. % -There was a young man from Bombay -Who fashioned a cunt out of clay - But the heat of his prick - Turned it into a brick -And rubbed all his foreskin away. -% There was a young man from Boston Who rode around in an Austin. There was room for his ass @@ -4112,12 +4949,6 @@ Whose cock was so long he could suck it. And saw his own ass, And broke his neck trying to fuck it. % -There was a young man from Nantucket -Whose cock was so long he could suck it. - He said with a grin, - While wiping his chin, -"If my ear was a cunt, I could fuck it." -% There was a young man from New Haven Who had an affair with a raven. He said with a grin @@ -4202,24 +5033,11 @@ Whose penis rose higher and higher, It was quite out of sight -- But of course you know I'm a liar. % -There was a young man, name of Fred, -Who spent every Thursday in bed; - He lay with his feet - Outside of the sheet, -And the pillows on top of his head. - -- Edward Gorey -% -There was a young man, name of Saul, -Who was able to bounce either ball, - He could stretch them and snap them, - And juggle and clap them, -Which earned him the plaudits of all. -% There was a young man named Crockett Whose balls got caught in a socket. - His wife was a bitch - So she threw the switch, -And Crockett went off like a rocket. + His wife was a bitch, + And she threw the switch, +As Crockett went off like a rocket. % There was a young man named Crockett Whose balls got caught in a socket. @@ -4353,11 +5171,11 @@ Whose balls were all covered with spinach. That it wound round a spool, And he let it out inach by inach. % -There was a young man of high station -Who was found by a pious relation - Making love in a ditch - To -- I won't say a bitch -- -But a woman of no reputation. +There was a young man of Khartoum +Who lured a poor girl to her doom. + He not only fucked her, + But buggered and sucked her-- +And left her to pay for the room. % There was a young man of Khartoum, The strength of whose balls was his doom. @@ -4365,12 +5183,6 @@ The strength of whose balls was his doom. The third law of Newton Propelled the poor chap to the Moon. % -There was a young man of Khartoum -Who lured a poor girl to her doom. - He not only fucked her, - But buggered and sucked her-- -And left her to pay for the room. -% There was a young man of Kildare Who was fucking a girl on the stair. The bannister broke, @@ -4461,6 +5273,12 @@ Who had a deficient prepuce, He made up in his sac; The result was, his balls were too loose. % +There was a young man of high station +Who was found by a pious relation + Making love in a ditch + To -- I won't say a bitch -- +But a woman of no reputation. +% There was a young man who appeared To his friends with a full growth of beard; They at once said, "Although @@ -4504,6 +5322,19 @@ Who had a very long root. As an extra leg Is a question exceedingly moot. % +There was a young man, name of Fred, +Who spent every Thursday in bed; + He lay with his feet + Outside of the sheet, +And the pillows on top of his head. + -- Edward Gorey +% +There was a young man, name of Saul, +Who was able to bounce either ball, + He could stretch them and snap them, + And juggle and clap them, +Which earned him the plaudits of all. +% There was a young miss from Johore Who'd lie on a mat on the floor; In a manner uncanny @@ -4568,16 +5399,7 @@ There was a young poet named Dan, Whose poetry never would scan. When told this was so, He said, "Yes, I know, -It's because I try to put every possible syllable into that - Last line that I can." -% -There was a young poet named Dan, -Whose poetry never would scan. - When told this was so, - He said, "Yes, I know. -It's because I try to put every single -syllable into the last line that I possibly, -possibly can." +It's because I try to put every single syllable into the last line that I possibly, possibly can." % There was a young royal marine, Who tried to fart "God Save the Queen". @@ -4585,12 +5407,6 @@ Who tried to fart "God Save the Queen". Out came only guano And his britches weren't fit to be seen. % -There was a young sailor from Brighton, -Who remarked to his girl, "You're a tight one." - She replied, "'Pon my soul, - You're in the wrong hole; -There's plenty of room in the right one." -% There was a young sailor from Brighton Who said to his bird, "You're a tight'un." She replied, "'Pon my soul, @@ -4603,12 +5419,6 @@ Who stuffed her friend's cunt with banana, From her partner's warm slit, In the most approved lesbian manner. % -There was a young Scot in Madrid -Who got fifty-five fucks for a quid. - When they said, "Are you faint?" - He replied, "No, I ain't, -But I don't feel as good as I did." -% There was a young soldier from Munich Whose penis hung down past his tunic, And their chops girls would lick @@ -4720,12 +5530,6 @@ Amusing herself in the loft, Is what I'd choose first -- With bologna you know you've been boffed." % -There was a young woman, quite handsome, -Who got stuck in a sleeping room transom. - When she offered much gold - For release, she was told -That the view was worth more than the ransom. -% There was a young woman whose stammer Was atrocious, and so was her grammar; But they were not improved @@ -4733,6 +5537,24 @@ Was atrocious, and so was her grammar; To knock out her teeth with a hammer. -- Edward Gorey % +There was a young woman, quite handsome, +Who got stuck in a sleeping room transom. + When she offered much gold + For release, she was told +That the view was worth more than the ransom. +% +There was an Old Man of the Mountain +Who frigged himself into a fountain + Fifteen times had he spent, + Still he wasn't content, +He simply got tired of the counting. +% +There was an old Scot named McTavish +Who attempted an anthropoid ravish. + The object of rape + Was the wrong sex of ape, +And the anthropoid ravished McTavish. +% There was an old abbess quite shocked To find nuns where the candles were locked. Said the abbess, "You nuns @@ -4898,13 +5720,7 @@ And secretly finger his dong. There was an old man of St. Bees, Who was stung in the arm by a wasp. When asked, "Does it hurt?" - He relied, "No, it doesn't. -I'm so glad that it wasn't a hornet." -% -There was an old man of St. Bees, -Who was stung in the arm by a wasp. - When asked, "Does it hurt?" - He relied, "No, it doesn't. + He replied, "No, it doesn't. I'm so glad that it wasn't a hornet." -- W.S. Gilbert % @@ -4914,30 +5730,12 @@ Whose tool was a yard long or more, In a surgical sling To keep it from wiping the floor. % -There was an Old Man of the Mountain -Who frigged himself into a fountain - Fifteen times had he spent, - Still he wasn't content, -He simply got tired of the counting. -% There was an old man of the port Whose prick was remarkably short. When he got into bed, The old woman said, "That isn't a prick; it's a wart!" % -There was an old man of the port -Whose prick was remarkably short. - When he got into bed, - The old woman said, -"This isn't a prick; it's a wart!" -% -There was an old man of the port -Whose prick was remarkably short. - When he got into bed, - The old woman said, -"That isn't a prick; it's a wart!" -% There was an old man who said, "Tush! My balls always hang in the brush, And I fumble about, @@ -4948,7 +5746,7 @@ There was an old man with a beard Who said, "It is just what I feared! Two owls and a hen, Four larks and a wren -Have all built their nests in my beard!" +Have all built their nests in my beard!" % There was an old person of Ware Who had an affair with a bear. @@ -4968,12 +5766,6 @@ Whose prick had a left handed tack. Don't spin when he shoves, Their cervixes frequently crack. % -There was an old Scot named McTavish -Who attempted an anthropoid ravish. - The object of rape - Was the wrong sex of ape, -And the anthropoid ravished McTavish. -% There was an old whore from Silesia Who'd croke: "If my box doesn't please ya, For a slight extra sum @@ -5106,7 +5898,7 @@ They had come in the fugue to the stretto When a dark, bearded man from a ghetto Slipped forward and grabbed Her tresses and stabbed -Her to death with a rusty stiletto. +Her to death with a rusty stiletto. -- Edward Gorey % Though his plan, when he gave her a buzz, @@ -5127,12 +5919,6 @@ Lay all of his life on his back, And the pilgrims now stare At the scene, in his shrine, on a plaque. % -'Tis a custom in Castellamare -To fuck in the back of a lorry. - The chassis and springs - Are like woodwinds and strings -In the midst of a musical soiree. -% To a weepy young woman in Thrums Her betrothed remarked, "This is what comes Of allowing your tears @@ -5142,7 +5928,7 @@ I think they have rotted the drums." % To bear offspring, Noah's snakes were unable. Their fertility was somewhat unstable. - He constructed a bed + He constructed a bed Out of tree trunks and said, "Even adders can multiply on a log table." % @@ -5213,6 +5999,13 @@ Found their pricks were no larger than wens. And wished they had more skins, They discovered they'd both become hens. % +Un moine au milieu de la messe A monk in the middle of mass +S'eleva et cria en detresse; Stood up and cried out in distress; + "La vie religieuse, "The religious life + C'est sale et affreuse," Is dirty and horrid," +Et se poignarda dans les fesses. And stabbed himself in the ass. + -- Edward Gorey +% Under the spreading chestnut tree The village smith he sat, Amusing himself @@ -5237,11 +6030,59 @@ The kind the broad-minded guys hunt : Willing, thrilling, and hot, That wears peckers down, limp and blunt! % +We sailed on the good ship Venus, +My God, you should have seen us + With a figurehead + Of a whore in bed +And the mast an upright penis + +The captain of the lugger +Was known as a filthy bugger + Declared unfit + To shovel shit +From one ship to another + +The first mate's name was Cooper, +By god he was a trooper + He jerked and jerked + Until he worked +Himself into a stupor + +The cabin boy was chipper, +A dandy little nipper + He shoved cracked glass + Inside his ass +And circumcised the skipper + +The captain's wife was Charlotte, +Born and bred a harlot + Her thighs at night + Were lily white +By morning they were scarlet + +The captain's youngest daughter +Slipped into the water + Her plaintive squeals + Announced that eels +Had found her sexual quarter + +The ship's dog's name was Rover, +They turned the poor beast over + And ground and ground + That faithful hound +From Tenerife to Dover +% +Well buggered was a boy named Delpasse +By all of the lads in his class + He said, with a yawn, + "Now the novelty's gone +And it's only a pain in the ass." +% When I was a baby, my penis Was as white as the buttocks of Venus. - But now 'this as red + But now 'tis as red As her nipples instead-- -All because of the feminie genus! +All because of the feminine genus! % When they asked a pert baggage name Alice, Who'd been bedded and banged in the palace, @@ -5255,6 +6096,18 @@ You get a great bossom bonanza: Makes her throw fifty fits, And the fuck is a sextravaganza! % +While I, with my usual enthusiasm, +Was exploring in Ermintrude's busiasm, + She explained, "They are flat, + But think nothing of that -- +You will find that my sweet sister Susiasm." +% +While Titian was mixing rose madder, +His model reclined on a ladder. + Her position to Titian + Suggested coition, +So he leapt up the ladder and had 'er. +% While his duchess lay practically dead, The Duke of Daguerrodargue said: "Can it be this is all? @@ -5262,12 +6115,6 @@ The Duke of Daguerrodargue said: Have destroyed this disgrace to my bed." -- Edward Gorey % -While I, with my usual enthusiasm, -Was exploring in Ermintrude's busiasm, - She explained, "They are flat, - But think nothing of that -- -You will find that my sweet sister Susiasm." -% While out on a date in his Fiat, The man exclaimed "Where's my key at?" As he bent down to seek, @@ -5280,12 +6127,6 @@ Lady Pamela forgot to say "No." And the second-cook laid her; The waiters were all hanging low. % -While Titian was mixing rose madder, -His model reclined on a ladder. - Her position to Titian - Suggested coition, -So he leapt up the ladder and had 'er. -% While travelling in farthest Tibet, Lord Irongate found cause to regret The buttered-up tea, @@ -5311,15 +6152,22 @@ But dependent on men you must be: With a rod firm and trim, To puggle your water-drains free! % -Young Frederick the great was a beaut. -To a guard he cried, "Hey, man, you're cute. - If you'll come to my palace, - I'll finger your phallus, -And then I shall blow on your flute." -% You've heard of the bishop of Birmingham, Well, here's the new story concerning 'im : He buggers the choir As they sing "Ave Maria," And fucks all the girls whilst confirming 'em. % +Young Frederick the great was a beaut. +To a guard he cried, "Hey, man, you're cute. + If you'll come to my palace, + I'll finger your phallus, +And then I shall blow on your flute." +% +`My trip? It was vile. Balaclava +I loathed. Etna was crawling with lava. + The ship was all white + But it creaked in the night, +And the band, they did not know la java." + -- Edward Gorey +% diff --git a/fortune/datfiles/netbsd b/fortune/datfiles/netbsd index 8f310b3..c3a640b 100644 --- a/fortune/datfiles/netbsd +++ b/fortune/datfiles/netbsd @@ -1,11 +1,12 @@ - -%____ __ _ ____ __ __ ___ ___ ___ ___ / | / /__ _/ /_ / |/ __\ / _ | __ / |/ // _\/_ _/ / ' / \_ \ / / / _ / /| // __/ / /_ / , | __/ // / ,/ /_/ |__/_\__/__\__//___/__\__//___' -- Greywolf % +#netbsd - where monks recite their internal dialogue while debugging. + -- Bernhard Riedel +% - What's up? - All the NetBSD servers, of course.. -- Gavan Fantom @@ -48,6 +49,13 @@ http://www.imrryr.org/NetBSD/logo I didn't get where I am today without using NetBSD -- Dave Tyson % +I held off from Uni until NetBSD came out. +I decided, ``if there's no NetBSD then I'll just flip burgers'' + -- Roland Dowdeswell +% +If it isn't possible with NetBSD, it isn't worth doing. + -- Petter "Nosfisk" Lindquist +% My other computer runs NetBSD -- Allen Briggs % @@ -84,12 +92,18 @@ NetBSD - hackers tested, mom approved NetBSD - here today and in the middle of 2038 tomorrow. -- Julian Assange % +NetBSD - love all, serve all. + -- Silke Mueller +% NetBSD - Mach 3 stealthOS, undetectable by media radar. -- Julian Assange % NetBSD - more is more. -- Julian Assange % +NetBSD - no propaganda in the default system, in more than 10 years! + -- Jaromir Dolecek +% NetBSD: No Windows or Gates, but lots of doors, portals and tunnels. -- Greywolf % @@ -530,14 +544,3 @@ Young or old; cutting edge or yesterday's NeWS, NetBSD is the UNIX for you. It can be a hulking monster in your basement, or fit in the palm of your hand. -- Richard Rauch -% -#netbsd - where monks recite their internal dialogue while debugging. - -- Bernhard Riedel -% -I held off from Uni until NetBSD came out. -I decided, ``if there's no NetBSD then I'll just flip burgers'' - -- Roland Dowdeswell -% -NetBSD - love all, serve all. - -- Silke Mueller -% diff --git a/fortune/datfiles/netbsd-o.real b/fortune/datfiles/netbsd-o.real index 4c67b96..25f75a8 100644 --- a/fortune/datfiles/netbsd-o.real +++ b/fortune/datfiles/netbsd-o.real @@ -1,46 +1,3 @@ -Never mind the bollocks, here's NetBSD. - -- Julian Assange -% -NetBSD: Unix With Balls. - -- Andrew Gillham -% -NetBSD, stupid. - -- Julian Assange -% -NetBSD: No Sh;t! - -- Andrew Gillham -% -NetBSD: More Ports That A Cheap Whore - -- Andrew Gillham -% -NetBSD long theme: "Eat a queer fetus for Jesus, and run NetBSD!" - -- Mason Loring Bliss -% -NetBSD logo: Kiss-painted (w/tongue) Beastie stabbing a pitchfork - through a bloodied and obviously-in-horrible-pain Tux. - -- Mason Loring Bliss -% -NetBSD: better for your uptime than Viagra. - -- Daniel Carosone -% -NetBSD - we're on a mission from Hell. - -- Julian Assange -% -NetBSD - We put the OS in OrgaSm. - -- Julian Assange -% -NetBSD - the semen in the money shot. - -- Julian Assange -% -NetBSD - Multiple Architectures lead to Multiple Orgasms. - -- Julian Assange -% -NetBSD - more ports than a Norwegian crack whore. - -- Julian Assange -% -NetBSD - Bits for Tits. - -- Julian Assange -% Anagrams for NetBSD core team: Strobe mased net Strobe mased ten @@ -49,3 +6,48 @@ Anagrams for NetBSD core team: Cremate no debts -- Julian Assange % +NetBSD - Bits for Tits. + -- Julian Assange +% +NetBSD - Multiple Architectures lead to Multiple Orgasms. + -- Julian Assange +% +NetBSD - We put the OS in OrgaSm. + -- Julian Assange +% +NetBSD - We sell rope. +% +NetBSD - more ports than a Norwegian crack whore. + -- Julian Assange +% +NetBSD - the semen in the money shot. + -- Julian Assange +% +NetBSD - we're on a mission from Hell. + -- Julian Assange +% +NetBSD logo: Kiss-painted (w/tongue) Beastie stabbing a pitchfork + through a bloodied and obviously-in-horrible-pain Tux. + -- Mason Loring Bliss +% +NetBSD long theme: "Eat a queer fetus for Jesus, and run NetBSD!" + -- Mason Loring Bliss +% +NetBSD, stupid. + -- Julian Assange +% +NetBSD: More Ports That A Cheap Whore + -- Andrew Gillham +% +NetBSD: No Sh;t! + -- Andrew Gillham +% +NetBSD: Unix With Balls. + -- Andrew Gillham +% +NetBSD: better for your uptime than Viagra. + -- Daniel Carosone +% +Never mind the bollocks, here's NetBSD. + -- Julian Assange +% diff --git a/fortune/datfiles/startrek b/fortune/datfiles/startrek index adba8f7..376b1b8 100644 --- a/fortune/datfiles/startrek +++ b/fortune/datfiles/startrek @@ -170,7 +170,7 @@ He's dead, Jim History tends to exaggerate. -- Col. Green, "The Savage Curtain", stardate 5906.4 % -Humans do claim a great deal for that particular emotion (love). +Humans do claim a great deal for that particular emotion [love]. -- Spock, "The Lights of Zetar", stardate 5725.6 % I am pleased to see that we have differences. May we together become @@ -386,7 +386,7 @@ advice without necessarily having to take it. -- Kirk, "Dagger of the Mind", stardate 2715.2 % Only a fool fights in a burning house. - -- Kank the Klingon, "Day of the Dove", stardate unknown + -- Kang the Klingon, "Day of the Dove", stardate unknown % Our missions are peaceful -- not for conquest. When we do battle, it is only because we have no choice. @@ -472,6 +472,7 @@ The joys of love made her human and the agonies of love destroyed her. % The man on tops walks a lonely street; the "chain" of command is often a noose. + -- McCoy, "The Conscience of the King," stardate 2818.9 % The more complex the mind, the greater the need for the simplicity of play. @@ -493,7 +494,7 @@ deeply -- life in every form from fetus to developed being. to know each other. -- Kirk, "Elaan of Troyius", stardate 4372.5 % -"The release of emotion is what keeps us health. Emotionally healthy." +"The release of emotion is what keeps us healthy. Emotionally healthy." "That may be, Doctor. However, I have noted that the healthy release of emotion is frequently unhealthy for those closest to you." @@ -628,7 +629,7 @@ We have phasers, I vote we blast 'em! -- Bailey, "The Corbomite Maneuver", stardate 1514.2 % "We have the right to survive!" -"Not be killing others." +"Not by killing others." -- Deela and Kirk, "Wink of An Eye", stardate 5710.5 % We Klingons believe as you do -- the sick should die. Only the strong @@ -655,7 +656,7 @@ What kind of love is that? Not to be loved; never to have shown love. "There are no good ways." -- Sulu and Kirk, "That Which Survives", stardate unknown % -When a child is taught ... its programmed with simple instructions -- +When a child is taught ... it's programmed with simple instructions -- and at some point, if its mind develops properly, it exceeds the sum of what it was taught, thinks independently. -- Dr. Richard Daystrom, "The Ultimate Computer", diff --git a/fortune/datfiles/startrek.sp.ok b/fortune/datfiles/startrek.sp.ok index 41ecbdf..55c5124 100644 --- a/fortune/datfiles/startrek.sp.ok +++ b/fortune/datfiles/startrek.sp.ok @@ -24,7 +24,7 @@ Gothos Hag Hedford Hodin -Kank +Kang Kanuto Kelinda Kelvan diff --git a/fortune/datfiles/zippy b/fortune/datfiles/zippy index c9ed106..f0b76bb 100644 --- a/fortune/datfiles/zippy +++ b/fortune/datfiles/zippy @@ -1,4 +1,4 @@ -A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAQUIRI!! +A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAIQUIRI!! % A dwarf is passing out somewhere in Detroit! % @@ -9,6 +9,8 @@ with LILACS, LOLLIPOPS & small CHILDREN at the HUSH of twilight?? % Actually, what I'd like is a little toy spaceship!! % +Adopt my lifestyle or I'll have to press charges. +% All I can think of is a platter of organic PRUNE CRISPS being trampled by an army of swarthy, Italian LOUNGE SINGERS ... % @@ -48,6 +50,8 @@ MONTALBAN'S HAIR! % Are the STEWED PRUNES still in the HAIR DRYER? % +Are we having fun yet? +% Are we live or on tape? % Are we on STRIKE yet? @@ -111,7 +115,7 @@ LEFT at th'HOLIDAY INN!! JOIN the CREDIT WORLD!! MAKE me an OFFER!!! CONGRATULATIONS! Now should I make thinly veiled comments about DIGNITY, self-esteem and finding TRUE FUN in your RIGHT VENTRICLE?? % -Content: 80% POLYESTER, 20% DACRONi ... The waitress's UNIFORM sheds +Content: 80% POLYESTER, 20% DACRON ... The waitress's UNIFORM sheds TARTAR SAUCE like an 8" by 10" GLOSSY ... % Could I have a drug overdose? @@ -133,7 +137,7 @@ DIDI ... is that a MARTIAN name, or, are we in ISRAEL? % Didn't I buy a 1951 Packard from you last March in Cairo? % -Disco oil bussing will create a throbbing naugahide pipeline running +Disco oil bussing will create a throbbing naugahyde pipeline running straight to the tropics from the rug producing regions and devalue the dollar! % @@ -193,6 +197,8 @@ for ARTIFICIAL FLAVORING!! Four thousand different MAGNATES, MOGULS & NABOBS are romping in my gothic solarium!! % +Frivolity is a stern taskmaster. +% FROZEN ENTREES may be flung by members of opposing SWANSON SECTS ... % FUN is never having to say you're SUSHI!! @@ -227,7 +233,7 @@ He is the MELBA-BEING ... the ANGEL CAKE ... XEROX him ... XEROX him -- % He probably just wants to take over my CELLS and then EXPLODE inside me like a BARREL of runny CHOPPED LIVER! Or maybe he'd like to -PSYCHOLIGICALLY TERRORISE ME until I have no objection to a RIGHT-WING +PSYCHOLOGICALLY TERRORISE ME until I have no objection to a RIGHT-WING MILITARY TAKEOVER of my apartment!! I guess I should call AL PACINO! % HELLO KITTY gang terrorizes town, family STICKERED to death! @@ -288,7 +294,7 @@ MOUSTACHE ... Have you ever noticed th' way it radiates SINCERITY, HONESTY & WARMTH? It's a MOUSTACHE you want to take HOME and introduce to NANCY SINATRA! % -How many retured bricklayers from FLORIDA are out purchasing PENCIL +How many retired bricklayers from FLORIDA are out purchasing PENCIL SHARPENERS right NOW?? % How's it going in those MODULAR LOVE UNITS?? @@ -317,6 +323,8 @@ I am NOT a nut.... % I appoint you ambassador to Fantasy Island!!! % +I believe in wash fulfillment. +% I brought my BOWLING BALL -- and some DRUGS!! % I can't decide which WRONG TURN to make first!! @@ -351,7 +359,7 @@ I feel better about world problems now! % I feel like a wet parking meter on Darvon! % -I feel like I am sharing a ``CORN-DOG'' with NIKITA KHRUSCHEV ... +I feel like I am sharing a ``CORN-DOG'' with NIKITA KHRUSHCHEV ... % I feel like I'm in a Toilet Bowl with a thumbtack in my forehead!! % @@ -410,6 +418,10 @@ I invented skydiving in 1989! % I joined scientology at a garage sale!! % +I just accepted provolone into my life. +% +I just forgot my Social Security number. +% I just forgot my whole philosophy of life!!! % I just got my PRINCE bumper sticker ... But now I can't remember WHO he @@ -477,6 +489,8 @@ MISAPPREHENSIONS ... I think I'll KILL myself by leaping out of this 14th STORY WINDOW while reading ERICA JONG'S poetry!! % +I think I'm having a mid-week crisis. +% I think my career is ruined! % I used to be a FUNDAMENTALIST, but then I heard about the HIGH @@ -484,11 +498,13 @@ RADIATION LEVELS and bought an ENCYCLOPEDIA!! % ... I want a COLOR T.V. and a VIBRATING BED!!! % +I want a mega-meal in a mega-mall. +% I want a VEGETARIAN BURRITO to go ... with EXTRA MSG!! % I want a WESSON OIL lease!! % -I want another RE-WRITE on my CEASAR SALAD!! +I want another RE-WRITE on my CAESAR SALAD!! % I want EARS! I want two ROUND BLACK EARS to make me feel warm 'n secure!! @@ -505,8 +521,6 @@ I want to kill everyone here with a cute colorful Hydrogen Bomb!! % I want to perform cranial activities with Tuesday Weld!! % -... I want to perform cranial activities with Tuesday Weld!! -% I want to read my new poem about pork brains and outer space ... % I want to so HAPPY, the VEINS in my neck STAND OUT!! @@ -554,6 +568,8 @@ SONTAG!! % I'm a nuclear submarine under the polar ice cap and I need a Kleenex! % +I'm afraid! I need something in a heavy cream sauce. +% I'm also against BODY-SURFING!! % I'm also pre-POURED pre-MEDITATED and pre-RAPHAELITE!! @@ -695,6 +711,8 @@ If our behavior is strict, we do not need fun! If Robert Di Niro assassinates Walter Slezak, will Jodie Foster marry Bonzo?? % +If you can't say something nice, say something surrealistic. +% In 1962, you could buy a pair of SHARKSKIN SLACKS, with a "Continental Belt," for $10.99!! % @@ -773,7 +791,7 @@ ASHTRAYS ... % Let me do my TRIBUTE to FISHNET STOCKINGS ... % -Let's all show human CONCERN for REVERAND MOON's legal difficulties!! +Let's all show human CONCERN for REVEREND MOON's legal difficulties!! % Let's send the Russians defective lifestyle accessories! % @@ -803,7 +821,7 @@ Maybe we could paint GOLDIE HAWN a rich PRUSSIAN BLUE -- % MERYL STREEP is my obstetrician! % -MMM-MM!! So THIS is BIO-NEBULATION! +MMM-MM!! So THIS is BIO-NEBULATION! % Mmmmmm-MMMMMM!! A plate of STEAMING PIECES of a PIG mixed with the shreds of SEVERAL CHICKENS!! ... Oh BOY!! I'm about to swallow a @@ -822,6 +840,8 @@ My Aunt MAUREEN was a military advisor to IKE & TINA TURNER!! My BIOLOGICAL ALARM CLOCK just went off ... It has noiseless DOZE FUNCTION and full kitchen!! % +My boxer shorts just went on a rampage through a Long Island bowling alley. +% My CODE of ETHICS is vacationing at famed SCHROON LAKE in upstate New York!! % @@ -868,6 +888,8 @@ NEWARK has been REZONED!! DES MOINES has been REZONED!! % Nipples, dimples, knuckles, NICKLES, wrinkles, pimples!! % +Nobody brings small problems into a laundromat. +% Not SENSUOUS ... only "FROLICSOME" ... and in need of DENTAL WORK ... in PAIN!!! % @@ -884,7 +906,7 @@ BROKEN PLASTIC FORKS in it!! Now I'm concentrating on a specific tank battle toward the end of World War II! % -Now I'm having INSIPID THOUGHTS about the beatiful, round wives of +Now I'm having INSIPID THOUGHTS about the beautiful, round wives of HOLLYWOOD MOVIE MOGULS encased in PLEXIGLASS CARS and being approached by SMALL BOYS selling FRUIT ... % @@ -975,11 +997,15 @@ PUNK ROCK!! DISCO DUCK!! BIRTH CONTROL!! % Quick, sing me the BUDAPEST NATIONAL ANTHEM!! % +Reality distorts my sense of television. +% RELATIVES!! % Remember, in 2039, MOUSSE & PASTA will be available ONLY by prescription!! % +Remote keyless entry, remote keyless entry, remote keyless entry! +% RHAPSODY in Glue! % SANTA CLAUS comes down a FIRE ESCAPE wearing bright blue LEG WARMERS @@ -1116,6 +1142,8 @@ Nipples, dimples, knuckles, NICKLES, wrinkles, pimples!! % TONY RANDALL! Is YOUR life a PATIO of FUN?? % +Treasure your spin cycle. +% Uh-oh -- WHY am I suddenly thinking of a VENERABLE religious leader frolicking on a FORT LAUDERDALE weekend? % @@ -1135,6 +1163,8 @@ Used staples are good with SOY SAUCE! % VICARIOUSLY experience some reason to LIVE!! % +Virtual reality isn't what it used to be. +% Vote for ME -- I'm well-tapered, half-cocked, ill-conceived and TAX-DEFERRED! % diff --git a/fortune/datfiles/zippy.sp.ok b/fortune/datfiles/zippy.sp.ok index 67c616b..08a5885 100644 --- a/fortune/datfiles/zippy.sp.ok +++ b/fortune/datfiles/zippy.sp.ok @@ -24,7 +24,7 @@ Carlsbad Clift Cosell Cupcake -DAQUIRI +DAIQUIRI DELI DIDI DISCO diff --git a/fortune/fortune/fortune.6.in b/fortune/fortune/fortune.6.in index e507da4..6c07b05 100644 --- a/fortune/fortune/fortune.6.in +++ b/fortune/fortune/fortune.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: fortune.6,v 1.9 2002/09/26 18:32:01 wiz Exp $ +.\" $NetBSD: fortune.6,v 1.10 2003/08/07 09:37:13 agc Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/fortune/fortune/fortune.c b/fortune/fortune/fortune.c index 844dae3..177b342 100644 --- a/fortune/fortune/fortune.c +++ b/fortune/fortune/fortune.c @@ -1,4 +1,4 @@ -/* $NetBSD: fortune.c,v 1.38 2002/11/24 18:03:14 christos Exp $ */ +/* $NetBSD: fortune.c,v 1.39 2003/08/07 09:37:14 agc Exp $ */ /*- * Copyright (c) 1986, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\ #if 0 static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: fortune.c,v 1.38 2002/11/24 18:03:14 christos Exp $"); +__RCSID("$NetBSD: fortune.c,v 1.39 2003/08/07 09:37:14 agc Exp $"); #endif #endif /* not lint */ @@ -327,7 +323,7 @@ fortlen() char line[BUFSIZ]; if (!(Fortfile->tbl.str_flags & (STR_RANDOM | STR_ORDERED))) - nchar = (Seekpts[1] - Seekpts[0] <= SLEN); + nchar = Seekpts[1] - Seekpts[0]; else { open_fp(Fortfile); (void) fseek(Fortfile->inf, (long)Seekpts[0], SEEK_SET); @@ -947,7 +943,7 @@ init_prob() errx(1, "Probabilities sum to %d%%!", percent); else if (percent < 100 && num_noprob == 0) errx(1, "No place to put residual probability (%d%%)", - percent); + 100 - percent); else if (percent == 100 && num_noprob != 0) errx(1, "No probability left to put in residual files"); percent = 100 - percent; @@ -956,7 +952,7 @@ init_prob() if (num_noprob > 1) { frac = percent / num_noprob; DPRINTF(1, (stderr, ", frac = %d%%", frac)); - for (fp = File_list; fp != last; fp = fp->next) + for (fp = File_tail; fp != last; fp = fp->prev) if (fp->percent == NO_PROB) { fp->percent = frac; percent -= frac; diff --git a/fortune/fortune/pathnames.h.in b/fortune/fortune/pathnames.h.in index 6a90145..1277649 100644 --- a/fortune/fortune/pathnames.h.in +++ b/fortune/fortune/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/23 08:28:42 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:14 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -35,4 +31,4 @@ * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 */ -#define FORTDIR "@sharedir@" +#define FORTDIR "@fortune_dir@" diff --git a/fortune/strfile/strfile.8 b/fortune/strfile/strfile.8 index 00243a3..0ea3160 100644 --- a/fortune/strfile/strfile.8 +++ b/fortune/strfile/strfile.8 @@ -1,4 +1,4 @@ -.\" $NetBSD: strfile.8,v 1.10 2002/09/26 18:32:01 wiz Exp $ +.\" $NetBSD: strfile.8,v 1.11 2003/08/07 09:37:14 agc Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/fortune/strfile/strfile.c b/fortune/strfile/strfile.c index 2c26ab7..982a15f 100644 --- a/fortune/strfile/strfile.c +++ b/fortune/strfile/strfile.c @@ -1,4 +1,4 @@ -/* $NetBSD: strfile.c,v 1.21 2001/07/22 13:34:00 wiz Exp $ */ +/* $NetBSD: strfile.c,v 1.22 2003/08/07 09:37:14 agc Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -47,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: strfile.c,v 1.21 2001/07/22 13:34:00 wiz Exp $"); +__RCSID("$NetBSD: strfile.c,v 1.22 2003/08/07 09:37:14 agc Exp $"); #endif #endif /* not lint */ #endif /* __NetBSD__ */ diff --git a/fortune/strfile/strfile.h b/fortune/strfile/strfile.h index 8198ea8..6c55a06 100644 --- a/fortune/strfile/strfile.h +++ b/fortune/strfile/strfile.h @@ -1,4 +1,4 @@ -/* $NetBSD: strfile.h,v 1.5 1999/12/30 01:26:44 simonb Exp $ */ +/* $NetBSD: strfile.h,v 1.6 2003/08/07 09:37:15 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/fortune/unstr/unstr.c b/fortune/unstr/unstr.c index 1696bc1..1fca89a 100644 --- a/fortune/unstr/unstr.c +++ b/fortune/unstr/unstr.c @@ -1,4 +1,4 @@ -/* $NetBSD: unstr.c,v 1.7 1999/09/18 19:38:50 jsm Exp $ */ +/* $NetBSD: unstr.c,v 1.8 2003/08/07 09:37:15 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\ #if 0 static char sccsid[] = "@(#)unstr.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: unstr.c,v 1.7 1999/09/18 19:38:50 jsm Exp $"); +__RCSID("$NetBSD: unstr.c,v 1.8 2003/08/07 09:37:15 agc Exp $"); #endif #endif /* not lint */ diff --git a/gomoku/bdinit.c b/gomoku/bdinit.c index 2a80329..53ea7d2 100644 --- a/gomoku/bdinit.c +++ b/gomoku/bdinit.c @@ -1,4 +1,4 @@ -/* $NetBSD: bdinit.c,v 1.4 1997/10/10 13:36:01 lukem Exp $ */ +/* $NetBSD: bdinit.c,v 1.5 2003/08/07 09:37:15 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "from: @(#)bdinit.c 8.2 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: bdinit.c,v 1.4 1997/10/10 13:36:01 lukem Exp $"); +__RCSID("$NetBSD: bdinit.c,v 1.5 2003/08/07 09:37:15 agc Exp $"); #endif #endif /* not lint */ diff --git a/gomoku/bdisp.c b/gomoku/bdisp.c index cf719bb..522d92f 100644 --- a/gomoku/bdisp.c +++ b/gomoku/bdisp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bdisp.c,v 1.7 2001/02/05 00:30:38 christos Exp $ */ +/* $NetBSD: bdisp.c,v 1.8 2003/08/07 09:37:16 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)bdisp.c 8.2 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: bdisp.c,v 1.7 2001/02/05 00:30:38 christos Exp $"); +__RCSID("$NetBSD: bdisp.c,v 1.8 2003/08/07 09:37:16 agc Exp $"); #endif #endif /* not lint */ diff --git a/gomoku/gomoku.6 b/gomoku/gomoku.6 index 29056b2..f78eb0e 100644 --- a/gomoku/gomoku.6 +++ b/gomoku/gomoku.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: gomoku.6,v 1.9 2002/09/26 18:32:01 wiz Exp $ +.\" $NetBSD: gomoku.6,v 1.10 2003/08/07 09:37:17 agc Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/gomoku/gomoku.h b/gomoku/gomoku.h index 0798402..ae0b017 100644 --- a/gomoku/gomoku.h +++ b/gomoku/gomoku.h @@ -1,4 +1,4 @@ -/* $NetBSD: gomoku.h,v 1.7 1999/09/13 17:18:57 jsm Exp $ */ +/* $NetBSD: gomoku.h,v 1.8 2003/08/07 09:37:17 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/gomoku/main.c b/gomoku/main.c index e6cbbcb..10c16ab 100644 --- a/gomoku/main.c +++ b/gomoku/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.10 2000/05/08 07:56:03 mycroft Exp $ */ +/* $NetBSD: main.c,v 1.11 2003/08/07 09:37:17 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\ #if 0 static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: main.c,v 1.10 2000/05/08 07:56:03 mycroft Exp $"); +__RCSID("$NetBSD: main.c,v 1.11 2003/08/07 09:37:17 agc Exp $"); #endif #endif /* not lint */ diff --git a/gomoku/makemove.c b/gomoku/makemove.c index 50decd4..f855d39 100644 --- a/gomoku/makemove.c +++ b/gomoku/makemove.c @@ -1,4 +1,4 @@ -/* $NetBSD: makemove.c,v 1.6 2000/03/13 23:57:23 soren Exp $ */ +/* $NetBSD: makemove.c,v 1.7 2003/08/07 09:37:17 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)makemove.c 8.2 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: makemove.c,v 1.6 2000/03/13 23:57:23 soren Exp $"); +__RCSID("$NetBSD: makemove.c,v 1.7 2003/08/07 09:37:17 agc Exp $"); #endif #endif /* not lint */ diff --git a/gomoku/pickmove.c b/gomoku/pickmove.c index 06ccbdd..d740325 100644 --- a/gomoku/pickmove.c +++ b/gomoku/pickmove.c @@ -1,4 +1,4 @@ -/* $NetBSD: pickmove.c,v 1.9 1999/09/18 19:38:51 jsm Exp $ */ +/* $NetBSD: pickmove.c,v 1.10 2003/08/07 09:37:17 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)pickmove.c 8.2 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: pickmove.c,v 1.9 1999/09/18 19:38:51 jsm Exp $"); +__RCSID("$NetBSD: pickmove.c,v 1.10 2003/08/07 09:37:17 agc Exp $"); #endif #endif /* not lint */ diff --git a/gomoku/stoc.c b/gomoku/stoc.c index a9fbef5..16488e6 100644 --- a/gomoku/stoc.c +++ b/gomoku/stoc.c @@ -1,4 +1,4 @@ -/* $NetBSD: stoc.c,v 1.6 2000/07/03 03:57:41 matt Exp $ */ +/* $NetBSD: stoc.c,v 1.7 2003/08/07 09:37:18 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)stoc.c 8.1 (Berkeley) 7/24/94"; #else -__RCSID("$NetBSD: stoc.c,v 1.6 2000/07/03 03:57:41 matt Exp $"); +__RCSID("$NetBSD: stoc.c,v 1.7 2003/08/07 09:37:18 agc Exp $"); #endif #endif /* not lint */ diff --git a/hack/.cvsignore b/hack/.cvsignore new file mode 100644 index 0000000..282c0f3 --- /dev/null +++ b/hack/.cvsignore @@ -0,0 +1,10 @@ +a.out +*.d +*.i +*.s +*.d.tmp +hack +makedefs +pathnames.h +hack.6 +hack.onames.h diff --git a/hack/COPYRIGHT b/hack/COPYRIGHT index 74b7ecf..0010379 100644 --- a/hack/COPYRIGHT +++ b/hack/COPYRIGHT @@ -1,4 +1,4 @@ -$NetBSD: COPYRIGHT,v 1.2 1995/03/23 08:29:05 cgd Exp $ +$NetBSD: COPYRIGHT,v 1.3 2003/04/02 18:36:33 jsm Exp $ Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, Amsterdam diff --git a/hack/COPYRIGHT-JF b/hack/COPYRIGHT-JF index c967f8f..082e8d5 100644 --- a/hack/COPYRIGHT-JF +++ b/hack/COPYRIGHT-JF @@ -1,4 +1,4 @@ -$NetBSD$ +$NetBSD: COPYRIGHT-JF,v 1.1 2003/04/02 18:36:33 jsm Exp $ /* * Copyright (c) 1982 Jay Fenlason diff --git a/hack/Makefile.bsd b/hack/Makefile.bsd index e40ece4..454be16 100644 --- a/hack/Makefile.bsd +++ b/hack/Makefile.bsd @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.33 2002/03/05 21:29:56 thorpej Exp $ +# $NetBSD: Makefile,v 1.39 2003/11/16 14:14:18 lukem Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 .include PROG= hack CPPFLAGS+=-I. -SRCS+= hack.onames.h +DPSRCS+=hack.onames.h hack.h SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \ hack.do.c hack.do_name.c hack.do_wear.c hack.dog.c hack.eat.c \ hack.end.c hack.engrave.c hack.fight.c hack.invent.c hack.ioctl.c \ @@ -22,39 +22,33 @@ DPADD+= ${LIBTERM} ${LIBCOMPAT} LDADD+= -ltermcap HIDEGAME=hidegame SETGIDGAME=yes -CLEANFILES+=hack.onames.h makedefs +CLEANFILES+=makedefs makedefs.lo FILES=help hh data FILESDIR=/var/games/hackdir +CLEANFILES+=hack.onames.h hack.onames.h: makedefs def.objects.h + ${_MKTARGET_CREATE} ./makedefs ${.CURDIR}/def.objects.h > hack.onames.h -makedefs: makedefs.c - ${HOST_LINK.c} -o makedefs ${.CURDIR}/makedefs.c +makedefs: makedefs.lo + ${_MKTARGET_LINK} + ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} hack.h: hack.onames.h -alloc.o hack.Decl.o hack.apply.o hack.bones.o hack.o hack.cmd.o hack.do.o \ - hack.do_name.o hack.do_wear.o hack.dog.o hack.eat.o hack.end.o \ - hack.engrave.o hack.fight.o hack.invent.o hack.ioctl.o hack.lev.o \ - hack.main.o hack.makemon.o hack.mhitu.o hack.mklev.o hack.mkmaze.o \ - hack.mkobj.o hack.mkshop.o hack.mon.o hack.monst.o hack.o_init.o \ - hack.objnam.o hack.options.o hack.pager.o hack.potion.o hack.pri.o \ - hack.read.o hack.rip.o hack.rumors.o hack.save.o hack.search.o hack.shk.o \ - hack.shknam.o hack.steal.o hack.termcap.o hack.timeout.o hack.topl.o \ - hack.track.o hack.trap.o hack.tty.o hack.u_init.o hack.unix.o hack.vault.o \ - hack.version.o hack.wield.o hack.wizard.o hack.worm.o hack.worn.o \ - hack.zap.o rnd.o: hack.h - .if !exists(${DESTDIR}${FILESDIR}/perm) afterinstall: clobber .endif clobber: + ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/perm ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/perm + ${_MKMSG_INSTALL} ${DESTDIR}/var/games/hackdir/record ${INSTALL_FILE} -o games -g games -m 660 /dev/null \ ${DESTDIR}/var/games/hackdir/record + ${_MKMSG_REMOVE} "${DESTDIR}/var/games/hackdir/bones*" rm -f ${DESTDIR}/var/games/hackdir/bones* .include diff --git a/hack/alloc.c b/hack/alloc.c index 41ebb2f..53dc51e 100644 --- a/hack/alloc.c +++ b/hack/alloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: alloc.c,v 1.4 1997/10/19 16:56:47 christos Exp $ */ +/* $NetBSD: alloc.c,v 1.5 2003/04/02 18:36:33 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: alloc.c,v 1.4 1997/10/19 16:56:47 christos Exp $"); +__RCSID("$NetBSD: alloc.c,v 1.5 2003/04/02 18:36:33 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/config.h b/hack/config.h index e99c20d..03a8b02 100644 --- a/hack/config.h +++ b/hack/config.h @@ -1,4 +1,4 @@ -/* $NetBSD: config.h,v 1.6 2001/01/16 02:50:28 cgd Exp $ */ +/* $NetBSD: config.h,v 1.7 2003/04/02 18:36:33 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -88,12 +88,11 @@ /* #define PYRAMID_BUG */ /* avoid a bug on the Pyramid */ /* #define NOWAITINCLUDE */ /* neither nor exists */ -//#define WIZARD "bruno" /* the person allowed to use the -D option */ /* * Debian mods: use root for WIZARD, and move files that are static to * /usr/share/ -- JEH */ -#define WIZARD "root" /* the person allowed to use the -D option */ +#define WIZARD "root" /* the person allowed to use the -D option */ #define SHAREDIR "/usr/share/games/bsdgames/hack/" #define RECORD "record"/* the file containing the list of topscorers */ #define NEWS "news" /* the file containing the latest hack news */ diff --git a/hack/date.h b/hack/date.h index ebe120a..356cd2e 100644 --- a/hack/date.h +++ b/hack/date.h @@ -1,4 +1,4 @@ -/* $NetBSD: date.h,v 1.4 2001/03/25 20:43:58 jsm Exp $ */ +/* $NetBSD: date.h,v 1.5 2003/04/02 18:36:33 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.edog.h b/hack/def.edog.h index dc8b314..4d6e447 100644 --- a/hack/def.edog.h +++ b/hack/def.edog.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.edog.h,v 1.4 1997/10/19 16:56:51 christos Exp $ */ +/* $NetBSD: def.edog.h,v 1.5 2003/04/02 18:36:33 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.eshk.h b/hack/def.eshk.h index 1094884..5ef1a64 100644 --- a/hack/def.eshk.h +++ b/hack/def.eshk.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.eshk.h,v 1.4 1997/10/19 16:56:53 christos Exp $ */ +/* $NetBSD: def.eshk.h,v 1.5 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.flag.h b/hack/def.flag.h index d59ded9..6fef096 100644 --- a/hack/def.flag.h +++ b/hack/def.flag.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.flag.h,v 1.4 1997/10/19 16:56:56 christos Exp $ */ +/* $NetBSD: def.flag.h,v 1.5 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.func_tab.h b/hack/def.func_tab.h index 123f902..062bda8 100644 --- a/hack/def.func_tab.h +++ b/hack/def.func_tab.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.func_tab.h,v 1.5 2001/03/25 20:43:58 jsm Exp $ */ +/* $NetBSD: def.func_tab.h,v 1.6 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.gen.h b/hack/def.gen.h index 907522d..ea9fe65 100644 --- a/hack/def.gen.h +++ b/hack/def.gen.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.gen.h,v 1.4 1997/10/19 16:57:01 christos Exp $ */ +/* $NetBSD: def.gen.h,v 1.5 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.gold.h b/hack/def.gold.h index 91fc193..e526ef7 100644 --- a/hack/def.gold.h +++ b/hack/def.gold.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.gold.h,v 1.4 1997/10/19 16:57:03 christos Exp $ */ +/* $NetBSD: def.gold.h,v 1.5 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.mkroom.h b/hack/def.mkroom.h index bf5145f..176fc87 100644 --- a/hack/def.mkroom.h +++ b/hack/def.mkroom.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.mkroom.h,v 1.4 1997/10/19 16:57:05 christos Exp $ */ +/* $NetBSD: def.mkroom.h,v 1.5 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.monst.h b/hack/def.monst.h index c22d44d..0176ac3 100644 --- a/hack/def.monst.h +++ b/hack/def.monst.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.monst.h,v 1.6 2001/03/25 20:43:58 jsm Exp $ */ +/* $NetBSD: def.monst.h,v 1.7 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.obj.h b/hack/def.obj.h index 4b86aec..b4bef62 100644 --- a/hack/def.obj.h +++ b/hack/def.obj.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.obj.h,v 1.4 1997/10/19 16:57:09 christos Exp $ */ +/* $NetBSD: def.obj.h,v 1.5 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.objclass.h b/hack/def.objclass.h index 5641384..c382956 100644 --- a/hack/def.objclass.h +++ b/hack/def.objclass.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.objclass.h,v 1.5 2001/03/25 20:43:58 jsm Exp $ */ +/* $NetBSD: def.objclass.h,v 1.6 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.objects.h b/hack/def.objects.h index 87dc1d6..e9b34d1 100644 --- a/hack/def.objects.h +++ b/hack/def.objects.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.objects.h,v 1.5 2001/03/25 20:43:58 jsm Exp $ */ +/* $NetBSD: def.objects.h,v 1.6 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.permonst.h b/hack/def.permonst.h index 4870297..f00fb19 100644 --- a/hack/def.permonst.h +++ b/hack/def.permonst.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.permonst.h,v 1.5 2001/03/25 20:43:58 jsm Exp $ */ +/* $NetBSD: def.permonst.h,v 1.6 2003/04/02 18:36:34 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.rm.h b/hack/def.rm.h index 76090f9..bc54059 100644 --- a/hack/def.rm.h +++ b/hack/def.rm.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.rm.h,v 1.5 2001/01/16 02:50:28 cgd Exp $ */ +/* $NetBSD: def.rm.h,v 1.6 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.trap.h b/hack/def.trap.h index 1a43618..6521332 100644 --- a/hack/def.trap.h +++ b/hack/def.trap.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.trap.h,v 1.4 1997/10/19 16:57:23 christos Exp $ */ +/* $NetBSD: def.trap.h,v 1.5 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/def.wseg.h b/hack/def.wseg.h index f829c97..df79b1d 100644 --- a/hack/def.wseg.h +++ b/hack/def.wseg.h @@ -1,4 +1,4 @@ -/* $NetBSD: def.wseg.h,v 1.4 1997/10/19 16:57:25 christos Exp $ */ +/* $NetBSD: def.wseg.h,v 1.5 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/hack.6.in b/hack/hack.6.in index f7894e2..f83de1b 100644 --- a/hack/hack.6.in +++ b/hack/hack.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: hack.6,v 1.11 2003/02/25 10:34:45 wiz Exp $ -*- nroff -*- +.\" $NetBSD: hack.6,v 1.13 2003/06/27 22:48:35 wiz Exp $ -*- nroff -*- .\" .\" Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, .\" Amsterdam @@ -83,7 +83,7 @@ a real cave instead of dull rectangles - try Quest.) .Pp To get started you really only need to know two commands. The command -.Ic ? +.Ic \&? will give you a list of the available commands and the command .Ic / will identify the things you see on the screen. diff --git a/hack/hack.Decl.c b/hack/hack.Decl.c index b06ca85..9166f5e 100644 --- a/hack/hack.Decl.c +++ b/hack/hack.Decl.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.Decl.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.Decl.c,v 1.6 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.Decl.c,v 1.5 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.Decl.c,v 1.6 2003/04/02 18:36:35 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.apply.c b/hack/hack.apply.c index 2036d87..91a222b 100644 --- a/hack/hack.apply.c +++ b/hack/hack.apply.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.apply.c,v 1.6 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.apply.c,v 1.7 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.apply.c,v 1.6 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.apply.c,v 1.7 2003/04/02 18:36:35 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.bones.c b/hack/hack.bones.c index 0273508..35c4597 100644 --- a/hack/hack.bones.c +++ b/hack/hack.bones.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.bones.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.bones.c,v 1.6 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.bones.c,v 1.5 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.bones.c,v 1.6 2003/04/02 18:36:35 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.c b/hack/hack.c index 06a0bc8..05141af 100644 --- a/hack/hack.c +++ b/hack/hack.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.c,v 1.6 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.c,v 1.5 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.c,v 1.6 2003/04/02 18:36:35 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.cmd.c b/hack/hack.cmd.c index 5329c1e..43f4ebd 100644 --- a/hack/hack.cmd.c +++ b/hack/hack.cmd.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.cmd.c,v 1.6 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.cmd.c,v 1.7 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.cmd.c,v 1.6 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.cmd.c,v 1.7 2003/04/02 18:36:35 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.do.c b/hack/hack.do.c index 907e6de..c02be1d 100644 --- a/hack/hack.do.c +++ b/hack/hack.do.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.do.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.do.c,v 1.6 2003/04/02 18:36:35 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.do.c,v 1.5 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.do.c,v 1.6 2003/04/02 18:36:35 jsm Exp $"); #endif /* not lint */ /* Contains code for 'd', 'D' (drop), '>', '<' (up, down) and 't' (throw) */ diff --git a/hack/hack.do_name.c b/hack/hack.do_name.c index 3cdf9c7..e58ac6d 100644 --- a/hack/hack.do_name.c +++ b/hack/hack.do_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.do_name.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.do_name.c,v 1.6 2003/04/02 18:36:36 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.do_name.c,v 1.5 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.do_name.c,v 1.6 2003/04/02 18:36:36 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.do_wear.c b/hack/hack.do_wear.c index f273dfe..a031d44 100644 --- a/hack/hack.do_wear.c +++ b/hack/hack.do_wear.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.do_wear.c,v 1.4 1997/10/19 16:57:48 christos Exp $ */ +/* $NetBSD: hack.do_wear.c,v 1.5 2003/04/02 18:36:36 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.do_wear.c,v 1.4 1997/10/19 16:57:48 christos Exp $"); +__RCSID("$NetBSD: hack.do_wear.c,v 1.5 2003/04/02 18:36:36 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.dog.c b/hack/hack.dog.c index 4dd6ec3..db047e1 100644 --- a/hack/hack.dog.c +++ b/hack/hack.dog.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.dog.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */ +/* $NetBSD: hack.dog.c,v 1.6 2003/04/02 18:36:36 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.dog.c,v 1.5 2001/03/25 20:43:59 jsm Exp $"); +__RCSID("$NetBSD: hack.dog.c,v 1.6 2003/04/02 18:36:36 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.eat.c b/hack/hack.eat.c index 6fce735..e533ca5 100644 --- a/hack/hack.eat.c +++ b/hack/hack.eat.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.eat.c,v 1.5 2001/03/25 20:44:00 jsm Exp $ */ +/* $NetBSD: hack.eat.c,v 1.6 2003/04/02 18:36:36 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.eat.c,v 1.5 2001/03/25 20:44:00 jsm Exp $"); +__RCSID("$NetBSD: hack.eat.c,v 1.6 2003/04/02 18:36:36 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.end.c b/hack/hack.end.c index 26cfb52..2ffa5cf 100644 --- a/hack/hack.end.c +++ b/hack/hack.end.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.end.c,v 1.5 2001/03/25 20:44:00 jsm Exp $ */ +/* $NetBSD: hack.end.c,v 1.6 2003/04/02 18:36:36 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.end.c,v 1.5 2001/03/25 20:44:00 jsm Exp $"); +__RCSID("$NetBSD: hack.end.c,v 1.6 2003/04/02 18:36:36 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.engrave.c b/hack/hack.engrave.c index 89d8105..a0ab117 100644 --- a/hack/hack.engrave.c +++ b/hack/hack.engrave.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.engrave.c,v 1.5 2001/03/25 20:44:00 jsm Exp $ */ +/* $NetBSD: hack.engrave.c,v 1.6 2003/04/02 18:36:36 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.engrave.c,v 1.5 2001/03/25 20:44:00 jsm Exp $"); +__RCSID("$NetBSD: hack.engrave.c,v 1.6 2003/04/02 18:36:36 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.fight.c b/hack/hack.fight.c index 7d16031..3929a3c 100644 --- a/hack/hack.fight.c +++ b/hack/hack.fight.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.fight.c,v 1.5 2001/03/25 20:44:00 jsm Exp $ */ +/* $NetBSD: hack.fight.c,v 1.6 2003/04/02 18:36:36 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.fight.c,v 1.5 2001/03/25 20:44:00 jsm Exp $"); +__RCSID("$NetBSD: hack.fight.c,v 1.6 2003/04/02 18:36:36 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.h b/hack/hack.h index 5110f3f..b088690 100644 --- a/hack/hack.h +++ b/hack/hack.h @@ -1,4 +1,4 @@ -/* $NetBSD: hack.h,v 1.8 2001/03/25 20:44:00 jsm Exp $ */ +/* $NetBSD: hack.h,v 1.9 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/hack.invent.c b/hack/hack.invent.c index a60cfe6..d4a7d2e 100644 --- a/hack/hack.invent.c +++ b/hack/hack.invent.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.invent.c,v 1.7 2001/03/25 20:44:00 jsm Exp $ */ +/* $NetBSD: hack.invent.c,v 1.8 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.invent.c,v 1.7 2001/03/25 20:44:00 jsm Exp $"); +__RCSID("$NetBSD: hack.invent.c,v 1.8 2003/04/02 18:36:37 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.ioctl.c b/hack/hack.ioctl.c index 3cb4939..ebf2ae8 100644 --- a/hack/hack.ioctl.c +++ b/hack/hack.ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.ioctl.c,v 1.6 1997/10/19 16:58:07 christos Exp $ */ +/* $NetBSD: hack.ioctl.c,v 1.7 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.ioctl.c,v 1.6 1997/10/19 16:58:07 christos Exp $"); +__RCSID("$NetBSD: hack.ioctl.c,v 1.7 2003/04/02 18:36:37 jsm Exp $"); #endif /* not lint */ /* diff --git a/hack/hack.lev.c b/hack/hack.lev.c index 062e3e1..c12144a 100644 --- a/hack/hack.lev.c +++ b/hack/hack.lev.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.lev.c,v 1.5 2001/03/25 20:44:01 jsm Exp $ */ +/* $NetBSD: hack.lev.c,v 1.6 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.lev.c,v 1.5 2001/03/25 20:44:01 jsm Exp $"); +__RCSID("$NetBSD: hack.lev.c,v 1.6 2003/04/02 18:36:37 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.main.c b/hack/hack.main.c index 6315087..7530220 100644 --- a/hack/hack.main.c +++ b/hack/hack.main.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.main.c,v 1.7 2002/05/26 00:12:12 wiz Exp $ */ +/* $NetBSD: hack.main.c,v 1.8 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.main.c,v 1.7 2002/05/26 00:12:12 wiz Exp $"); +__RCSID("$NetBSD: hack.main.c,v 1.8 2003/04/02 18:36:37 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.makemon.c b/hack/hack.makemon.c index 126e252..e13e17a 100644 --- a/hack/hack.makemon.c +++ b/hack/hack.makemon.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.makemon.c,v 1.5 2001/03/25 20:44:01 jsm Exp $ */ +/* $NetBSD: hack.makemon.c,v 1.6 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.makemon.c,v 1.5 2001/03/25 20:44:01 jsm Exp $"); +__RCSID("$NetBSD: hack.makemon.c,v 1.6 2003/04/02 18:36:37 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.mfndpos.h b/hack/hack.mfndpos.h index 1f8775e..43c8b1c 100644 --- a/hack/hack.mfndpos.h +++ b/hack/hack.mfndpos.h @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mfndpos.h,v 1.4 1997/10/19 16:58:19 christos Exp $ */ +/* $NetBSD: hack.mfndpos.h,v 1.5 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/hack.mhitu.c b/hack/hack.mhitu.c index bf1319c..db1720f 100644 --- a/hack/hack.mhitu.c +++ b/hack/hack.mhitu.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mhitu.c,v 1.5 2001/03/25 20:44:01 jsm Exp $ */ +/* $NetBSD: hack.mhitu.c,v 1.6 2003/04/02 18:36:37 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.mhitu.c,v 1.5 2001/03/25 20:44:01 jsm Exp $"); +__RCSID("$NetBSD: hack.mhitu.c,v 1.6 2003/04/02 18:36:37 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.mklev.c b/hack/hack.mklev.c index dd66638..2a4fc05 100644 --- a/hack/hack.mklev.c +++ b/hack/hack.mklev.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mklev.c,v 1.5 2001/03/25 20:44:01 jsm Exp $ */ +/* $NetBSD: hack.mklev.c,v 1.6 2003/04/02 18:36:38 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.mklev.c,v 1.5 2001/03/25 20:44:01 jsm Exp $"); +__RCSID("$NetBSD: hack.mklev.c,v 1.6 2003/04/02 18:36:38 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.mkmaze.c b/hack/hack.mkmaze.c index aa70c1f..471edc2 100644 --- a/hack/hack.mkmaze.c +++ b/hack/hack.mkmaze.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mkmaze.c,v 1.5 2001/03/25 20:44:01 jsm Exp $ */ +/* $NetBSD: hack.mkmaze.c,v 1.6 2003/04/02 18:36:38 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.mkmaze.c,v 1.5 2001/03/25 20:44:01 jsm Exp $"); +__RCSID("$NetBSD: hack.mkmaze.c,v 1.6 2003/04/02 18:36:38 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.mkobj.c b/hack/hack.mkobj.c index 10ad24c..4a72255 100644 --- a/hack/hack.mkobj.c +++ b/hack/hack.mkobj.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mkobj.c,v 1.5 2001/03/25 20:44:01 jsm Exp $ */ +/* $NetBSD: hack.mkobj.c,v 1.6 2003/04/02 18:36:38 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.mkobj.c,v 1.5 2001/03/25 20:44:01 jsm Exp $"); +__RCSID("$NetBSD: hack.mkobj.c,v 1.6 2003/04/02 18:36:38 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.mkshop.c b/hack/hack.mkshop.c index 8706a08..e30cb54 100644 --- a/hack/hack.mkshop.c +++ b/hack/hack.mkshop.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mkshop.c,v 1.7 2002/08/22 01:49:34 chuck Exp $ */ +/* $NetBSD: hack.mkshop.c,v 1.8 2003/04/02 18:36:38 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.mkshop.c,v 1.7 2002/08/22 01:49:34 chuck Exp $"); +__RCSID("$NetBSD: hack.mkshop.c,v 1.8 2003/04/02 18:36:38 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.mon.c b/hack/hack.mon.c index bad4437..70111c2 100644 --- a/hack/hack.mon.c +++ b/hack/hack.mon.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.mon.c,v 1.5 2001/03/25 20:44:01 jsm Exp $ */ +/* $NetBSD: hack.mon.c,v 1.6 2003/04/02 18:36:38 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.mon.c,v 1.5 2001/03/25 20:44:01 jsm Exp $"); +__RCSID("$NetBSD: hack.mon.c,v 1.6 2003/04/02 18:36:38 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.monst.c b/hack/hack.monst.c index 46f7313..4c30814 100644 --- a/hack/hack.monst.c +++ b/hack/hack.monst.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.monst.c,v 1.5 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.monst.c,v 1.6 2003/04/02 18:36:38 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.monst.c,v 1.5 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.monst.c,v 1.6 2003/04/02 18:36:38 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.o_init.c b/hack/hack.o_init.c index 7df09fd..dc5bf93 100644 --- a/hack/hack.o_init.c +++ b/hack/hack.o_init.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.o_init.c,v 1.6 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.o_init.c,v 1.7 2003/04/02 18:36:38 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.o_init.c,v 1.6 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.o_init.c,v 1.7 2003/04/02 18:36:38 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.objnam.c b/hack/hack.objnam.c index 7d1fd2c..10456c7 100644 --- a/hack/hack.objnam.c +++ b/hack/hack.objnam.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.objnam.c,v 1.5 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.objnam.c,v 1.6 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.objnam.c,v 1.5 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.objnam.c,v 1.6 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.options.c b/hack/hack.options.c index a25dfbe..39fe328 100644 --- a/hack/hack.options.c +++ b/hack/hack.options.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.options.c,v 1.5 2001/02/05 00:37:43 christos Exp $ */ +/* $NetBSD: hack.options.c,v 1.6 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.options.c,v 1.5 2001/02/05 00:37:43 christos Exp $"); +__RCSID("$NetBSD: hack.options.c,v 1.6 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.pager.c b/hack/hack.pager.c index 0a9918f..d72d800 100644 --- a/hack/hack.pager.c +++ b/hack/hack.pager.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.pager.c,v 1.6 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.pager.c,v 1.7 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.pager.c,v 1.6 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.pager.c,v 1.7 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ /* This file contains the command routine dowhatis() and a pager. */ diff --git a/hack/hack.potion.c b/hack/hack.potion.c index 984758d..9d210d4 100644 --- a/hack/hack.potion.c +++ b/hack/hack.potion.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.potion.c,v 1.5 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.potion.c,v 1.6 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.potion.c,v 1.5 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.potion.c,v 1.6 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.pri.c b/hack/hack.pri.c index f240f52..4305fe6 100644 --- a/hack/hack.pri.c +++ b/hack/hack.pri.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.pri.c,v 1.7 2002/05/26 00:12:12 wiz Exp $ */ +/* $NetBSD: hack.pri.c,v 1.7 1.8 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.pri.c,v 1.7 2002/05/26 00:12:12 wiz Exp $"); +__RCSID("$NetBSD: hack.pri.c,v 1.8 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.read.c b/hack/hack.read.c index 8304604..f43f0b9 100644 --- a/hack/hack.read.c +++ b/hack/hack.read.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.read.c,v 1.7 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.read.c,v 1.8 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.read.c,v 1.7 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.read.c,v 1.8 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.rip.c b/hack/hack.rip.c index 781e1ad..a29a3ea 100644 --- a/hack/hack.rip.c +++ b/hack/hack.rip.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.rip.c,v 1.6 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.rip.c,v 1.7 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.rip.c,v 1.6 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.rip.c,v 1.7 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.rumors.c b/hack/hack.rumors.c index a042c22..383bba9 100644 --- a/hack/hack.rumors.c +++ b/hack/hack.rumors.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $ */ +/* $NetBSD: hack.rumors.c,v 1.5 2003/04/02 18:36:39 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.rumors.c,v 1.4 1997/10/19 16:58:55 christos Exp $"); +__RCSID("$NetBSD: hack.rumors.c,v 1.5 2003/04/02 18:36:39 jsm Exp $"); #endif /* not lint */ #include "hack.h" /* for RUMORFILE and BSD (strchr) */ diff --git a/hack/hack.save.c b/hack/hack.save.c index 4e72596..401489b 100644 --- a/hack/hack.save.c +++ b/hack/hack.save.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.save.c,v 1.7 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.save.c,v 1.8 2003/04/02 18:36:40 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.save.c,v 1.7 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.save.c,v 1.8 2003/04/02 18:36:40 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.search.c b/hack/hack.search.c index 3221f99..9c00d6b 100644 --- a/hack/hack.search.c +++ b/hack/hack.search.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.search.c,v 1.4 1997/10/19 16:58:59 christos Exp $ */ +/* $NetBSD: hack.search.c,v 1.5 2003/04/02 18:36:40 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.search.c,v 1.4 1997/10/19 16:58:59 christos Exp $"); +__RCSID("$NetBSD: hack.search.c,v 1.5 2003/04/02 18:36:40 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.sh b/hack/hack.sh index cccf1f5..8f29137 100644 --- a/hack/hack.sh +++ b/hack/hack.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: hack.sh,v 1.2 1995/03/23 08:31:30 cgd Exp $ +# $NetBSD: hack.sh,v 1.3 2003/04/02 18:36:40 jsm Exp $ # # Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, diff --git a/hack/hack.shk.c b/hack/hack.shk.c index 1a722cd..2e826bd 100644 --- a/hack/hack.shk.c +++ b/hack/hack.shk.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.shk.c,v 1.5 2001/03/25 20:44:02 jsm Exp $ */ +/* $NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.shk.c,v 1.5 2001/03/25 20:44:02 jsm Exp $"); +__RCSID("$NetBSD: hack.shk.c,v 1.6 2003/04/02 18:36:40 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.shknam.c b/hack/hack.shknam.c index c87e366..de982d7 100644 --- a/hack/hack.shknam.c +++ b/hack/hack.shknam.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.shknam.c,v 1.5 2001/03/25 20:44:03 jsm Exp $ */ +/* $NetBSD: hack.shknam.c,v 1.6 2003/04/02 18:36:40 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.shknam.c,v 1.5 2001/03/25 20:44:03 jsm Exp $"); +__RCSID("$NetBSD: hack.shknam.c,v 1.6 2003/04/02 18:36:40 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.steal.c b/hack/hack.steal.c index 7045356..3991205 100644 --- a/hack/hack.steal.c +++ b/hack/hack.steal.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.steal.c,v 1.4 1997/10/19 16:59:04 christos Exp $ */ +/* $NetBSD: hack.steal.c,v 1.5 2003/04/02 18:36:40 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.steal.c,v 1.4 1997/10/19 16:59:04 christos Exp $"); +__RCSID("$NetBSD: hack.steal.c,v 1.5 2003/04/02 18:36:40 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.termcap.c b/hack/hack.termcap.c index e72e178..ad6a71b 100644 --- a/hack/hack.termcap.c +++ b/hack/hack.termcap.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.termcap.c,v 1.11 2001/11/02 18:27:00 christos Exp $ */ +/* $NetBSD: hack.termcap.c,v 1.12 2003/04/02 18:36:40 jsm Exp $ */ /* For Linux: still using old termcap interface from version 1.9. */ /* @@ -64,7 +64,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.termcap.c,v 1.11 2001/11/02 18:27:00 christos Exp $"); +__RCSID("$NetBSD: hack.termcap.c,v 1.12 2003/04/02 18:36:40 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.timeout.c b/hack/hack.timeout.c index cfeb69d..ef239e4 100644 --- a/hack/hack.timeout.c +++ b/hack/hack.timeout.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.timeout.c,v 1.5 2001/03/25 20:44:03 jsm Exp $ */ +/* $NetBSD: hack.timeout.c,v 1.6 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.timeout.c,v 1.5 2001/03/25 20:44:03 jsm Exp $"); +__RCSID("$NetBSD: hack.timeout.c,v 1.6 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.topl.c b/hack/hack.topl.c index 710df7b..227e2e0 100644 --- a/hack/hack.topl.c +++ b/hack/hack.topl.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.topl.c,v 1.6 2002/05/26 00:12:12 wiz Exp $ */ +/* $NetBSD: hack.topl.c,v 1.7 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.topl.c,v 1.6 2002/05/26 00:12:12 wiz Exp $"); +__RCSID("$NetBSD: hack.topl.c,v 1.7 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.track.c b/hack/hack.track.c index bf106a3..8e05443 100644 --- a/hack/hack.track.c +++ b/hack/hack.track.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.track.c,v 1.4 1997/10/19 16:59:11 christos Exp $ */ +/* $NetBSD: hack.track.c,v 1.5 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.track.c,v 1.4 1997/10/19 16:59:11 christos Exp $"); +__RCSID("$NetBSD: hack.track.c,v 1.5 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.trap.c b/hack/hack.trap.c index b39603f..9d7a805 100644 --- a/hack/hack.trap.c +++ b/hack/hack.trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.trap.c,v 1.6 2001/03/25 20:44:03 jsm Exp $ */ +/* $NetBSD: hack.trap.c,v 1.7 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.trap.c,v 1.6 2001/03/25 20:44:03 jsm Exp $"); +__RCSID("$NetBSD: hack.trap.c,v 1.7 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.tty.c b/hack/hack.tty.c index 6f5d67a..642225b 100644 --- a/hack/hack.tty.c +++ b/hack/hack.tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.tty.c,v 1.10 2002/05/26 00:12:12 wiz Exp $ */ +/* $NetBSD: hack.tty.c,v 1.12 2003/08/07 09:37:19 agc Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)hack.tty.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: hack.tty.c,v 1.10 2002/05/26 00:12:12 wiz Exp $"); +__RCSID("$NetBSD: hack.tty.c,v 1.12 2003/08/07 09:37:19 agc Exp $"); #endif #endif /* not lint */ diff --git a/hack/hack.u_init.c b/hack/hack.u_init.c index c649090..97246c6 100644 --- a/hack/hack.u_init.c +++ b/hack/hack.u_init.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.u_init.c,v 1.6 2001/03/25 20:44:03 jsm Exp $ */ +/* $NetBSD: hack.u_init.c,v 1.7 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.u_init.c,v 1.6 2001/03/25 20:44:03 jsm Exp $"); +__RCSID("$NetBSD: hack.u_init.c,v 1.7 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.unix.c b/hack/hack.unix.c index 5ac553c..13f9724 100644 --- a/hack/hack.unix.c +++ b/hack/hack.unix.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.unix.c,v 1.8 2001/03/25 20:44:03 jsm Exp $ */ +/* $NetBSD: hack.unix.c,v 1.9 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.unix.c,v 1.8 2001/03/25 20:44:03 jsm Exp $"); +__RCSID("$NetBSD: hack.unix.c,v 1.9 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ /* This file collects some Unix dependencies; hack.pager.c contains some more */ diff --git a/hack/hack.vault.c b/hack/hack.vault.c index ea52598..d2fdb60 100644 --- a/hack/hack.vault.c +++ b/hack/hack.vault.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.vault.c,v 1.5 2001/03/25 20:44:03 jsm Exp $ */ +/* $NetBSD: hack.vault.c,v 1.6 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.vault.c,v 1.5 2001/03/25 20:44:03 jsm Exp $"); +__RCSID("$NetBSD: hack.vault.c,v 1.6 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.version.c b/hack/hack.version.c index 36b0c85..b50c401 100644 --- a/hack/hack.version.c +++ b/hack/hack.version.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.version.c,v 1.4 1997/10/19 16:59:25 christos Exp $ */ +/* $NetBSD: hack.version.c,v 1.5 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.version.c,v 1.4 1997/10/19 16:59:25 christos Exp $"); +__RCSID("$NetBSD: hack.version.c,v 1.5 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include "date.h" diff --git a/hack/hack.wield.c b/hack/hack.wield.c index c9477fb..37ebcb0 100644 --- a/hack/hack.wield.c +++ b/hack/hack.wield.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.wield.c,v 1.5 2001/03/25 20:44:03 jsm Exp $ */ +/* $NetBSD: hack.wield.c,v 1.6 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.wield.c,v 1.5 2001/03/25 20:44:03 jsm Exp $"); +__RCSID("$NetBSD: hack.wield.c,v 1.6 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.wizard.c b/hack/hack.wizard.c index 18ed6bb..07a55c8 100644 --- a/hack/hack.wizard.c +++ b/hack/hack.wizard.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.wizard.c,v 1.5 2001/03/25 20:44:04 jsm Exp $ */ +/* $NetBSD: hack.wizard.c,v 1.6 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.wizard.c,v 1.5 2001/03/25 20:44:04 jsm Exp $"); +__RCSID("$NetBSD: hack.wizard.c,v 1.6 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ /* wizard code - inspired by rogue code from Merlyn Leroy (digi-g!brian) */ diff --git a/hack/hack.worm.c b/hack/hack.worm.c index 6d4c455..349c1c7 100644 --- a/hack/hack.worm.c +++ b/hack/hack.worm.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.worm.c,v 1.4 1997/10/19 16:59:30 christos Exp $ */ +/* $NetBSD: hack.worm.c,v 1.5 2003/04/02 18:36:41 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.worm.c,v 1.4 1997/10/19 16:59:30 christos Exp $"); +__RCSID("$NetBSD: hack.worm.c,v 1.5 2003/04/02 18:36:41 jsm Exp $"); #endif /* not lint */ #include diff --git a/hack/hack.worn.c b/hack/hack.worn.c index bb05618..953949a 100644 --- a/hack/hack.worn.c +++ b/hack/hack.worn.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.worn.c,v 1.4 1997/10/19 16:59:32 christos Exp $ */ +/* $NetBSD: hack.worn.c,v 1.5 2003/04/02 18:36:42 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.worn.c,v 1.4 1997/10/19 16:59:32 christos Exp $"); +__RCSID("$NetBSD: hack.worn.c,v 1.5 2003/04/02 18:36:42 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/hack.zap.c b/hack/hack.zap.c index 42d0b5b..afddab1 100644 --- a/hack/hack.zap.c +++ b/hack/hack.zap.c @@ -1,4 +1,4 @@ -/* $NetBSD: hack.zap.c,v 1.5 2001/03/25 20:44:04 jsm Exp $ */ +/* $NetBSD: hack.zap.c,v 1.6 2003/04/02 18:36:42 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: hack.zap.c,v 1.5 2001/03/25 20:44:04 jsm Exp $"); +__RCSID("$NetBSD: hack.zap.c,v 1.6 2003/04/02 18:36:42 jsm Exp $"); #endif /* not lint */ #include "hack.h" diff --git a/hack/makedefs.c b/hack/makedefs.c index ca53246..d5be809 100644 --- a/hack/makedefs.c +++ b/hack/makedefs.c @@ -1,4 +1,4 @@ -/* $NetBSD: makedefs.c,v 1.7 2001/03/25 20:44:04 jsm Exp $ */ +/* $NetBSD: makedefs.c,v 1.8 2003/04/02 18:36:42 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #ifndef lint static const char rcsid[] __attribute__((__unused__)) = - "$NetBSD: makedefs.c,v 1.7 2001/03/25 20:44:04 jsm Exp $"; + "$NetBSD: makedefs.c,v 1.8 2003/04/02 18:36:42 jsm Exp $"; #endif /* not lint */ #include diff --git a/hack/pathnames.h.in b/hack/pathnames.h.in index a03f407..7a22da4 100644 --- a/hack/pathnames.h.in +++ b/hack/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/23 08:32:27 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:19 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/hack/rnd.c b/hack/rnd.c index 5a24309..10f9312 100644 --- a/hack/rnd.c +++ b/hack/rnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rnd.c,v 1.4 1997/10/19 16:59:39 christos Exp $ */ +/* $NetBSD: rnd.c,v 1.5 2003/04/02 18:36:42 jsm Exp $ */ /* * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, @@ -63,7 +63,7 @@ #include #ifndef lint -__RCSID("$NetBSD: rnd.c,v 1.4 1997/10/19 16:59:39 christos Exp $"); +__RCSID("$NetBSD: rnd.c,v 1.5 2003/04/02 18:36:42 jsm Exp $"); #endif /* not lint */ #include diff --git a/hangman/endgame.c b/hangman/endgame.c index 56066b0..c329dbd 100644 --- a/hangman/endgame.c +++ b/hangman/endgame.c @@ -1,4 +1,4 @@ -/* $NetBSD: endgame.c,v 1.4 1997/10/11 01:16:26 lukem Exp $ */ +/* $NetBSD: endgame.c,v 1.5 2003/08/07 09:37:20 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)endgame.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: endgame.c,v 1.4 1997/10/11 01:16:26 lukem Exp $"); +__RCSID("$NetBSD: endgame.c,v 1.5 2003/08/07 09:37:20 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/extern.c b/hangman/extern.c index 9b9585e..d5cb8b2 100644 --- a/hangman/extern.c +++ b/hangman/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.7 2002/01/20 00:42:51 jsm Exp $ */ +/* $NetBSD: extern.c,v 1.8 2003/08/07 09:37:20 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.7 2002/01/20 00:42:51 jsm Exp $"); +__RCSID("$NetBSD: extern.c,v 1.8 2003/08/07 09:37:20 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/getguess.c b/hangman/getguess.c index 4f248bd..0dbac3b 100644 --- a/hangman/getguess.c +++ b/hangman/getguess.c @@ -1,4 +1,4 @@ -/* $NetBSD: getguess.c,v 1.7 1997/10/11 01:16:29 lukem Exp $ */ +/* $NetBSD: getguess.c,v 1.8 2003/08/07 09:37:21 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getguess.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: getguess.c,v 1.7 1997/10/11 01:16:29 lukem Exp $"); +__RCSID("$NetBSD: getguess.c,v 1.8 2003/08/07 09:37:21 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/getword.c b/hangman/getword.c index 571f0d0..8d8cc72 100644 --- a/hangman/getword.c +++ b/hangman/getword.c @@ -1,4 +1,4 @@ -/* $NetBSD: getword.c,v 1.7 2002/01/20 00:42:51 jsm Exp $ */ +/* $NetBSD: getword.c,v 1.8 2003/08/07 09:37:21 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getword.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: getword.c,v 1.7 2002/01/20 00:42:51 jsm Exp $"); +__RCSID("$NetBSD: getword.c,v 1.8 2003/08/07 09:37:21 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/hangman.6.in b/hangman/hangman.6.in index a0aefa0..c048334 100644 --- a/hangman/hangman.6.in +++ b/hangman/hangman.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: hangman.6,v 1.11 2003/02/25 10:34:46 wiz Exp $ +.\" $NetBSD: hangman.6,v 1.12 2003/08/07 09:37:21 agc Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/hangman/hangman.h b/hangman/hangman.h index eddf4ff..3389f2d 100644 --- a/hangman/hangman.h +++ b/hangman/hangman.h @@ -1,4 +1,4 @@ -/* $NetBSD: hangman.h,v 1.11 2002/01/20 00:42:51 jsm Exp $ */ +/* $NetBSD: hangman.h,v 1.12 2003/08/07 09:37:21 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/hangman/main.c b/hangman/main.c index 7a16ebb..cc04158 100644 --- a/hangman/main.c +++ b/hangman/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.10 2002/01/20 00:42:51 jsm Exp $ */ +/* $NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.10 2002/01/20 00:42:51 jsm Exp $"); +__RCSID("$NetBSD: main.c,v 1.11 2003/08/07 09:37:22 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/pathnames.h.in b/hangman/pathnames.h.in index da42319..eb26634 100644 --- a/hangman/pathnames.h.in +++ b/hangman/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/23 08:32:51 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:22 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/hangman/playgame.c b/hangman/playgame.c index f8f1523..0a7f3d3 100644 --- a/hangman/playgame.c +++ b/hangman/playgame.c @@ -1,4 +1,4 @@ -/* $NetBSD: playgame.c,v 1.4 1997/10/11 01:16:36 lukem Exp $ */ +/* $NetBSD: playgame.c,v 1.5 2003/08/07 09:37:22 agc Exp $ */ /*- * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)playgame.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: playgame.c,v 1.4 1997/10/11 01:16:36 lukem Exp $"); +__RCSID("$NetBSD: playgame.c,v 1.5 2003/08/07 09:37:22 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/prdata.c b/hangman/prdata.c index 5ee0022..c595900 100644 --- a/hangman/prdata.c +++ b/hangman/prdata.c @@ -1,4 +1,4 @@ -/* $NetBSD: prdata.c,v 1.4 1997/10/11 01:16:37 lukem Exp $ */ +/* $NetBSD: prdata.c,v 1.5 2003/08/07 09:37:22 agc Exp $ */ /*- * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)prdata.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: prdata.c,v 1.4 1997/10/11 01:16:37 lukem Exp $"); +__RCSID("$NetBSD: prdata.c,v 1.5 2003/08/07 09:37:22 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/prman.c b/hangman/prman.c index fc16408..f1b2c50 100644 --- a/hangman/prman.c +++ b/hangman/prman.c @@ -1,4 +1,4 @@ -/* $NetBSD: prman.c,v 1.4 1997/10/11 01:16:39 lukem Exp $ */ +/* $NetBSD: prman.c,v 1.5 2003/08/07 09:37:22 agc Exp $ */ /*- * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)prman.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: prman.c,v 1.4 1997/10/11 01:16:39 lukem Exp $"); +__RCSID("$NetBSD: prman.c,v 1.5 2003/08/07 09:37:22 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/prword.c b/hangman/prword.c index b1da612..06b108a 100644 --- a/hangman/prword.c +++ b/hangman/prword.c @@ -1,4 +1,4 @@ -/* $NetBSD: prword.c,v 1.4 1997/10/11 01:16:40 lukem Exp $ */ +/* $NetBSD: prword.c,v 1.5 2003/08/07 09:37:22 agc Exp $ */ /*- * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)prword.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: prword.c,v 1.4 1997/10/11 01:16:40 lukem Exp $"); +__RCSID("$NetBSD: prword.c,v 1.5 2003/08/07 09:37:22 agc Exp $"); #endif #endif /* not lint */ diff --git a/hangman/setup.c b/hangman/setup.c index f625e87..aa07a0e 100644 --- a/hangman/setup.c +++ b/hangman/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.9 2001/12/06 12:07:37 blymn Exp $ */ +/* $NetBSD: setup.c,v 1.10 2003/08/07 09:37:22 agc Exp $ */ /*- * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: setup.c,v 1.9 2001/12/06 12:07:37 blymn Exp $"); +__RCSID("$NetBSD: setup.c,v 1.10 2003/08/07 09:37:22 agc Exp $"); #endif #endif /* not lint */ diff --git a/hunt/Makefile.inc.bsd b/hunt/Makefile.inc.bsd index 2038362..72d7268 100644 --- a/hunt/Makefile.inc.bsd +++ b/hunt/Makefile.inc.bsd @@ -1,8 +1,37 @@ -# $NetBSD: Makefile.inc,v 1.6 2002/09/20 21:00:01 mycroft Exp $ +# $NetBSD: Makefile.inc,v 1.7 2003/06/11 12:10:21 wiz Exp $ +# # # Hunt -# Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold -# San Francisco, California +# +# Copyright (c) 1983-2003, Regents of the University of California. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# + Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# + 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. +# + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT +# OWNER 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. +# # # Game parameter flags are: @@ -45,7 +74,7 @@ DEFS_SUN4_0= -DINTERNET -DLOG -DSYSLOG_43 -DBROADCAST -DSIGNAL_TYPE=void DEFS_ULTRIX= -DINTERNET -DLOG -DBSD_RELEASE=42 -DSIGNAL_TYPE=void DEFS_HPUX= -DHPUX -DINTERNET -DLOG -DSYSLOG_43 -DBROADCAST -DTERMINFO -DSIGNAL_TYPE=void DEFS_SGI= -DINTERNET -DLOG -DBSD_RELEASE=43 -DTERMINFO -DSIGNAL_TYPE=void -DEFS_NEXT= $(DEFS_43) -bsd -traditional -Dconst= -DSIGNAL_TYPE=int +DEFS_NEXT= $(DEFS_BSD43) -bsd -Dconst= -DSIGNAL_TYPE=int DEFS_OSF1= -DINTERNET -DLOG -DBSD_RELEASE=43 -DSIGNAL_TYPE=void -D_BSD # diff --git a/hunt/hunt/connect.c b/hunt/hunt/connect.c index 004a39b..8e78e26 100644 --- a/hunt/hunt/connect.c +++ b/hunt/hunt/connect.c @@ -1,13 +1,38 @@ -/* $NetBSD: connect.c,v 1.3 1997/10/11 08:13:40 lukem Exp $ */ +/* $NetBSD: connect.c,v 1.5 2003/06/11 12:00:21 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: connect.c,v 1.3 1997/10/11 08:13:40 lukem Exp $"); +__RCSID("$NetBSD: connect.c,v 1.5 2003/06/11 12:00:21 wiz Exp $"); #endif /* not lint */ # include "hunt.h" @@ -20,8 +45,8 @@ do_connect(name, team, enter_status) char team; long enter_status; { - static long uid; - static long mode; + static int32_t uid; + static int32_t mode; if (uid == 0) uid = htonl(getuid()); diff --git a/hunt/hunt/hunt.6.in b/hunt/hunt/hunt.6.in index 97ab717..406296e 100644 --- a/hunt/hunt/hunt.6.in +++ b/hunt/hunt/hunt.6.in @@ -1,12 +1,35 @@ -.\" $NetBSD: hunt.6,v 1.9 2003/02/25 10:34:46 wiz Exp $ +.\" $NetBSD: hunt.6,v 1.11 2003/06/11 12:00:21 wiz Exp $ .\" -.\" hunt -.\" Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold -.\" San Francisco, California +.\" hunt .\" -.\" Copyright (c) 1985 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1983-2003, Regents of the University of California. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions are +.\" met: +.\" +.\" + Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" + 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. +.\" + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT +.\" OWNER 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. .\" .Dd April 4, 2001 .Dt HUNT 6 @@ -42,7 +65,7 @@ The location of the game may be specified by giving the argument. This presupposes that a hunt game is already running on that host, see .Xr huntd 6 -for details on how to setup a game on a specific host. +for details on how to set up a game on a specific host. If more than one game if found, you may pick which game to play in. .Pp If the diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c index 588dd01..e322754 100644 --- a/hunt/hunt/hunt.c +++ b/hunt/hunt/hunt.c @@ -1,13 +1,38 @@ -/* $NetBSD: hunt.c,v 1.16 2002/12/06 01:50:56 thorpej Exp $ */ +/* $NetBSD: hunt.c,v 1.20 2003/06/11 12:04:06 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: hunt.c,v 1.16 2002/12/06 01:50:56 thorpej Exp $"); +__RCSID("$NetBSD: hunt.c,v 1.20 2003/06/11 12:04:06 wiz Exp $"); #endif /* not lint */ # include @@ -26,6 +51,7 @@ __RCSID("$NetBSD: hunt.c,v 1.16 2002/12/06 01:50:56 thorpej Exp $"); static struct termios saved_tty; # endif # include +# include # include "hunt.h" @@ -90,6 +116,8 @@ void dump_scores __P((SOCKET)); long env_init __P((long)); void fill_in_blanks __P((void)); void leave __P((int, const char *)) __attribute__((__noreturn__)); +void leavex __P((int, const char *)) __attribute__((__noreturn__)); +void fincurs __P((void)); int main __P((int, char *[])); # ifdef INTERNET SOCKET *list_drivers __P((void)); @@ -257,13 +285,11 @@ main(ac, av) # endif /* !USE_CURSES */ in_visual = TRUE; if (LINES < SCREEN_HEIGHT || COLS < SCREEN_WIDTH) - leave(1, "Need a larger window"); + leavex(1, "Need a larger window"); clear_the_screen(); (void) signal(SIGINT, intr); (void) signal(SIGTERM, sigterm); -#ifdef SIGEMT - (void) signal(SIGEMT, sigemt); -#endif + (void) signal(SIGUSR1, sigusr1); (void) signal(SIGPIPE, SIG_IGN); #if !defined(USE_CURSES) && defined(SIGTSTP) (void) signal(SIGTSTP, tstp); @@ -274,7 +300,7 @@ main(ac, av) find_driver(TRUE); if (Daemon.sin_port == 0) - leave(1, "Game not found, try again"); + leavex(1, "Game not found, try again"); jump_in: do { @@ -293,7 +319,6 @@ main(ac, av) if (connect(Socket, (struct sockaddr *) &Daemon, DAEMON_SIZE) < 0) { if (errno != ECONNREFUSED) { - warn("connect"); leave(1, "connect"); } } @@ -319,8 +344,7 @@ main(ac, av) (void) strcpy(Daemon.sun_path, Sock_name); if (connect(Socket, &Daemon, DAEMON_SIZE) < 0) { if (errno != ENOENT) { - warn("connect"); - leave(1, "connect2"); + leavex(1, "connect2"); } start_driver(); @@ -349,7 +373,7 @@ main(ac, av) if ((enter_status = quit(enter_status)) == Q_QUIT) break; } - leave(0, (char *) NULL); + leavex(0, (char *) NULL); /* NOTREACHED */ return(0); } @@ -361,26 +385,32 @@ broadcast_vec(s, vector) int s; /* socket */ struct sockaddr **vector; { - char if_buf[BUFSIZ]; - struct ifconf ifc; - struct ifreq *ifr; - unsigned int n; int vec_cnt; + struct ifaddrs *ifp, *ip; *vector = NULL; - ifc.ifc_len = sizeof if_buf; - ifc.ifc_buf = if_buf; - if (ioctl(s, SIOCGIFCONF, (char *) &ifc) < 0) + if (getifaddrs(&ifp) < 0) return 0; + vec_cnt = 0; - n = ifc.ifc_len / sizeof (struct ifreq); - *vector = (struct sockaddr *) malloc(n * sizeof (struct sockaddr)); + for (ip = ifp; ip; ip = ip->ifa_next) + if ((ip->ifa_addr->sa_family == AF_INET) && + (ip->ifa_flags & IFF_BROADCAST)) + vec_cnt++; + + *vector = (struct sockaddr *) + malloc(vec_cnt * sizeof(struct sockaddr_in)); if (*vector == NULL) leave(1, "Out of memory!"); - for (ifr = ifc.ifc_req; n != 0; n--, ifr++) - if (ioctl(s, SIOCGIFBRDADDR, ifr) >= 0) - memcpy(&(*vector)[vec_cnt++], &ifr->ifr_addr, - sizeof (struct sockaddr)); + + vec_cnt = 0; + for (ip = ifp; ip; ip = ip->ifa_next) + if ((ip->ifa_addr->sa_family == AF_INET) && + (ip->ifa_flags & IFF_BROADCAST)) + memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr, + sizeof(struct sockaddr_in)); + + freeifaddrs(ifp); return vec_cnt; } # endif @@ -415,12 +445,12 @@ list_drivers() sethostent(1); /* don't bother to close host file */ # endif if (gethostname(local_name, sizeof local_name) < 0) { - leave(1, "Sorry, I have no name."); + leavex(1, "Sorry, I have no name."); /* NOTREACHED */ } local_name[sizeof(local_name) - 1] = '\0'; if ((hp = gethostbyname(local_name)) == NULL) { - leave(1, "Can't find myself."); + leavex(1, "Can't find myself."); /* NOTREACHED */ } local_address = * ((struct in_addr *) hp->h_addr); @@ -434,7 +464,6 @@ list_drivers() test_socket = socket(SOCK_FAMILY, SOCK_DGRAM, 0); if (test_socket < 0) { - warn("socket"); leave(1, "socket system call failed"); /* NOTREACHED */ } @@ -444,7 +473,7 @@ list_drivers() if (Sock_host != NULL) { /* explicit host given */ if ((hp = gethostbyname(Sock_host)) == NULL) { - leave(1, "Unknown host"); + leavex(1, "Unknown host"); /* NOTREACHED */ } test.sin_addr = *((struct in_addr *) hp->h_addr); @@ -468,7 +497,6 @@ list_drivers() option = 1; if (setsockopt(test_socket, SOL_SOCKET, SO_BROADCAST, &option, sizeof option) < 0) { - warn("setsockopt broadcast"); leave(1, "setsockopt broadcast"); /* NOTREACHED */ } @@ -480,7 +508,6 @@ list_drivers() test.sin_addr = brdv[i].sin_addr; if (sendto(test_socket, (char *) &msg, sizeof msg, 0, (struct sockaddr *) &test, DAEMON_SIZE) < 0) { - warn("sendto"); leave(1, "sendto"); /* NOTREACHED */ } @@ -488,7 +515,6 @@ list_drivers() test.sin_addr = local_address; if (sendto(test_socket, (char *) &msg, sizeof msg, 0, (struct sockaddr *) &test, DAEMON_SIZE) < 0) { - warn("sendto"); leave(1, "sendto"); /* NOTREACHED */ } @@ -538,7 +564,6 @@ get_response: } if (errno != 0 && errno != EINTR) { - warn("poll/recvfrom"); leave(1, "poll/recvfrom"); /* NOTREACHED */ } @@ -661,7 +686,7 @@ start_driver() # ifdef MONITOR if (Am_monitor) { - leave(1, "No one playing."); + leavex(1, "No one playing."); /* NOTREACHED */ } # endif @@ -684,7 +709,6 @@ start_driver() refresh(); procid = fork(); if (procid == -1) { - warn("fork"); leave(1, "fork failed."); } if (procid == 0) { @@ -700,9 +724,7 @@ start_driver() execl(Driver, "HUNT", "-p", use_port, (char *) NULL); # endif /* only get here if exec failed */ -#ifdef SIGEMT - (void) kill(getppid(), SIGEMT); /* tell mom */ -#endif + (void) kill(getppid(), SIGUSR1); /* tell mom */ _exit(1); } # ifdef USE_CURSES @@ -724,7 +746,7 @@ start_driver() void bad_con() { - leave(1, "The game is full. Sorry."); + leavex(1, "The game is full. Sorry."); /* NOTREACHED */ } @@ -735,7 +757,7 @@ bad_con() void bad_ver() { - leave(1, "Version number mismatch. No go."); + leavex(1, "Version number mismatch. No go."); /* NOTREACHED */ } @@ -747,20 +769,20 @@ SIGNAL_TYPE sigterm(dummy) int dummy __attribute__((__unused__)); { - leave(0, (char *) NULL); + leavex(0, (char *) NULL); /* NOTREACHED */ } /* - * sigemt: - * Handle a emt signal - shouldn't happen on vaxes(?) + * sigusr1: + * Handle a usr1 signal */ SIGNAL_TYPE -sigemt(dummy) +sigusr1(dummy) int dummy __attribute__((__unused__)); { - leave(1, "Unable to start driver. Try again."); + leavex(1, "Unable to start driver. Try again."); /* NOTREACHED */ } @@ -828,7 +850,7 @@ intr(dummy) (void) write(Socket, "q", 1); (void) close(Socket); } - leave(0, (char *) NULL); + leavex(0, (char *) NULL); } else if (ch == 'n') { (void) signal(SIGINT, intr); @@ -852,15 +874,7 @@ intr(dummy) } } -/* - * leave: - * Leave the game somewhat gracefully, restoring all current - * tty stats. - */ -void -leave(eval, mesg) - int eval; - const char *mesg; +void fincurs() { if (in_visual) { # ifdef USE_CURSES @@ -879,9 +893,36 @@ leave(eval, mesg) _puts(TE); # endif /* !USE_CURSES */ } - if (mesg != NULL) - puts(mesg); - exit(eval); +} + +/* + * leave: + * Leave the game somewhat gracefully, restoring all current + * tty stats. + */ +void +leave(eval, mesg) + int eval; + const char *mesg; +{ + int serrno = errno; + fincurs(); + errno = serrno; + err(eval, mesg ? mesg : ""); +} + +/* + * leave: + * Leave the game somewhat gracefully, restoring all current + * tty stats. + */ +void +leavex(eval, mesg) + int eval; + const char *mesg; +{ + fincurs(); + errx(eval, mesg ? mesg : ""); } #if !defined(USE_CURSES) && defined(SIGTSTP) diff --git a/hunt/hunt/otto.c b/hunt/hunt/otto.c index d68c65a..758719e 100644 --- a/hunt/hunt/otto.c +++ b/hunt/hunt/otto.c @@ -1,5 +1,36 @@ -/* $NetBSD: otto.c,v 1.4 2001/02/05 00:40:45 christos Exp $ */ +/* $NetBSD: otto.c,v 1.5 2003/06/11 12:00:21 wiz Exp $ */ # ifdef OTTO +/* + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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. + */ + /* * otto - a hunt otto-matic player * @@ -8,11 +39,13 @@ * automatic players to link to. If you write your own "otto" * please let us know what subroutines you would expect in the * subroutine library. + * + * Id: otto.c,v 1.14 2003/04/16 06:11:54 gregc Exp */ #include #ifndef lint -__RCSID("$NetBSD: otto.c,v 1.4 2001/02/05 00:40:45 christos Exp $"); +__RCSID("$NetBSD: otto.c,v 1.5 2003/06/11 12:00:21 wiz Exp $"); #endif /* not lint */ # include diff --git a/hunt/hunt/playit.c b/hunt/hunt/playit.c index 6c85c11..2125c40 100644 --- a/hunt/hunt/playit.c +++ b/hunt/hunt/playit.c @@ -1,13 +1,38 @@ -/* $NetBSD: playit.c,v 1.6 2003/02/26 07:14:44 jdc Exp $ */ +/* $NetBSD: playit.c,v 1.7 2003/06/11 12:00:21 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: playit.c,v 1.6 2003/02/26 07:14:44 jdc Exp $"); +__RCSID("$NetBSD: playit.c,v 1.7 2003/06/11 12:00:21 wiz Exp $"); #endif /* not lint */ # include diff --git a/hunt/huntd/answer.c b/hunt/huntd/answer.c index 935fb4f..d4dc6e7 100644 --- a/hunt/huntd/answer.c +++ b/hunt/huntd/answer.c @@ -1,13 +1,38 @@ -/* $NetBSD: answer.c,v 1.5 2003/02/26 07:14:45 jdc Exp $ */ +/* $NetBSD: answer.c,v 1.6 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: answer.c,v 1.5 2003/02/26 07:14:45 jdc Exp $"); +__RCSID("$NetBSD: answer.c,v 1.6 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ # include diff --git a/hunt/huntd/bsd.h b/hunt/huntd/bsd.h index d746f1d..0b8a1ff 100644 --- a/hunt/huntd/bsd.h +++ b/hunt/huntd/bsd.h @@ -1,9 +1,34 @@ -/* $NetBSD: bsd.h,v 1.3 2002/09/20 21:00:02 mycroft Exp $ */ +/* $NetBSD: bsd.h,v 1.4 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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. */ # if defined(BSD_RELEASE) && BSD_RELEASE >= 43 diff --git a/hunt/huntd/ctl.c b/hunt/huntd/ctl.c index b7066f6..74fa1bc 100644 --- a/hunt/huntd/ctl.c +++ b/hunt/huntd/ctl.c @@ -1,8 +1,33 @@ -/* $NetBSD: ctl.c,v 1.2 1997/10/10 16:32:54 lukem Exp $ */ +/* $NetBSD: ctl.c,v 1.3 2003/06/11 12:00:22 wiz Exp $ */ /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 "bsd.h" @@ -14,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)ctl.c 5.2 (Berkeley) 3/13/86"; #else -__RCSID("$NetBSD: ctl.c,v 1.2 1997/10/10 16:32:54 lukem Exp $"); +__RCSID("$NetBSD: ctl.c,v 1.3 2003/06/11 12:00:22 wiz Exp $"); #endif #endif /* not lint */ @@ -51,7 +76,7 @@ open_ctl() ctl_sockt = socket(AF_INET, SOCK_DGRAM, 0); if (ctl_sockt <= 0) p_error("Bad socket"); - if (bind(ctl_sockt, (struct sockaddr *)&ctl_addr, sizeof(ctl_addr)) != 0) + if (bind(ctl_sockt, &ctl_addr, sizeof(ctl_addr)) != 0) p_error("Couldn't bind to control socket"); length = sizeof(ctl_addr); if (getsockname(ctl_sockt, (struct sockaddr *) &ctl_addr, &length) < 0) diff --git a/hunt/huntd/ctl_transact.c b/hunt/huntd/ctl_transact.c index 8d30374..1dd3f29 100644 --- a/hunt/huntd/ctl_transact.c +++ b/hunt/huntd/ctl_transact.c @@ -1,8 +1,33 @@ -/* $NetBSD: ctl_transact.c,v 1.5 2002/09/20 20:54:16 mycroft Exp $ */ +/* $NetBSD: ctl_transact.c,v 1.6 2003/06/11 12:00:22 wiz Exp $ */ /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 "bsd.h" @@ -14,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)ctl_transact.c 5.2 (Berkeley) 3/13/86"; #else -__RCSID("$NetBSD: ctl_transact.c,v 1.5 2002/09/20 20:54:16 mycroft Exp $"); +__RCSID("$NetBSD: ctl_transact.c,v 1.6 2003/06/11 12:00:22 wiz Exp $"); #endif #endif /* not lint */ @@ -56,7 +81,7 @@ ctl_transact(target, msg, type, rp) /* resend message until a response is obtained */ for (retries = MAX_RETRY; retries > 0; retries -= 1) { cc = sendto(ctl_sockt, (char *)&msg, sizeof (msg), 0, - (struct sockaddr *)&daemon_addr, sizeof (daemon_addr)); + &daemon_addr, sizeof (daemon_addr)); if (cc != sizeof (msg)) { if (errno == EINTR) continue; diff --git a/hunt/huntd/draw.c b/hunt/huntd/draw.c index 0f4e567..fd65544 100644 --- a/hunt/huntd/draw.c +++ b/hunt/huntd/draw.c @@ -1,13 +1,38 @@ -/* $NetBSD: draw.c,v 1.2 1997/10/10 16:33:04 lukem Exp $ */ +/* $NetBSD: draw.c,v 1.3 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: draw.c,v 1.2 1997/10/10 16:33:04 lukem Exp $"); +__RCSID("$NetBSD: draw.c,v 1.3 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ # include "hunt.h" diff --git a/hunt/huntd/driver.c b/hunt/huntd/driver.c index 75bfe41..b106130 100644 --- a/hunt/huntd/driver.c +++ b/hunt/huntd/driver.c @@ -1,13 +1,38 @@ -/* $NetBSD: driver.c,v 1.8 2002/09/20 20:54:16 mycroft Exp $ */ +/* $NetBSD: driver.c,v 1.9 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: driver.c,v 1.8 2002/09/20 20:54:16 mycroft Exp $"); +__RCSID("$NetBSD: driver.c,v 1.9 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ # include diff --git a/hunt/huntd/execute.c b/hunt/huntd/execute.c index 3004644..52db473 100644 --- a/hunt/huntd/execute.c +++ b/hunt/huntd/execute.c @@ -1,13 +1,38 @@ -/* $NetBSD: execute.c,v 1.2 1997/10/10 16:33:13 lukem Exp $ */ +/* $NetBSD: execute.c,v 1.3 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: execute.c,v 1.2 1997/10/10 16:33:13 lukem Exp $"); +__RCSID("$NetBSD: execute.c,v 1.3 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ # include diff --git a/hunt/huntd/expl.c b/hunt/huntd/expl.c index c0cfa1e..70acdac 100644 --- a/hunt/huntd/expl.c +++ b/hunt/huntd/expl.c @@ -1,13 +1,38 @@ -/* $NetBSD: expl.c,v 1.2 1997/10/10 16:33:18 lukem Exp $ */ +/* $NetBSD: expl.c,v 1.3 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: expl.c,v 1.2 1997/10/10 16:33:18 lukem Exp $"); +__RCSID("$NetBSD: expl.c,v 1.3 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ # include diff --git a/hunt/huntd/extern.c b/hunt/huntd/extern.c index d11b0ca..d36f2b8 100644 --- a/hunt/huntd/extern.c +++ b/hunt/huntd/extern.c @@ -1,13 +1,38 @@ -/* $NetBSD: extern.c,v 1.3 2002/09/20 20:54:16 mycroft Exp $ */ +/* $NetBSD: extern.c,v 1.4 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: extern.c,v 1.3 2002/09/20 20:54:16 mycroft Exp $"); +__RCSID("$NetBSD: extern.c,v 1.4 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ # include "hunt.h" diff --git a/hunt/huntd/faketalk.c b/hunt/huntd/faketalk.c index 42b8123..dcd1709 100644 --- a/hunt/huntd/faketalk.c +++ b/hunt/huntd/faketalk.c @@ -1,17 +1,38 @@ -/* $NetBSD: faketalk.c,v 1.7 2002/09/20 20:54:16 mycroft Exp $ */ +/* $NetBSD: faketalk.c,v 1.8 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California - * - * Copyright (c) 1985 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: faketalk.c,v 1.7 2002/09/20 20:54:16 mycroft Exp $"); +__RCSID("$NetBSD: faketalk.c,v 1.8 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ #include "bsd.h" diff --git a/hunt/huntd/get_names.c b/hunt/huntd/get_names.c index e19e72c..1717351 100644 --- a/hunt/huntd/get_names.c +++ b/hunt/huntd/get_names.c @@ -1,13 +1,38 @@ -/* $NetBSD: get_names.c,v 1.6 2001/02/05 00:42:15 christos Exp $ */ +/* $NetBSD: get_names.c,v 1.7 2003/06/11 12:00:22 wiz Exp $ */ /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: get_names.c,v 1.6 2001/02/05 00:42:15 christos Exp $"); +__RCSID("$NetBSD: get_names.c,v 1.7 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ #include "bsd.h" diff --git a/hunt/huntd/hunt.h b/hunt/huntd/hunt.h index 77a4cf8..840e507 100644 --- a/hunt/huntd/hunt.h +++ b/hunt/huntd/hunt.h @@ -1,9 +1,34 @@ -/* $NetBSD: hunt.h,v 1.7 2002/09/20 20:54:17 mycroft Exp $ */ +/* $NetBSD: hunt.h,v 1.9 2003/06/11 12:04:06 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 "bsd.h" @@ -346,7 +371,6 @@ extern FLAG Last_player; extern char Buf[BUFSIZ], Maze[HEIGHT][WIDTH2], Orig_maze[HEIGHT][WIDTH2]; -extern char *Sock_name; extern const char *Driver; extern int Nplayer, Socket, Status; @@ -355,7 +379,7 @@ extern struct pollfd fdset[]; # ifdef INTERNET extern u_short Test_port; # else -extern char *Sock_name; +extern char *Sock_name, *Stat_name; # endif # ifdef VOLCANO @@ -456,4 +480,5 @@ SIGNAL_TYPE intr __P((int)); SIGNAL_TYPE sigalrm __P((int)); SIGNAL_TYPE sigemt __P((int)) __attribute__((__noreturn__)); SIGNAL_TYPE sigterm __P((int)) __attribute__((__noreturn__)); +SIGNAL_TYPE sigusr1 __P((int)) __attribute__((__noreturn__)); SIGNAL_TYPE tstp __P((int)); diff --git a/hunt/huntd/huntd.6.in b/hunt/huntd/huntd.6.in index a6eb8f2..3653f0b 100644 --- a/hunt/huntd/huntd.6.in +++ b/hunt/huntd/huntd.6.in @@ -1,12 +1,35 @@ -.\" $NetBSD: huntd.6,v 1.6 2002/09/26 18:32:02 wiz Exp $ +.\" $NetBSD: huntd.6,v 1.7 2003/06/11 12:00:22 wiz Exp $ .\" -.\" Hunt -.\" Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold -.\" San Francisco, California +.\" huntd .\" -.\" Copyright (c) 1985 Regents of the University of California. -.\" All rights reserved. The Berkeley software License Agreement -.\" specifies the terms and conditions for redistribution. +.\" Copyright (c) 1983-2003, Regents of the University of California. +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions are +.\" met: +.\" +.\" + Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" + 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. +.\" + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT +.\" OWNER 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. .\" .Dd April 4, 2001 .Dt HUNTD 6 diff --git a/hunt/huntd/makemaze.c b/hunt/huntd/makemaze.c index bcc21c6..e4c5553 100644 --- a/hunt/huntd/makemaze.c +++ b/hunt/huntd/makemaze.c @@ -1,13 +1,38 @@ -/* $NetBSD: makemaze.c,v 1.2 1997/10/10 16:33:43 lukem Exp $ */ +/* $NetBSD: makemaze.c,v 1.3 2003/06/11 12:00:22 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: makemaze.c,v 1.2 1997/10/10 16:33:43 lukem Exp $"); +__RCSID("$NetBSD: makemaze.c,v 1.3 2003/06/11 12:00:22 wiz Exp $"); #endif /* not lint */ # include "hunt.h" diff --git a/hunt/huntd/pathname.c b/hunt/huntd/pathname.c index d6e188b..592ded9 100644 --- a/hunt/huntd/pathname.c +++ b/hunt/huntd/pathname.c @@ -1,13 +1,38 @@ -/* $NetBSD: pathname.c,v 1.2 1997/10/10 16:33:49 lukem Exp $ */ +/* $NetBSD: pathname.c,v 1.3 2003/06/11 12:00:23 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: pathname.c,v 1.2 1997/10/10 16:33:49 lukem Exp $"); +__RCSID("$NetBSD: pathname.c,v 1.3 2003/06/11 12:00:23 wiz Exp $"); #endif /* not lint */ /* diff --git a/hunt/huntd/shots.c b/hunt/huntd/shots.c index a1d453d..4122e5a 100644 --- a/hunt/huntd/shots.c +++ b/hunt/huntd/shots.c @@ -1,13 +1,38 @@ -/* $NetBSD: shots.c,v 1.3 1997/10/11 08:13:50 lukem Exp $ */ +/* $NetBSD: shots.c,v 1.4 2003/06/11 12:00:23 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: shots.c,v 1.3 1997/10/11 08:13:50 lukem Exp $"); +__RCSID("$NetBSD: shots.c,v 1.4 2003/06/11 12:00:23 wiz Exp $"); #endif /* not lint */ # include diff --git a/hunt/huntd/talk_ctl.h b/hunt/huntd/talk_ctl.h index 3cf3a87..5cd995d 100644 --- a/hunt/huntd/talk_ctl.h +++ b/hunt/huntd/talk_ctl.h @@ -1,21 +1,45 @@ -/* $NetBSD: talk_ctl.h,v 1.4 1998/01/09 08:03:42 perry Exp $ */ +/* $NetBSD: talk_ctl.h,v 1.5 2003/06/11 12:00:23 wiz Exp $ */ /* - * Copyright (c) 1983 Regents of the University of California. - * All rights reserved. The Berkeley software License Agreement - * specifies the terms and conditions for redistribution. - * - * @(#)talk_ctl.h 5.2 (Berkeley) 3/13/86 + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #include -#include #ifdef TALK_43 #include #else +#include + #define NAME_SIZE 9 #define TTY_SIZE 16 #ifndef MAXHOSTNAMELEN diff --git a/hunt/huntd/terminal.c b/hunt/huntd/terminal.c index 8db22e6..694e204 100644 --- a/hunt/huntd/terminal.c +++ b/hunt/huntd/terminal.c @@ -1,13 +1,38 @@ -/* $NetBSD: terminal.c,v 1.3 2002/05/26 00:12:13 wiz Exp $ */ +/* $NetBSD: terminal.c,v 1.4 2003/06/11 12:00:23 wiz Exp $ */ /* - * Hunt - * Copyright (c) 1985 Conrad C. Huang, Gregory S. Couch, Kenneth C.R.C. Arnold - * San Francisco, California + * Copyright (c) 1983-2003, Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * + Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + 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. + * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 COPYRIGHT + * OWNER 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 #ifndef lint -__RCSID("$NetBSD: terminal.c,v 1.3 2002/05/26 00:12:13 wiz Exp $"); +__RCSID("$NetBSD: terminal.c,v 1.4 2003/06/11 12:00:23 wiz Exp $"); #endif /* not lint */ #include diff --git a/mille/comp.c b/mille/comp.c index b184e6b..3b1bc30 100644 --- a/mille/comp.c +++ b/mille/comp.c @@ -1,4 +1,4 @@ -/* $NetBSD: comp.c,v 1.8 1999/09/30 18:01:32 jsm Exp $ */ +/* $NetBSD: comp.c,v 1.9 2003/08/07 09:37:24 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)comp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: comp.c,v 1.8 1999/09/30 18:01:32 jsm Exp $"); +__RCSID("$NetBSD: comp.c,v 1.9 2003/08/07 09:37:24 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/end.c b/mille/end.c index 49b7bbe..77afa9d 100644 --- a/mille/end.c +++ b/mille/end.c @@ -1,4 +1,4 @@ -/* $NetBSD: end.c,v 1.6 1997/10/12 00:53:51 lukem Exp $ */ +/* $NetBSD: end.c,v 1.7 2003/08/07 09:37:25 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)end.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: end.c,v 1.6 1997/10/12 00:53:51 lukem Exp $"); +__RCSID("$NetBSD: end.c,v 1.7 2003/08/07 09:37:25 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/extern.c b/mille/extern.c index 81039ff..8c568cc 100644 --- a/mille/extern.c +++ b/mille/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.6 1999/09/08 21:17:50 jsm Exp $ */ +/* $NetBSD: extern.c,v 1.7 2003/08/07 09:37:25 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.6 1999/09/08 21:17:50 jsm Exp $"); +__RCSID("$NetBSD: extern.c,v 1.7 2003/08/07 09:37:25 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/init.c b/mille/init.c index 99d7a55..7b0e65f 100644 --- a/mille/init.c +++ b/mille/init.c @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.8 1999/09/30 18:01:32 jsm Exp $ */ +/* $NetBSD: init.c,v 1.9 2003/08/07 09:37:25 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: init.c,v 1.8 1999/09/30 18:01:32 jsm Exp $"); +__RCSID("$NetBSD: init.c,v 1.9 2003/08/07 09:37:25 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/mille.6 b/mille/mille.6 index b2f5c0e..ca6a828 100644 --- a/mille/mille.6 +++ b/mille/mille.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: mille.6,v 1.8 2002/09/26 16:12:41 wiz Exp $ +.\" $NetBSD: mille.6,v 1.9 2003/08/07 09:37:25 agc Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/mille/mille.c b/mille/mille.c index 3b1ff7b..5bce487 100644 --- a/mille/mille.c +++ b/mille/mille.c @@ -1,4 +1,4 @@ -/* $NetBSD: mille.c,v 1.12 2001/12/06 12:12:34 blymn Exp $ */ +/* $NetBSD: mille.c,v 1.13 2003/08/07 09:37:25 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\ #if 0 static char sccsid[] = "@(#)mille.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: mille.c,v 1.12 2001/12/06 12:12:34 blymn Exp $"); +__RCSID("$NetBSD: mille.c,v 1.13 2003/08/07 09:37:25 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/mille.h b/mille/mille.h index 968d080..60bed8a 100644 --- a/mille/mille.h +++ b/mille/mille.h @@ -1,4 +1,4 @@ -/* $NetBSD: mille.h,v 1.11 1999/09/30 18:01:32 jsm Exp $ */ +/* $NetBSD: mille.h,v 1.12 2003/08/07 09:37:25 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/mille/misc.c b/mille/misc.c index 11e47eb..f3cb788 100644 --- a/mille/misc.c +++ b/mille/misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.10 2002/05/26 00:12:13 wiz Exp $ */ +/* $NetBSD: misc.c,v 1.11 2003/08/07 09:37:25 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: misc.c,v 1.10 2002/05/26 00:12:13 wiz Exp $"); +__RCSID("$NetBSD: misc.c,v 1.11 2003/08/07 09:37:25 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/move.c b/mille/move.c index d3f3a16..1cfa7a0 100644 --- a/mille/move.c +++ b/mille/move.c @@ -1,4 +1,4 @@ -/* $NetBSD: move.c,v 1.12 1999/10/01 17:06:01 jsm Exp $ */ +/* $NetBSD: move.c,v 1.13 2003/08/07 09:37:25 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: move.c,v 1.12 1999/10/01 17:06:01 jsm Exp $"); +__RCSID("$NetBSD: move.c,v 1.13 2003/08/07 09:37:25 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/print.c b/mille/print.c index 4d0f71a..f850371 100644 --- a/mille/print.c +++ b/mille/print.c @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.10 2000/04/27 17:49:15 thorpej Exp $ */ +/* $NetBSD: print.c,v 1.11 2003/08/07 09:37:26 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: print.c,v 1.10 2000/04/27 17:49:15 thorpej Exp $"); +__RCSID("$NetBSD: print.c,v 1.11 2003/08/07 09:37:26 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/roll.c b/mille/roll.c index 4bcf7ed..3c0ecfb 100644 --- a/mille/roll.c +++ b/mille/roll.c @@ -1,4 +1,4 @@ -/* $NetBSD: roll.c,v 1.6 1997/10/12 00:54:28 lukem Exp $ */ +/* $NetBSD: roll.c,v 1.7 2003/08/07 09:37:26 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)roll.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: roll.c,v 1.6 1997/10/12 00:54:28 lukem Exp $"); +__RCSID("$NetBSD: roll.c,v 1.7 2003/08/07 09:37:26 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/save.c b/mille/save.c index 271057c..28c744e 100644 --- a/mille/save.c +++ b/mille/save.c @@ -1,4 +1,4 @@ -/* $NetBSD: save.c,v 1.10 1999/09/09 17:30:20 jsm Exp $ */ +/* $NetBSD: save.c,v 1.11 2003/08/07 09:37:26 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: save.c,v 1.10 1999/09/09 17:30:20 jsm Exp $"); +__RCSID("$NetBSD: save.c,v 1.11 2003/08/07 09:37:26 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/table.c b/mille/table.c index 60047c3..9a54668 100644 --- a/mille/table.c +++ b/mille/table.c @@ -1,4 +1,4 @@ -/* $NetBSD: table.c,v 1.5 1997/10/12 00:54:36 lukem Exp $ */ +/* $NetBSD: table.c,v 1.6 2003/08/07 09:37:26 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\ #if 0 static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: table.c,v 1.5 1997/10/12 00:54:36 lukem Exp $"); +__RCSID("$NetBSD: table.c,v 1.6 2003/08/07 09:37:26 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/types.c b/mille/types.c index 772ddbc..3794322 100644 --- a/mille/types.c +++ b/mille/types.c @@ -1,4 +1,4 @@ -/* $NetBSD: types.c,v 1.7 1999/09/30 18:01:32 jsm Exp $ */ +/* $NetBSD: types.c,v 1.8 2003/08/07 09:37:26 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)types.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: types.c,v 1.7 1999/09/30 18:01:32 jsm Exp $"); +__RCSID("$NetBSD: types.c,v 1.8 2003/08/07 09:37:26 agc Exp $"); #endif #endif /* not lint */ diff --git a/mille/varpush.c b/mille/varpush.c index 4ce126c..68d2be1 100644 --- a/mille/varpush.c +++ b/mille/varpush.c @@ -1,4 +1,4 @@ -/* $NetBSD: varpush.c,v 1.6 1997/10/12 00:54:44 lukem Exp $ */ +/* $NetBSD: varpush.c,v 1.7 2003/08/07 09:37:26 agc Exp $ */ /* * Copyright (c) 1982, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)varpush.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: varpush.c,v 1.6 1997/10/12 00:54:44 lukem Exp $"); +__RCSID("$NetBSD: varpush.c,v 1.7 2003/08/07 09:37:26 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/Makefile.bsd b/monop/Makefile.bsd index 795a1da..01d6dba 100644 --- a/monop/Makefile.bsd +++ b/monop/Makefile.bsd @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.22 2002/03/05 21:30:41 thorpej Exp $ +# $NetBSD: Makefile,v 1.27 2003/11/16 14:14:18 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include PROG= monop -SRCS= monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \ - print.c prop.c rent.c roll.c spec.c trade.c +SRCS= monop.c cards.c execute.c getinp.c houses.c jail.c malloc.c misc.c \ + morg.c print.c prop.c rent.c roll.c spec.c trade.c MAN= monop.6 HIDEGAME=hidegame -CLEANFILES+=initdeck cards.pck +CLEANFILES+=initdeck initdeck.lo cards.pck .if ${MKSHARE} != "no" FILES=cards.pck FILESDIR=/usr/share/games @@ -16,10 +16,12 @@ FILESDIR=/usr/share/games realall: ${FILES} -initdeck: initdeck.c - ${HOST_LINK.c} -o initdeck ${.CURDIR}/initdeck.c +initdeck: initdeck.lo + ${_MKTARGET_LINK} + ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC} cards.pck: initdeck + ${_MKTARGET_CREATE} ./initdeck ${.CURDIR}/cards.inp .include diff --git a/monop/brd.dat b/monop/brd.dat index 987fa29..cf6af30 100644 --- a/monop/brd.dat +++ b/monop/brd.dat @@ -1,4 +1,4 @@ -/* $NetBSD: brd.dat,v 1.2 1995/03/23 08:34:34 cgd Exp $ */ +/* $NetBSD: brd.dat,v 1.3 2003/08/07 09:37:27 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/cards.c b/monop/cards.c index b8372f5..277d889 100644 --- a/monop/cards.c +++ b/monop/cards.c @@ -1,4 +1,4 @@ -/* $NetBSD: cards.c,v 1.12 2002/08/12 02:38:13 itojun Exp $ */ +/* $NetBSD: cards.c,v 1.13 2003/08/07 09:37:27 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)cards.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: cards.c,v 1.12 2002/08/12 02:38:13 itojun Exp $"); +__RCSID("$NetBSD: cards.c,v 1.13 2003/08/07 09:37:27 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/deck.h b/monop/deck.h index 3969af8..cdf5070 100644 --- a/monop/deck.h +++ b/monop/deck.h @@ -1,4 +1,4 @@ -/* $NetBSD: deck.h,v 1.5 1999/08/21 10:40:03 simonb Exp $ */ +/* $NetBSD: deck.h,v 1.6 2003/08/07 09:37:27 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/execute.c b/monop/execute.c index 2eb9aa8..f1e6343 100644 --- a/monop/execute.c +++ b/monop/execute.c @@ -1,4 +1,4 @@ -/* $NetBSD: execute.c,v 1.8 2001/08/29 18:23:44 jsm Exp $ */ +/* $NetBSD: execute.c,v 1.10 2003/08/07 09:37:27 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)execute.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: execute.c,v 1.8 2001/08/29 18:23:44 jsm Exp $"); +__RCSID("$NetBSD: execute.c,v 1.10 2003/08/07 09:37:27 agc Exp $"); #endif #endif /* not lint */ @@ -59,6 +55,7 @@ typedef struct tm TIME; static char buf[257]; static bool new_play; /* set if move on to new player */ +extern void *heapstart; static void show_move __P((void)); @@ -209,7 +206,7 @@ save() for (sp = buf; *sp != '\n'; sp++) continue; *sp = '\0'; - start = 0; + start = heapstart; end = sbrk(0); while (start < end) { /* write out entire data space */ num = start + 16 * 1024 > end ? end - start : 16 * 1024; @@ -258,7 +255,7 @@ rest_f(file) perror(file); exit(1); } - start = 0; + start = heapstart; brk(end = start + sbuf.st_size); while (start < end) { /* write out entire data space */ num = start + 16 * 1024 > end ? end - start : 16 * 1024; diff --git a/monop/getinp.c b/monop/getinp.c index 0c4cf32..9c4f948 100644 --- a/monop/getinp.c +++ b/monop/getinp.c @@ -1,4 +1,4 @@ -/* $NetBSD: getinp.c,v 1.10 2003/01/06 13:04:55 wiz Exp $ */ +/* $NetBSD: getinp.c,v 1.11 2003/08/07 09:37:27 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getinp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: getinp.c,v 1.10 2003/01/06 13:04:55 wiz Exp $"); +__RCSID("$NetBSD: getinp.c,v 1.11 2003/08/07 09:37:27 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/houses.c b/monop/houses.c index 27dacc7..b5a2d8b 100644 --- a/monop/houses.c +++ b/monop/houses.c @@ -1,4 +1,4 @@ -/* $NetBSD: houses.c,v 1.6 1999/09/08 21:17:51 jsm Exp $ */ +/* $NetBSD: houses.c,v 1.7 2003/08/07 09:37:27 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)houses.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: houses.c,v 1.6 1999/09/08 21:17:51 jsm Exp $"); +__RCSID("$NetBSD: houses.c,v 1.7 2003/08/07 09:37:27 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/initdeck.c b/monop/initdeck.c index ffdf5b0..3cd6ff4 100644 --- a/monop/initdeck.c +++ b/monop/initdeck.c @@ -1,4 +1,4 @@ -/* $NetBSD: initdeck.c,v 1.14 2001/07/22 13:34:01 wiz Exp $ */ +/* $NetBSD: initdeck.c,v 1.15 2003/08/07 09:37:28 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -44,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)initdeck.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: initdeck.c,v 1.14 2001/07/22 13:34:01 wiz Exp $"); +__RCSID("$NetBSD: initdeck.c,v 1.15 2003/08/07 09:37:28 agc Exp $"); #endif #endif /* not lint */ #endif /* __NetBSD__ */ diff --git a/monop/jail.c b/monop/jail.c index 8aa5360..f6ad097 100644 --- a/monop/jail.c +++ b/monop/jail.c @@ -1,4 +1,4 @@ -/* $NetBSD: jail.c,v 1.5 1999/08/21 10:40:03 simonb Exp $ */ +/* $NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)jail.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: jail.c,v 1.5 1999/08/21 10:40:03 simonb Exp $"); +__RCSID("$NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/malloc.c b/monop/malloc.c new file mode 100644 index 0000000..7596d81 --- /dev/null +++ b/monop/malloc.c @@ -0,0 +1,493 @@ +/* $NetBSD: malloc.c,v 1.2 2003/08/07 09:37:28 agc Exp $ */ + +/* + * Copyright (c) 1983, 1993 + * The Regents of the University of California. All rights reserved. + * + * 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. Neither the name of the University 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 REGENTS 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 REGENTS 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 +#if defined(LIBC_SCCS) && !defined(lint) +#if 0 +static char sccsid[] = "@(#)malloc.c 8.1 (Berkeley) 6/4/93"; +#else +__RCSID("$NetBSD: malloc.c,v 1.2 2003/08/07 09:37:28 agc Exp $"); +#endif +#endif /* LIBC_SCCS and not lint */ + +/* + * malloc.c (Caltech) 2/21/82 + * Chris Kingsley, kingsley@cit-20. + * + * This is a very fast storage allocator. It allocates blocks of a small + * number of different sizes, and keeps free lists of each size. Blocks that + * don't exactly fit are passed up to the next larger size. In this + * implementation, the available sizes are 2^n-4 (or 2^n-10) bytes long. + * This is designed for use in a virtual memory environment. + */ + +#include +#if defined(DEBUG) || defined(RCHECK) +#include +#endif +#if defined(RCHECK) || defined(MSTATS) +#include +#endif +#include +#include +#include +#include + + +/* + * The overhead on a block is at least 4 bytes. When free, this space + * contains a pointer to the next free block, and the bottom two bits must + * be zero. When in use, the first byte is set to MAGIC, and the second + * byte is the size index. The remaining bytes are for alignment. + * If range checking is enabled then a second word holds the size of the + * requested block, less 1, rounded up to a multiple of sizeof(RMAGIC). + * The order of elements is critical: ov_magic must overlay the low order + * bits of ov_next, and ov_magic can not be a valid ov_next bit pattern. + */ +union overhead { + union overhead *ov_next; /* when free */ + struct { + u_char ovu_magic; /* magic number */ + u_char ovu_index; /* bucket # */ +#ifdef RCHECK + u_short ovu_rmagic; /* range magic number */ + u_long ovu_size; /* actual block size */ +#endif + } ovu; +#define ov_magic ovu.ovu_magic +#define ov_index ovu.ovu_index +#define ov_rmagic ovu.ovu_rmagic +#define ov_size ovu.ovu_size +}; + +#define MAGIC 0xef /* magic # on accounting info */ +#ifdef RCHECK +#define RMAGIC 0x5555 /* magic # on range info */ +#endif + +#ifdef RCHECK +#define RSLOP sizeof (u_short) +#else +#define RSLOP 0 +#endif + +/* + * nextf[i] is the pointer to the next free block of size 2^(i+3). The + * smallest allocatable block is 8 bytes. The overhead information + * precedes the data area returned to the user. + */ +#define NBUCKETS 30 +static union overhead *nextf[NBUCKETS]; + +static long pagesz; /* page size */ +static int pagebucket; /* page size bucket */ + +#ifdef MSTATS +/* + * nmalloc[i] is the difference between the number of mallocs and frees + * for a given block size. + */ +static u_int nmalloc[NBUCKETS]; +#endif + +static mutex_t malloc_mutex = MUTEX_INITIALIZER; + +static void morecore __P((int)); +static int findbucket __P((union overhead *, int)); +#ifdef MSTATS +void mstats __P((const char *)); +#endif + +#if defined(DEBUG) || defined(RCHECK) +#define ASSERT(p) if (!(p)) botch(__STRING(p)) + +static void botch __P((const char *)); + +/* + * NOTE: since this may be called while malloc_mutex is locked, stdio must not + * be used in this function. + */ +static void +botch(s) + const char *s; +{ + struct iovec iov[3]; + + iov[0].iov_base = "\nassertion botched: "; + iov[0].iov_len = 20; + iov[1].iov_base = (void *)s; + iov[1].iov_len = strlen(s); + iov[2].iov_base = "\n"; + iov[2].iov_len = 1; + + /* + * This place deserves a word of warning: a cancellation point will + * occur when executing writev(), and we might be still owning + * malloc_mutex. At this point we need to disable cancellation + * until `after' abort() because i) establishing a cancellation handler + * might, depending on the implementation, result in another malloc() + * to be executed, and ii) it is really not desirable to let execution + * continue. `Fix me.' + * + * Note that holding mutex_lock during abort() is safe. + */ + + (void)writev(STDERR_FILENO, iov, 3); + abort(); +} +#else +#define ASSERT(p) +#endif + +void * +malloc(nbytes) + size_t nbytes; +{ + union overhead *op; + int bucket; + long n; + unsigned amt; + + mutex_lock(&malloc_mutex); + + /* + * First time malloc is called, setup page size and + * align break pointer so all data will be page aligned. + */ + if (pagesz == 0) { + pagesz = n = getpagesize(); + ASSERT(pagesz > 0); + op = (union overhead *)(void *)sbrk(0); + n = n - sizeof (*op) - ((long)op & (n - 1)); + if (n < 0) + n += pagesz; + if (n) { + if (sbrk((int)n) == (void *)-1) { + mutex_unlock(&malloc_mutex); + return (NULL); + } + } + bucket = 0; + amt = 8; + while (pagesz > amt) { + amt <<= 1; + bucket++; + } + pagebucket = bucket; + } + /* + * Convert amount of memory requested into closest block size + * stored in hash buckets which satisfies request. + * Account for space used per block for accounting. + */ + if (nbytes <= (n = pagesz - sizeof (*op) - RSLOP)) { +#ifndef RCHECK + amt = 8; /* size of first bucket */ + bucket = 0; +#else + amt = 16; /* size of first bucket */ + bucket = 1; +#endif + n = -((long)sizeof (*op) + RSLOP); + } else { + amt = (unsigned)pagesz; + bucket = pagebucket; + } + while (nbytes > amt + n) { + amt <<= 1; + if (amt == 0) + return (NULL); + bucket++; + } + /* + * If nothing in hash bucket right now, + * request more memory from the system. + */ + if ((op = nextf[bucket]) == NULL) { + morecore(bucket); + if ((op = nextf[bucket]) == NULL) { + mutex_unlock(&malloc_mutex); + return (NULL); + } + } + /* remove from linked list */ + nextf[bucket] = op->ov_next; + op->ov_magic = MAGIC; + op->ov_index = bucket; +#ifdef MSTATS + nmalloc[bucket]++; +#endif + mutex_unlock(&malloc_mutex); +#ifdef RCHECK + /* + * Record allocated size of block and + * bound space with magic numbers. + */ + op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1); + op->ov_rmagic = RMAGIC; + *(u_short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC; +#endif + return ((void *)(op + 1)); +} + +/* + * Allocate more memory to the indicated bucket. + */ +static void +morecore(bucket) + int bucket; +{ + union overhead *op; + long sz; /* size of desired block */ + long amt; /* amount to allocate */ + long nblks; /* how many blocks we get */ + + /* + * sbrk_size <= 0 only for big, FLUFFY, requests (about + * 2^30 bytes on a VAX, I think) or for a negative arg. + */ + sz = 1 << (bucket + 3); +#ifdef DEBUG + ASSERT(sz > 0); +#else + if (sz <= 0) + return; +#endif + if (sz < pagesz) { + amt = pagesz; + nblks = amt / sz; + } else { + amt = sz + pagesz; + nblks = 1; + } + op = (union overhead *)(void *)sbrk((int)amt); + /* no more room! */ + if ((long)op == -1) + return; + /* + * Add new memory allocated to that on + * free list for this hash bucket. + */ + nextf[bucket] = op; + while (--nblks > 0) { + op->ov_next = + (union overhead *)(void *)((caddr_t)(void *)op+(size_t)sz); + op = op->ov_next; + } +} + +void +free(cp) + void *cp; +{ + long size; + union overhead *op; + + if (cp == NULL) + return; + op = (union overhead *)(void *)((caddr_t)cp - sizeof (union overhead)); +#ifdef DEBUG + ASSERT(op->ov_magic == MAGIC); /* make sure it was in use */ +#else + if (op->ov_magic != MAGIC) + return; /* sanity */ +#endif +#ifdef RCHECK + ASSERT(op->ov_rmagic == RMAGIC); + ASSERT(*(u_short *)((caddr_t)(op + 1) + op->ov_size) == RMAGIC); +#endif + size = op->ov_index; + ASSERT(size < NBUCKETS); + mutex_lock(&malloc_mutex); + op->ov_next = nextf[(unsigned int)size];/* also clobbers ov_magic */ + nextf[(unsigned int)size] = op; +#ifdef MSTATS + nmalloc[(size_t)size]--; +#endif + mutex_unlock(&malloc_mutex); +} + +/* + * When a program attempts "storage compaction" as mentioned in the + * old malloc man page, it realloc's an already freed block. Usually + * this is the last block it freed; occasionally it might be farther + * back. We have to search all the free lists for the block in order + * to determine its bucket: 1st we make one pass thru the lists + * checking only the first block in each; if that fails we search + * ``__realloc_srchlen'' blocks in each list for a match (the variable + * is extern so the caller can modify it). If that fails we just copy + * however many bytes was given to realloc() and hope it's not huge. + */ +int __realloc_srchlen = 4; /* 4 should be plenty, -1 =>'s whole list */ + +void * +realloc(cp, nbytes) + void *cp; + size_t nbytes; +{ + u_long onb; + long i; + union overhead *op; + char *res; + int was_alloced = 0; + + if (cp == NULL) + return (malloc(nbytes)); + if (nbytes == 0) { + free (cp); + return (NULL); + } + op = (union overhead *)(void *)((caddr_t)cp - sizeof (union overhead)); + mutex_lock(&malloc_mutex); + if (op->ov_magic == MAGIC) { + was_alloced++; + i = op->ov_index; + } else { + /* + * Already free, doing "compaction". + * + * Search for the old block of memory on the + * free list. First, check the most common + * case (last element free'd), then (this failing) + * the last ``__realloc_srchlen'' items free'd. + * If all lookups fail, then assume the size of + * the memory block being realloc'd is the + * largest possible (so that all "nbytes" of new + * memory are copied into). Note that this could cause + * a memory fault if the old area was tiny, and the moon + * is gibbous. However, that is very unlikely. + */ + if ((i = findbucket(op, 1)) < 0 && + (i = findbucket(op, __realloc_srchlen)) < 0) + i = NBUCKETS; + } + onb = (u_long)1 << (u_long)(i + 3); + if (onb < pagesz) + onb -= sizeof (*op) + RSLOP; + else + onb += pagesz - sizeof (*op) - RSLOP; + /* avoid the copy if same size block */ + if (was_alloced) { + if (i) { + i = (long)1 << (long)(i + 2); + if (i < pagesz) + i -= sizeof (*op) + RSLOP; + else + i += pagesz - sizeof (*op) - RSLOP; + } + if (nbytes <= onb && nbytes > i) { +#ifdef RCHECK + op->ov_size = (nbytes + RSLOP - 1) & ~(RSLOP - 1); + *(u_short *)((caddr_t)(op + 1) + op->ov_size) = RMAGIC; +#endif + mutex_unlock(&malloc_mutex); + return (cp); + + } +#ifndef _REENT + else + free(cp); +#endif + } + mutex_unlock(&malloc_mutex); + if ((res = malloc(nbytes)) == NULL) { +#ifdef _REENT + free(cp); +#endif + return (NULL); + } +#ifndef _REENT + if (cp != res) /* common optimization if "compacting" */ + (void)memmove(res, cp, (size_t)((nbytes < onb) ? nbytes : onb)); +#else + (void)memmove(res, cp, (size_t)((nbytes < onb) ? nbytes : onb)); + free(cp); +#endif + return (res); +} + +/* + * Search ``srchlen'' elements of each free list for a block whose + * header starts at ``freep''. If srchlen is -1 search the whole list. + * Return bucket number, or -1 if not found. + */ +static int +findbucket(freep, srchlen) + union overhead *freep; + int srchlen; +{ + union overhead *p; + int i, j; + + for (i = 0; i < NBUCKETS; i++) { + j = 0; + for (p = nextf[i]; p && j != srchlen; p = p->ov_next) { + if (p == freep) + return (i); + j++; + } + } + return (-1); +} + +#ifdef MSTATS +/* + * mstats - print out statistics about malloc + * + * Prints two lines of numbers, one showing the length of the free list + * for each size category, the second showing the number of mallocs - + * frees for each size category. + */ +void +mstats(s) + char *s; +{ + int i, j; + union overhead *p; + int totfree = 0, + totused = 0; + + fprintf(stderr, "Memory allocation statistics %s\nfree:\t", s); + for (i = 0; i < NBUCKETS; i++) { + for (j = 0, p = nextf[i]; p; p = p->ov_next, j++) + ; + fprintf(stderr, " %d", j); + totfree += j * (1 << (i + 3)); + } + fprintf(stderr, "\nused:\t"); + for (i = 0; i < NBUCKETS; i++) { + fprintf(stderr, " %d", nmalloc[i]); + totused += nmalloc[i] * (1 << (i + 3)); + } + fprintf(stderr, "\n\tTotal in use: %d, total free: %d\n", + totused, totfree); +} +#endif diff --git a/monop/misc.c b/monop/misc.c index f06ae32..27612a0 100644 --- a/monop/misc.c +++ b/monop/misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.10 2001/01/16 02:41:17 cgd Exp $ */ +/* $NetBSD: misc.c,v 1.11 2003/08/07 09:37:28 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: misc.c,v 1.10 2001/01/16 02:41:17 cgd Exp $"); +__RCSID("$NetBSD: misc.c,v 1.11 2003/08/07 09:37:28 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/mon.dat b/monop/mon.dat index bfafa4c..be1b68b 100644 --- a/monop/mon.dat +++ b/monop/mon.dat @@ -1,4 +1,4 @@ -/* $NetBSD: mon.dat,v 1.2 1995/03/23 08:34:49 cgd Exp $ */ +/* $NetBSD: mon.dat,v 1.3 2003/08/07 09:37:28 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/monop.6.in b/monop/monop.6.in index d44b542..276f941 100644 --- a/monop/monop.6.in +++ b/monop/monop.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: monop.6,v 1.13 2002/09/26 18:32:03 wiz Exp $ +.\" $NetBSD: monop.6,v 1.16 2003/08/07 09:37:28 agc Exp $ .\" .\" Copyright (c) 1980 The Regents of the University of California. .\" All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -55,8 +51,7 @@ The game, in effect, lends the player money, so it is possible to buy something which you cannot afford. However, as soon as a person goes into debt, he must .Dq fix the problem , -.Em i.e. , -make himself solvent, before play can continue. +i.e., make himself solvent, before play can continue. If this is not possible, the player's property reverts to his debtee, either a player or the bank. A player can resign at any time to any person or the bank, @@ -65,7 +60,7 @@ which puts the property back on the board, unowned. Any time that the response to a question is a .Em string , e.g., a name, place or person, you can type -.Sq Ic ? +.Sq Ic \&? to get a list of valid answers. It is not possible to input a negative number, nor is it ever necessary. .Pp @@ -78,24 +73,24 @@ It asks you if you're sure. print board: This prints out the current board. The columns have the following meanings (column headings are the same for the .Ic where , -.Ic own holdings , +.Ic own holdings , and .Ic holdings commands): .Pp .Bl -tag -width indent -compact .It Name -The first ten characters of the name of the square +The first ten characters of the name of the square. .It Own The .Em number of the owner of the property. .It Price -The cost of the property (if any) +The cost of the property (if any). .It Mg This field has a .Sq * -in it if the property is mortgaged +in it if the property is mortgaged. .It \&# If the property is a Utility or Railroad, this is the number of such owned by the owner. @@ -111,8 +106,7 @@ A indicates the current player. .It Ic own holdings List your own holdings, -.Em i.e. , -money, get-out-of-jail-free cards, and property. +i.e., money, get-out-of-jail-free cards, and property. .It Ic holdings holdings list: Look at anyone's holdings. It will ask you whose holdings you wish to look at. @@ -155,7 +149,7 @@ it asks for confirmation of the trade before doing it. .It Ic resign Resign to another player or the bank. If you resign to the bank, all property reverts to its virgin state, -and get-out-of-jail free cards revert to the deck. +and get-out-of-jail-free cards revert to the deck. .It Ic save save game: Save the current game in a file for later play. diff --git a/monop/monop.c b/monop/monop.c index c1cfa21..06b6264 100644 --- a/monop/monop.c +++ b/monop/monop.c @@ -1,4 +1,4 @@ -/* $NetBSD: monop.c,v 1.12 2001/09/18 18:15:49 wiz Exp $ */ +/* $NetBSD: monop.c,v 1.14 2003/08/07 09:37:28 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)monop.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: monop.c,v 1.12 2001/09/18 18:15:49 wiz Exp $"); +__RCSID("$NetBSD: monop.c,v 1.14 2003/08/07 09:37:28 agc Exp $"); #endif #endif /* not lint */ @@ -58,6 +54,7 @@ static void getplayers __P((void)); static void init_players __P((void)); static void init_monops __P((void)); static void do_quit __P((int)); +void *heapstart; /* * This program implements a monopoly game @@ -71,6 +68,7 @@ main(ac, av) setregid(getgid(), getgid()); srand(getpid()); + heapstart = sbrk(0); if (ac > 1) { if (!rest_f(av[1])) restore(); diff --git a/monop/monop.def b/monop/monop.def index 4bca637..63649ee 100644 --- a/monop/monop.def +++ b/monop/monop.def @@ -1,4 +1,4 @@ -/* $NetBSD: monop.def,v 1.6 1999/09/08 21:17:52 jsm Exp $ */ +/* $NetBSD: monop.def,v 1.7 2003/08/07 09:37:28 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/monop.ext b/monop/monop.ext index 5903f3d..fe22751 100644 --- a/monop/monop.ext +++ b/monop/monop.ext @@ -1,4 +1,4 @@ -/* $NetBSD: monop.ext,v 1.4 1999/09/08 21:17:52 jsm Exp $ */ +/* $NetBSD: monop.ext,v 1.5 2003/08/07 09:37:29 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/monop.h b/monop/monop.h index 23896e7..4b87996 100644 --- a/monop/monop.h +++ b/monop/monop.h @@ -1,4 +1,4 @@ -/* $NetBSD: monop.h,v 1.10 1999/09/30 18:01:32 jsm Exp $ */ +/* $NetBSD: monop.h,v 1.11 2003/08/07 09:37:29 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/morg.c b/monop/morg.c index 2c74f91..cfdbff9 100644 --- a/monop/morg.c +++ b/monop/morg.c @@ -1,4 +1,4 @@ -/* $NetBSD: morg.c,v 1.8 1999/09/08 21:17:52 jsm Exp $ */ +/* $NetBSD: morg.c,v 1.9 2003/08/07 09:37:29 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)morg.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: morg.c,v 1.8 1999/09/08 21:17:52 jsm Exp $"); +__RCSID("$NetBSD: morg.c,v 1.9 2003/08/07 09:37:29 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/pathnames.h.in b/monop/pathnames.h.in index c2fce57..190eaac 100644 --- a/monop/pathnames.h.in +++ b/monop/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/03/23 08:35:03 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:29 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/print.c b/monop/print.c index 5f0dcd2..8446abc 100644 --- a/monop/print.c +++ b/monop/print.c @@ -1,4 +1,4 @@ -/* $NetBSD: print.c,v 1.6 1999/09/08 21:17:52 jsm Exp $ */ +/* $NetBSD: print.c,v 1.7 2003/08/07 09:37:29 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: print.c,v 1.6 1999/09/08 21:17:52 jsm Exp $"); +__RCSID("$NetBSD: print.c,v 1.7 2003/08/07 09:37:29 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/prop.c b/monop/prop.c index c1a016f..dd0fd2c 100644 --- a/monop/prop.c +++ b/monop/prop.c @@ -1,4 +1,4 @@ -/* $NetBSD: prop.c,v 1.7 2001/01/16 02:41:17 cgd Exp $ */ +/* $NetBSD: prop.c,v 1.8 2003/08/07 09:37:29 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)prop.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: prop.c,v 1.7 2001/01/16 02:41:17 cgd Exp $"); +__RCSID("$NetBSD: prop.c,v 1.8 2003/08/07 09:37:29 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/prop.dat b/monop/prop.dat index 6e83098..126085d 100644 --- a/monop/prop.dat +++ b/monop/prop.dat @@ -1,4 +1,4 @@ -/* $NetBSD: prop.dat,v 1.2 1995/03/23 08:35:09 cgd Exp $ */ +/* $NetBSD: prop.dat,v 1.3 2003/08/07 09:37:29 agc Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/monop/rent.c b/monop/rent.c index c7b0cc9..4ba229d 100644 --- a/monop/rent.c +++ b/monop/rent.c @@ -1,4 +1,4 @@ -/* $NetBSD: rent.c,v 1.5 1999/08/21 10:40:04 simonb Exp $ */ +/* $NetBSD: rent.c,v 1.6 2003/08/07 09:37:29 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)rent.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rent.c,v 1.5 1999/08/21 10:40:04 simonb Exp $"); +__RCSID("$NetBSD: rent.c,v 1.6 2003/08/07 09:37:29 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/roll.c b/monop/roll.c index 75578ee..07395fa 100644 --- a/monop/roll.c +++ b/monop/roll.c @@ -1,4 +1,4 @@ -/* $NetBSD: roll.c,v 1.8 2002/06/02 22:17:37 wiz Exp $ */ +/* $NetBSD: roll.c,v 1.9 2003/08/07 09:37:29 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)roll.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: roll.c,v 1.8 2002/06/02 22:17:37 wiz Exp $"); +__RCSID("$NetBSD: roll.c,v 1.9 2003/08/07 09:37:29 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/spec.c b/monop/spec.c index 702faaa..604dc17 100644 --- a/monop/spec.c +++ b/monop/spec.c @@ -1,4 +1,4 @@ -/* $NetBSD: spec.c,v 1.6 1999/09/08 21:17:52 jsm Exp $ */ +/* $NetBSD: spec.c,v 1.7 2003/08/07 09:37:30 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: spec.c,v 1.6 1999/09/08 21:17:52 jsm Exp $"); +__RCSID("$NetBSD: spec.c,v 1.7 2003/08/07 09:37:30 agc Exp $"); #endif #endif /* not lint */ diff --git a/monop/trade.c b/monop/trade.c index a13d8ac..e28a68e 100644 --- a/monop/trade.c +++ b/monop/trade.c @@ -1,4 +1,4 @@ -/* $NetBSD: trade.c,v 1.7 1999/09/30 18:01:32 jsm Exp $ */ +/* $NetBSD: trade.c,v 1.8 2003/08/07 09:37:30 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)trade.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: trade.c,v 1.7 1999/09/30 18:01:32 jsm Exp $"); +__RCSID("$NetBSD: trade.c,v 1.8 2003/08/07 09:37:30 agc Exp $"); #endif #endif /* not lint */ diff --git a/morse/morse.c b/morse/morse.c index 8ac966c..1141364 100644 --- a/morse/morse.c +++ b/morse/morse.c @@ -1,4 +1,4 @@ -/* $NetBSD: morse.c,v 1.10 2000/07/03 03:57:42 matt Exp $ */ +/* $NetBSD: morse.c,v 1.11 2003/08/07 09:37:30 agc Exp $ */ /* * Copyright (c) 1988, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\ #if 0 static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: morse.c,v 1.10 2000/07/03 03:57:42 matt Exp $"); +__RCSID("$NetBSD: morse.c,v 1.11 2003/08/07 09:37:30 agc Exp $"); #endif #endif /* not lint */ diff --git a/number/number.6 b/number/number.6 index 5b466c9..7226637 100644 --- a/number/number.6 +++ b/number/number.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: number.6,v 1.6 2001/12/20 20:10:35 soren Exp $ +.\" $NetBSD: number.6,v 1.7 2003/08/07 09:37:30 agc Exp $ .\" .\" Copyright (c) 1989, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/number/number.c b/number/number.c index 5a08964..df89f05 100644 --- a/number/number.c +++ b/number/number.c @@ -1,4 +1,4 @@ -/* $NetBSD: number.c,v 1.7 1999/09/08 21:17:53 jsm Exp $ */ +/* $NetBSD: number.c,v 1.8 2003/08/07 09:37:31 agc Exp $ */ /* * Copyright (c) 1988, 1993, 1994 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)number.c 8.3 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: number.c,v 1.7 1999/09/08 21:17:53 jsm Exp $"); +__RCSID("$NetBSD: number.c,v 1.8 2003/08/07 09:37:31 agc Exp $"); #endif #endif /* not lint */ diff --git a/phantasia/Makefile.bsd b/phantasia/Makefile.bsd index 60f513f..45ce1e4 100644 --- a/phantasia/Makefile.bsd +++ b/phantasia/Makefile.bsd @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/03/05 21:31:23 thorpej Exp $ +# $NetBSD: Makefile,v 1.32 2003/11/16 14:14:18 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 .include @@ -21,7 +21,7 @@ ALLFILES=gold lastdead mess monsters void motd characs scoreboard FILES=gold lastdead mess monsters void motd # don't overwrite existing characters or scorefile .for file in characs scoreboard -.if !exists(${DESTDIR}/${FILESDIR}/${file}) +.if !exists(${DESTDIR}${FILESDIR}/${file}) FILES+=${file} .endif .endfor @@ -30,17 +30,16 @@ CLEANFILES+=map setup setup.lo host_phantglobs.lo ${ALLFILES} realall: ${FILES} -${FILES}: setup +${FILES}: setup monsters.asc + ${_MKMSG_CREATE} ${FILES} ./setup -m ${.CURDIR}/monsters.asc -setup: host_phantglobs.lo setup.lo monsters.asc ${LIBM} - ${HOST_LINK.c} host_phantglobs.lo setup.lo -o ${.TARGET} -lm +setup: host_phantglobs.lo setup.lo ${LIBM} + ${_MKTARGET_LINK} + ${HOST_LINK.c} -o ${.TARGET} ${.ALLSRC:M*.lo} -lm -host_phantglobs.lo: ${.CURDIR}/phantglobs.c - ${HOST_COMPILE.c} -o host_phantglobs.lo ${.CURDIR}/phantglobs.c - -setup.lo: ${.CURDIR}/setup.c - ${HOST_COMPILE.c} -o setup.lo ${.CURDIR}/setup.c +BUILDSYMLINKS+= phantglobs.c host_phantglobs.c +HOST_CPPFLAGS+= -I${.CURDIR} # Make Phantasia map. Change the map commands reflect your installation. # PLOTDEVICE is used for plotting the map. Change as appropriate. diff --git a/phantasia/main.c b/phantasia/main.c index a17e2d6..d6c57eb 100644 --- a/phantasia/main.c +++ b/phantasia/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.10 2001/12/06 12:15:37 blymn Exp $ */ +/* $NetBSD: main.c,v 1.11 2003/05/08 13:03:49 wiz Exp $ */ /* * Phantasia 3.3.2 -- Interterminal fantasy game @@ -58,7 +58,7 @@ #include "include.h" -int main __P((int, char **)); +int main(int, char **); int main(argc, argv) diff --git a/phantasia/misc.c b/phantasia/misc.c index 4c42f61..aac1ec4 100644 --- a/phantasia/misc.c +++ b/phantasia/misc.c @@ -1,11 +1,11 @@ -/* $NetBSD: misc.c,v 1.8 2003/01/20 05:29:55 simonb Exp $ */ +/* $NetBSD: misc.c,v 1.9 2003/05/08 13:03:49 wiz Exp $ */ /* * misc.c Phantasia miscellaneous support routines */ #include "include.h" -#include + void movelevel() @@ -937,7 +937,7 @@ void error(whichfile) const char *whichfile; { - int (*funcp) __P((const char *,...)); + int (*funcp)(const char *,...); if (Windows) { funcp = printw; diff --git a/phantasia/pathnames.h.in b/phantasia/pathnames.h.in index ff5ca4e..af1fb61 100644 --- a/phantasia/pathnames.h.in +++ b/phantasia/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.2 1995/03/24 03:59:17 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.3 2003/08/07 09:37:31 agc Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/phantasia/phantasia.6 b/phantasia/phantasia.6 index c79ca17..5c5ddf2 100644 --- a/phantasia/phantasia.6 +++ b/phantasia/phantasia.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: phantasia.6,v 1.9 2002/09/26 18:32:03 wiz Exp $ +.\" $NetBSD: phantasia.6,v 1.10 2003/05/18 09:30:08 wiz Exp $ .\" .Dd April 1, 2001 .Dt PHANTASIA 6 @@ -54,7 +54,7 @@ Only characters above zero are saved. Characters unused for awhile will be purged. Characters are only placed on the scoreboard when they die. -.Sh AUTHOR +.Sh AUTHORS .An Edward Estes , AT\*[Am]T Information Systems, Skokie, IL .Sh PARTICULARS @@ -300,6 +300,7 @@ The progression as characters increase in is summarized in the following table. .Pp .TS +nokeep ; l c c c c c l n n n n n. Type Strength Mana Energy Brains Magic diff --git a/phantasia/phantglobs.h b/phantasia/phantglobs.h index 46e16e5..12e61d0 100644 --- a/phantasia/phantglobs.h +++ b/phantasia/phantglobs.h @@ -1,4 +1,4 @@ -/* $NetBSD: phantglobs.h,v 1.8 2001/02/05 01:01:27 christos Exp $ */ +/* $NetBSD: phantglobs.h,v 1.9 2003/05/08 13:03:49 wiz Exp $ */ /* * phantglobs.h - global declarations for Phantasia @@ -60,71 +60,71 @@ extern const char Nobetter[]; /* functions which we need to know about */ -const char *descrlocation __P((struct player *, bool)); -const char *descrstatus __P((struct player *)); -const char *descrtype __P((struct player *, bool)); -void activelist __P((void)); -void adjuststats __P((void)); -long allocrecord __P((void)); -long allocvoid __P((void)); -void allstatslist __P((void)); -void altercoordinates __P((double, double, int)); -void awardtreasure __P((void)); -void battleplayer __P((long)); -void callmonster __P((int)); -void cancelmonster __P((void)); -void catchalarm __P((int)) __attribute__((__noreturn__)); -void changestats __P((bool)); -void checkbattle __P((void)); -void checktampered __P((void)); -void cleanup __P((int)); -void collecttaxes __P((double, double)); -void cursedtreasure __P((void)); -void death __P((const char *)); -void displaystats __P((void)); -double distance __P((double, double, double, double)); -void dotampered __P((void)); -double drandom __P((void)); -void encounter __P((int)); -void enterscore __P((void)); -void error __P((const char *)); -double explevel __P((double)); -long findname __P((const char *, struct player *)); -void freerecord __P((struct player *, long)); -void genchar __P((int)); -int getanswer __P((const char *, bool)); -void getstring __P((char *, int)); -void hitmonster __P((double)); -void ill_sig __P((int)); -double infloat __P((void)); -void initialstate __P((void)); -void initplayer __P((struct player *)); -int inputoption __P((void)); -void interrupt __P((void)); -void leavegame __P((void)); -void monsthits __P((void)); -void monstlist __P((void)); -void more __P((int)); -void movelevel __P((void)); -void myturn __P((void)); -void neatstuff __P((void)); -int pickmonster __P((void)); -void playerhits __P((void)); -void playinit __P((void)); -void procmain __P((void)); -void purgeoldplayers __P((void)); -void readmessage __P((void)); -void readrecord __P((struct player *, long)); -long recallplayer __P((void)); -long rollnewplayer __P((void)); -void scorelist __P((void)); -void scramblestats __P((void)); -void tampered __P((int, double, double)); -void throneroom __P((void)); -void throwspell __P((void)); -void titlelist __P((void)); -void tradingpost __P((void)); -void truncstring __P((char *)); -void userlist __P((bool)); -void writerecord __P((struct player *, long)); -void writevoid __P((struct energyvoid *, long)); +const char *descrlocation(struct player *, bool); +const char *descrstatus(struct player *); +const char *descrtype(struct player *, bool); +void activelist(void); +void adjuststats(void); +long allocrecord(void); +long allocvoid(void); +void allstatslist(void); +void altercoordinates(double, double, int); +void awardtreasure(void); +void battleplayer(long); +void callmonster(int); +void cancelmonster(void); +void catchalarm(int) __attribute__((__noreturn__)); +void changestats(bool); +void checkbattle(void); +void checktampered(void); +void cleanup(int); +void collecttaxes(double, double); +void cursedtreasure(void); +void death(const char *); +void displaystats(void); +double distance(double, double, double, double); +void dotampered(void); +double drandom(void); +void encounter(int); +void enterscore(void); +void error(const char *); +double explevel(double); +long findname(const char *, struct player *); +void freerecord(struct player *, long); +void genchar(int); +int getanswer(const char *, bool); +void getstring(char *, int); +void hitmonster(double); +void ill_sig(int); +double infloat(void); +void initialstate(void); +void initplayer(struct player *); +int inputoption(void); +void interrupt(void); +void leavegame(void); +void monsthits(void); +void monstlist(void); +void more(int); +void movelevel(void); +void myturn(void); +void neatstuff(void); +int pickmonster(void); +void playerhits(void); +void playinit(void); +void procmain(void); +void purgeoldplayers(void); +void readmessage(void); +void readrecord(struct player *, long); +long recallplayer(void); +long rollnewplayer(void); +void scorelist(void); +void scramblestats(void); +void tampered(int, double, double); +void throneroom(void); +void throwspell(void); +void titlelist(void); +void tradingpost(void); +void truncstring(char *); +void userlist(bool); +void writerecord(struct player *, long); +void writevoid(struct energyvoid *, long); diff --git a/phantasia/setup.c b/phantasia/setup.c index 6a1d4c0..029e9b6 100644 --- a/phantasia/setup.c +++ b/phantasia/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.11 2001/03/27 02:23:28 simonb Exp $ */ +/* $NetBSD: setup.c,v 1.12 2003/05/08 13:03:49 wiz Exp $ */ /* * setup.c - set up all files for Phantasia @@ -8,9 +8,9 @@ #include #include "include.h" -int main __P((int, char *[])); -void Error __P((const char *, const char *)) __attribute__((__noreturn__)); -double drandom __P((void)); +int main(int, char *[]); +void Error(const char *, const char *) __attribute__((__noreturn__)); +double drandom(void); /* */ /************************************************************************ diff --git a/pig/pig.6 b/pig/pig.6 index ad70594..19693ae 100644 --- a/pig/pig.6 +++ b/pig/pig.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: pig.6,v 1.4 1997/10/10 16:43:33 lukem Exp $ +.\" $NetBSD: pig.6,v 1.5 2003/08/07 09:37:31 agc Exp $ .\" .\" Copyright (c) 1992 The Regents of the University of California. .\" All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/pig/pig.c b/pig/pig.c index a21d2fb..8dcfe4f 100644 --- a/pig/pig.c +++ b/pig/pig.c @@ -1,4 +1,4 @@ -/* $NetBSD: pig.c,v 1.8 1999/09/18 19:38:53 jsm Exp $ */ +/* $NetBSD: pig.c,v 1.9 2003/08/07 09:37:32 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\ #if 0 static char sccsid[] = "@(#)pig.c 8.2 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: pig.c,v 1.8 1999/09/18 19:38:53 jsm Exp $"); +__RCSID("$NetBSD: pig.c,v 1.9 2003/08/07 09:37:32 agc Exp $"); #endif #endif /* not lint */ diff --git a/pom/pom.6 b/pom/pom.6 index bc3d530..0aa449d 100644 --- a/pom/pom.6 +++ b/pom/pom.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: pom.6,v 1.11 2002/09/26 18:32:03 wiz Exp $ +.\" $NetBSD: pom.6,v 1.12 2003/08/07 09:37:32 agc Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/pom/pom.c b/pom/pom.c index 5a72d5f..ad47ca8 100644 --- a/pom/pom.c +++ b/pom/pom.c @@ -1,4 +1,4 @@ -/* $NetBSD: pom.c,v 1.12 1999/09/14 20:00:07 jsm Exp $ */ +/* $NetBSD: pom.c,v 1.13 2003/08/07 09:37:32 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -14,11 +14,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -45,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pom.c,v 1.12 1999/09/14 20:00:07 jsm Exp $"); +__RCSID("$NetBSD: pom.c,v 1.13 2003/08/07 09:37:32 agc Exp $"); #endif #endif /* not lint */ diff --git a/ppt/ppt.c b/ppt/ppt.c index c3302ae..a54bb92 100644 --- a/ppt/ppt.c +++ b/ppt/ppt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppt.c,v 1.14 2002/11/26 23:07:36 atatat Exp $ */ +/* $NetBSD: ppt.c,v 1.15 2003/08/07 09:37:33 agc Exp $ */ /* * Copyright (c) 1988, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\ #if 0 static char sccsid[] = "@(#)ppt.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: ppt.c,v 1.14 2002/11/26 23:07:36 atatat Exp $"); +__RCSID("$NetBSD: ppt.c,v 1.15 2003/08/07 09:37:33 agc Exp $"); #endif #endif /* not lint */ diff --git a/primes/pattern.c b/primes/pattern.c index d960a39..1196056 100644 --- a/primes/pattern.c +++ b/primes/pattern.c @@ -1,4 +1,4 @@ -/* $NetBSD: pattern.c,v 1.5 1999/09/08 21:17:55 jsm Exp $ */ +/* $NetBSD: pattern.c,v 1.6 2003/08/07 09:37:33 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)pattern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pattern.c,v 1.5 1999/09/08 21:17:55 jsm Exp $"); +__RCSID("$NetBSD: pattern.c,v 1.6 2003/08/07 09:37:33 agc Exp $"); #endif #endif /* not lint */ diff --git a/primes/pr_tbl.c b/primes/pr_tbl.c index f743cf5..d45204a 100644 --- a/primes/pr_tbl.c +++ b/primes/pr_tbl.c @@ -1,4 +1,4 @@ -/* $NetBSD: pr_tbl.c,v 1.6 2001/01/20 15:06:34 itojun Exp $ */ +/* $NetBSD: pr_tbl.c,v 1.7 2003/08/07 09:37:33 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)pr_tbl.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pr_tbl.c,v 1.6 2001/01/20 15:06:34 itojun Exp $"); +__RCSID("$NetBSD: pr_tbl.c,v 1.7 2003/08/07 09:37:33 agc Exp $"); #endif #endif /* not lint */ diff --git a/primes/primes.c b/primes/primes.c index 252d843..2d73cb1 100644 --- a/primes/primes.c +++ b/primes/primes.c @@ -1,4 +1,4 @@ -/* $NetBSD: primes.c,v 1.10 2001/01/20 15:06:35 itojun Exp $ */ +/* $NetBSD: primes.c,v 1.11 2003/08/07 09:37:33 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95"; #else -__RCSID("$NetBSD: primes.c,v 1.10 2001/01/20 15:06:35 itojun Exp $"); +__RCSID("$NetBSD: primes.c,v 1.11 2003/08/07 09:37:33 agc Exp $"); #endif #endif /* not lint */ diff --git a/primes/primes.h b/primes/primes.h index 3197d27..a032c9b 100644 --- a/primes/primes.h +++ b/primes/primes.h @@ -1,4 +1,4 @@ -/* $NetBSD: primes.h,v 1.4 1995/03/23 08:35:58 cgd Exp $ */ +/* $NetBSD: primes.h,v 1.5 2003/08/07 09:37:34 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/quiz/pathnames.h.in b/quiz/pathnames.h.in index 93931d0..fa19c1f 100644 --- a/quiz/pathnames.h.in +++ b/quiz/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.4 1995/04/22 10:16:55 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.5 2003/08/07 09:37:34 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/quiz/quiz.6.in b/quiz/quiz.6.in index 6eb338c..70c5c39 100644 --- a/quiz/quiz.6.in +++ b/quiz/quiz.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: quiz.6,v 1.9 2002/09/26 18:32:03 wiz Exp $ +.\" $NetBSD: quiz.6,v 1.10 2003/08/07 09:37:34 agc Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/quiz/quiz.c b/quiz/quiz.c index dafc516..b6616eb 100644 --- a/quiz/quiz.c +++ b/quiz/quiz.c @@ -1,4 +1,4 @@ -/* $NetBSD: quiz.c,v 1.18 2000/05/08 07:56:05 mycroft Exp $ */ +/* $NetBSD: quiz.c,v 1.19 2003/08/07 09:37:34 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -16,11 +16,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -47,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\ #if 0 static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: quiz.c,v 1.18 2000/05/08 07:56:05 mycroft Exp $"); +__RCSID("$NetBSD: quiz.c,v 1.19 2003/08/07 09:37:34 agc Exp $"); #endif #endif /* not lint */ diff --git a/quiz/quiz.h b/quiz/quiz.h index f8123b3..3bfe044 100644 --- a/quiz/quiz.h +++ b/quiz/quiz.h @@ -1,4 +1,4 @@ -/* $NetBSD: quiz.h,v 1.5 1999/09/08 21:17:56 jsm Exp $ */ +/* $NetBSD: quiz.h,v 1.6 2003/08/07 09:37:34 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -16,11 +16,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/quiz/rxp.c b/quiz/rxp.c index 26c5951..47c82d8 100644 --- a/quiz/rxp.c +++ b/quiz/rxp.c @@ -1,4 +1,4 @@ -/* $NetBSD: rxp.c,v 1.10 2002/12/06 01:54:55 thorpej Exp $ */ +/* $NetBSD: rxp.c,v 1.11 2003/08/07 09:37:34 agc Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -16,11 +16,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -42,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)rxp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rxp.c,v 1.10 2002/12/06 01:54:55 thorpej Exp $"); +__RCSID("$NetBSD: rxp.c,v 1.11 2003/08/07 09:37:34 agc Exp $"); #endif #endif /* not lint */ diff --git a/rain/rain.6 b/rain/rain.6 index b64a061..9fb0f0e 100644 --- a/rain/rain.6 +++ b/rain/rain.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: rain.6,v 1.10 2002/09/26 18:32:04 wiz Exp $ +.\" $NetBSD: rain.6,v 1.11 2003/08/07 09:37:35 agc Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/rain/rain.c b/rain/rain.c index 0311f03..4da1dba 100644 --- a/rain/rain.c +++ b/rain/rain.c @@ -1,4 +1,4 @@ -/* $NetBSD: rain.c,v 1.13 1999/08/08 02:06:01 simonb Exp $ */ +/* $NetBSD: rain.c,v 1.14 2003/08/07 09:37:35 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)rain.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rain.c,v 1.13 1999/08/08 02:06:01 simonb Exp $"); +__RCSID("$NetBSD: rain.c,v 1.14 2003/08/07 09:37:35 agc Exp $"); #endif #endif /* not lint */ diff --git a/random/random.6 b/random/random.6 index 5e21e8b..2af930b 100644 --- a/random/random.6 +++ b/random/random.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: random.6,v 1.5 2002/09/26 18:32:04 wiz Exp $ +.\" $NetBSD: random.6,v 1.6 2003/08/07 09:37:35 agc Exp $ .\" .\" Copyright (c) 1994 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/random/random.c b/random/random.c index 381daa8..5a3fbcd 100644 --- a/random/random.c +++ b/random/random.c @@ -1,4 +1,4 @@ -/* $NetBSD: random.c,v 1.7 2000/01/18 16:12:25 jsm Exp $ */ +/* $NetBSD: random.c,v 1.8 2003/08/07 09:37:35 agc Exp $ */ /* * Copyright (c) 1994 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\ #if 0 static char sccsid[] = "@(#)random.c 8.6 (Berkeley) 6/1/94"; #else -__RCSID("$NetBSD: random.c,v 1.7 2000/01/18 16:12:25 jsm Exp $"); +__RCSID("$NetBSD: random.c,v 1.8 2003/08/07 09:37:35 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/extern.c b/robots/extern.c index 77d9004..8fb36fb 100644 --- a/robots/extern.c +++ b/robots/extern.c @@ -1,4 +1,4 @@ -/* $NetBSD: extern.c,v 1.7 1999/09/18 19:38:53 jsm Exp $ */ +/* $NetBSD: extern.c,v 1.8 2003/08/07 09:37:36 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)extern.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: extern.c,v 1.7 1999/09/18 19:38:53 jsm Exp $"); +__RCSID("$NetBSD: extern.c,v 1.8 2003/08/07 09:37:36 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/flush_in.c b/robots/flush_in.c index 0604f54..68ae4c3 100644 --- a/robots/flush_in.c +++ b/robots/flush_in.c @@ -1,4 +1,4 @@ -/* $NetBSD: flush_in.c,v 1.5 1997/10/12 14:09:56 lukem Exp $ */ +/* $NetBSD: flush_in.c,v 1.6 2003/08/07 09:37:36 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)flush_in.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: flush_in.c,v 1.5 1997/10/12 14:09:56 lukem Exp $"); +__RCSID("$NetBSD: flush_in.c,v 1.6 2003/08/07 09:37:36 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/init_field.c b/robots/init_field.c index 822ab10..96d6109 100644 --- a/robots/init_field.c +++ b/robots/init_field.c @@ -1,4 +1,4 @@ -/* $NetBSD: init_field.c,v 1.7 2002/01/31 17:35:52 christos Exp $ */ +/* $NetBSD: init_field.c,v 1.8 2003/08/07 09:37:36 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)init_field.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: init_field.c,v 1.7 2002/01/31 17:35:52 christos Exp $"); +__RCSID("$NetBSD: init_field.c,v 1.8 2003/08/07 09:37:36 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/main.c b/robots/main.c index 4de7bcc..6fb8827 100644 --- a/robots/main.c +++ b/robots/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.18 2001/12/06 12:17:57 blymn Exp $ */ +/* $NetBSD: main.c,v 1.19 2003/08/07 09:37:36 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.18 2001/12/06 12:17:57 blymn Exp $"); +__RCSID("$NetBSD: main.c,v 1.19 2003/08/07 09:37:36 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/make_level.c b/robots/make_level.c index d4f15b4..b3e1192 100644 --- a/robots/make_level.c +++ b/robots/make_level.c @@ -1,4 +1,4 @@ -/* $NetBSD: make_level.c,v 1.6 1999/05/15 23:56:36 christos Exp $ */ +/* $NetBSD: make_level.c,v 1.7 2003/08/07 09:37:36 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)make_level.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: make_level.c,v 1.6 1999/05/15 23:56:36 christos Exp $"); +__RCSID("$NetBSD: make_level.c,v 1.7 2003/08/07 09:37:36 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/move.c b/robots/move.c index c098292..d224b65 100644 --- a/robots/move.c +++ b/robots/move.c @@ -1,4 +1,4 @@ -/* $NetBSD: move.c,v 1.10 2002/01/31 17:35:52 christos Exp $ */ +/* $NetBSD: move.c,v 1.11 2003/08/07 09:37:36 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: move.c,v 1.10 2002/01/31 17:35:52 christos Exp $"); +__RCSID("$NetBSD: move.c,v 1.11 2003/08/07 09:37:36 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/move_robs.c b/robots/move_robs.c index 36927f9..9b5f894 100644 --- a/robots/move_robs.c +++ b/robots/move_robs.c @@ -1,4 +1,4 @@ -/* $NetBSD: move_robs.c,v 1.6 2001/01/16 02:50:28 cgd Exp $ */ +/* $NetBSD: move_robs.c,v 1.7 2003/08/07 09:37:37 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)move_robs.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: move_robs.c,v 1.6 2001/01/16 02:50:28 cgd Exp $"); +__RCSID("$NetBSD: move_robs.c,v 1.7 2003/08/07 09:37:37 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/pathnames.h.in b/robots/pathnames.h.in index d3d0f76..f3573cb 100644 --- a/robots/pathnames.h.in +++ b/robots/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/04/22 10:09:01 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:37 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/robots/play_level.c b/robots/play_level.c index 864fcf9..3cb3d0a 100644 --- a/robots/play_level.c +++ b/robots/play_level.c @@ -1,4 +1,4 @@ -/* $NetBSD: play_level.c,v 1.5 2001/01/16 02:50:28 cgd Exp $ */ +/* $NetBSD: play_level.c,v 1.6 2003/08/07 09:37:37 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)play_level.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: play_level.c,v 1.5 2001/01/16 02:50:28 cgd Exp $"); +__RCSID("$NetBSD: play_level.c,v 1.6 2003/08/07 09:37:37 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/query.c b/robots/query.c index b89535e..739ed1f 100644 --- a/robots/query.c +++ b/robots/query.c @@ -1,4 +1,4 @@ -/* $NetBSD: query.c,v 1.5 1999/09/08 21:17:57 jsm Exp $ */ +/* $NetBSD: query.c,v 1.6 2003/08/07 09:37:37 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)query.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: query.c,v 1.5 1999/09/08 21:17:57 jsm Exp $"); +__RCSID("$NetBSD: query.c,v 1.6 2003/08/07 09:37:37 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/rnd_pos.c b/robots/rnd_pos.c index 4ad8fc5..5afff5a 100644 --- a/robots/rnd_pos.c +++ b/robots/rnd_pos.c @@ -1,4 +1,4 @@ -/* $NetBSD: rnd_pos.c,v 1.4 1997/10/12 14:10:02 lukem Exp $ */ +/* $NetBSD: rnd_pos.c,v 1.5 2003/08/07 09:37:37 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)rnd_pos.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rnd_pos.c,v 1.4 1997/10/12 14:10:02 lukem Exp $"); +__RCSID("$NetBSD: rnd_pos.c,v 1.5 2003/08/07 09:37:37 agc Exp $"); #endif #endif /* not lint */ diff --git a/robots/robots.6.in b/robots/robots.6.in index 6762ff7..a1b2adf 100644 --- a/robots/robots.6.in +++ b/robots/robots.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: robots.6,v 1.11 2002/09/26 18:32:04 wiz Exp $ +.\" $NetBSD: robots.6,v 1.12 2003/08/07 09:37:37 agc Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/robots/robots.h b/robots/robots.h index 63fa6de..85ca4f1 100644 --- a/robots/robots.h +++ b/robots/robots.h @@ -1,4 +1,4 @@ -/* $NetBSD: robots.h,v 1.15 2002/01/31 17:35:52 christos Exp $ */ +/* $NetBSD: robots.h,v 1.16 2003/08/07 09:37:37 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/robots/score.c b/robots/score.c index 03038b9..ad33760 100644 --- a/robots/score.c +++ b/robots/score.c @@ -1,4 +1,4 @@ -/* $NetBSD: score.c,v 1.15 2000/04/27 19:31:23 thorpej Exp $ */ +/* $NetBSD: score.c,v 1.16 2003/08/07 09:37:37 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: score.c,v 1.15 2000/04/27 19:31:23 thorpej Exp $"); +__RCSID("$NetBSD: score.c,v 1.16 2003/08/07 09:37:37 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/assorted.c b/sail/assorted.c index a03b12e..cfc7d2a 100644 --- a/sail/assorted.c +++ b/sail/assorted.c @@ -1,4 +1,4 @@ -/* $NetBSD: assorted.c,v 1.14 2001/02/05 01:10:08 christos Exp $ */ +/* $NetBSD: assorted.c,v 1.15 2003/08/07 09:37:41 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)assorted.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: assorted.c,v 1.14 2001/02/05 01:10:08 christos Exp $"); +__RCSID("$NetBSD: assorted.c,v 1.15 2003/08/07 09:37:41 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/dr_1.c b/sail/dr_1.c index 782d8d5..6610af4 100644 --- a/sail/dr_1.c +++ b/sail/dr_1.c @@ -1,4 +1,4 @@ -/* $NetBSD: dr_1.c,v 1.18 2001/02/05 01:10:08 christos Exp $ */ +/* $NetBSD: dr_1.c,v 1.19 2003/08/07 09:37:41 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dr_1.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dr_1.c,v 1.18 2001/02/05 01:10:08 christos Exp $"); +__RCSID("$NetBSD: dr_1.c,v 1.19 2003/08/07 09:37:41 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/dr_2.c b/sail/dr_2.c index 3eb96ab..9d166cf 100644 --- a/sail/dr_2.c +++ b/sail/dr_2.c @@ -1,4 +1,4 @@ -/* $NetBSD: dr_2.c,v 1.18 2001/02/05 01:10:08 christos Exp $ */ +/* $NetBSD: dr_2.c,v 1.19 2003/08/07 09:37:41 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dr_2.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dr_2.c,v 1.18 2001/02/05 01:10:08 christos Exp $"); +__RCSID("$NetBSD: dr_2.c,v 1.19 2003/08/07 09:37:41 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/dr_3.c b/sail/dr_3.c index 22404c7..147c8fb 100644 --- a/sail/dr_3.c +++ b/sail/dr_3.c @@ -1,4 +1,4 @@ -/* $NetBSD: dr_3.c,v 1.14 2001/02/05 01:10:09 christos Exp $ */ +/* $NetBSD: dr_3.c,v 1.15 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dr_3.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dr_3.c,v 1.14 2001/02/05 01:10:09 christos Exp $"); +__RCSID("$NetBSD: dr_3.c,v 1.15 2003/08/07 09:37:42 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/dr_4.c b/sail/dr_4.c index 664a409..ba17bfd 100644 --- a/sail/dr_4.c +++ b/sail/dr_4.c @@ -1,4 +1,4 @@ -/* $NetBSD: dr_4.c,v 1.12 2001/02/05 01:10:09 christos Exp $ */ +/* $NetBSD: dr_4.c,v 1.13 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dr_4.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: dr_4.c,v 1.12 2001/02/05 01:10:09 christos Exp $"); +__RCSID("$NetBSD: dr_4.c,v 1.13 2003/08/07 09:37:42 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/dr_5.c b/sail/dr_5.c index 93d630a..7eb0cb7 100644 --- a/sail/dr_5.c +++ b/sail/dr_5.c @@ -1,4 +1,4 @@ -/* $NetBSD: dr_5.c,v 1.11 2001/02/05 01:10:09 christos Exp $ */ +/* $NetBSD: dr_5.c,v 1.12 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dr_5.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: dr_5.c,v 1.11 2001/02/05 01:10:09 christos Exp $"); +__RCSID("$NetBSD: dr_5.c,v 1.12 2003/08/07 09:37:42 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/dr_main.c b/sail/dr_main.c index c3f145d..893a770 100644 --- a/sail/dr_main.c +++ b/sail/dr_main.c @@ -1,4 +1,4 @@ -/* $NetBSD: dr_main.c,v 1.11 2001/02/05 01:10:09 christos Exp $ */ +/* $NetBSD: dr_main.c,v 1.12 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dr_main.c 8.2 (Berkeley) 4/16/94"; #else -__RCSID("$NetBSD: dr_main.c,v 1.11 2001/02/05 01:10:09 christos Exp $"); +__RCSID("$NetBSD: dr_main.c,v 1.12 2003/08/07 09:37:42 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/driver.h b/sail/driver.h index 22f87c9..422cddf 100644 --- a/sail/driver.h +++ b/sail/driver.h @@ -1,4 +1,4 @@ -/* $NetBSD: driver.h,v 1.7 2001/01/04 03:21:17 jwise Exp $ */ +/* $NetBSD: driver.h,v 1.8 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sail/extern.h b/sail/extern.h index 5b06cf4..b03e009 100644 --- a/sail/extern.h +++ b/sail/extern.h @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.24 2001/01/04 06:16:51 jwise Exp $ */ +/* $NetBSD: extern.h,v 1.25 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sail/game.c b/sail/game.c index 087ab9c..0e9e5f6 100644 --- a/sail/game.c +++ b/sail/game.c @@ -1,4 +1,4 @@ -/* $NetBSD: game.c,v 1.10 2001/02/05 01:10:09 christos Exp $ */ +/* $NetBSD: game.c,v 1.11 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)game.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: game.c,v 1.10 2001/02/05 01:10:09 christos Exp $"); +__RCSID("$NetBSD: game.c,v 1.11 2003/08/07 09:37:42 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/globals.c b/sail/globals.c index 3415380..03038d9 100644 --- a/sail/globals.c +++ b/sail/globals.c @@ -1,4 +1,4 @@ -/* $NetBSD: globals.c,v 1.12 2001/01/04 05:34:56 jwise Exp $ */ +/* $NetBSD: globals.c,v 1.13 2003/08/07 09:37:42 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)globals.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: globals.c,v 1.12 2001/01/04 05:34:56 jwise Exp $"); +__RCSID("$NetBSD: globals.c,v 1.13 2003/08/07 09:37:42 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/lo_main.c b/sail/lo_main.c index 38ff057..ce83832 100644 --- a/sail/lo_main.c +++ b/sail/lo_main.c @@ -1,4 +1,4 @@ -/* $NetBSD: lo_main.c,v 1.11 2001/02/05 01:10:10 christos Exp $ */ +/* $NetBSD: lo_main.c,v 1.12 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)lo_main.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: lo_main.c,v 1.11 2001/02/05 01:10:10 christos Exp $"); +__RCSID("$NetBSD: lo_main.c,v 1.12 2003/08/07 09:37:43 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/machdep.h b/sail/machdep.h index 087d563..e5d0b3d 100644 --- a/sail/machdep.h +++ b/sail/machdep.h @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.h,v 1.4 1995/04/28 21:30:16 mycroft Exp $ */ +/* $NetBSD: machdep.h,v 1.5 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sail/main.c b/sail/main.c index c1fc0af..232a34a 100644 --- a/sail/main.c +++ b/sail/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.20 2001/08/29 18:23:44 jsm Exp $ */ +/* $NetBSD: main.c,v 1.21 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: main.c,v 1.20 2001/08/29 18:23:44 jsm Exp $"); +__RCSID("$NetBSD: main.c,v 1.21 2003/08/07 09:37:43 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/misc.c b/sail/misc.c index 90c0a9f..5a421b0 100644 --- a/sail/misc.c +++ b/sail/misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.12 2001/02/05 01:10:10 christos Exp $ */ +/* $NetBSD: misc.c,v 1.13 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: misc.c,v 1.12 2001/02/05 01:10:10 christos Exp $"); +__RCSID("$NetBSD: misc.c,v 1.13 2003/08/07 09:37:43 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/parties.c b/sail/parties.c index 582e784..d55e462 100644 --- a/sail/parties.c +++ b/sail/parties.c @@ -1,4 +1,4 @@ -/* $NetBSD: parties.c,v 1.10 2001/02/05 01:10:10 christos Exp $ */ +/* $NetBSD: parties.c,v 1.11 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)parties.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: parties.c,v 1.10 2001/02/05 01:10:10 christos Exp $"); +__RCSID("$NetBSD: parties.c,v 1.11 2003/08/07 09:37:43 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pathnames.h.in b/sail/pathnames.h.in index 47f6ba0..00765ab 100644 --- a/sail/pathnames.h.in +++ b/sail/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.4 2000/02/09 22:27:56 jsm Exp $ */ +/* $NetBSD: pathnames.h,v 1.5 2003/08/07 09:37:43 agc Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sail/pl_1.c b/sail/pl_1.c index 3397ddf..6239ddd 100644 --- a/sail/pl_1.c +++ b/sail/pl_1.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_1.c,v 1.16 2001/02/05 01:10:10 christos Exp $ */ +/* $NetBSD: pl_1.c,v 1.17 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_1.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_1.c,v 1.16 2001/02/05 01:10:10 christos Exp $"); +__RCSID("$NetBSD: pl_1.c,v 1.17 2003/08/07 09:37:43 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pl_2.c b/sail/pl_2.c index e893726..75be55f 100644 --- a/sail/pl_2.c +++ b/sail/pl_2.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_2.c,v 1.10 2001/02/05 01:10:10 christos Exp $ */ +/* $NetBSD: pl_2.c,v 1.11 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_2.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_2.c,v 1.10 2001/02/05 01:10:10 christos Exp $"); +__RCSID("$NetBSD: pl_2.c,v 1.11 2003/08/07 09:37:43 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pl_3.c b/sail/pl_3.c index 52c6e88..81d012c 100644 --- a/sail/pl_3.c +++ b/sail/pl_3.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_3.c,v 1.16 2001/02/05 01:10:10 christos Exp $ */ +/* $NetBSD: pl_3.c,v 1.17 2003/08/07 09:37:43 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_3.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_3.c,v 1.16 2001/02/05 01:10:10 christos Exp $"); +__RCSID("$NetBSD: pl_3.c,v 1.17 2003/08/07 09:37:43 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pl_4.c b/sail/pl_4.c index affc39f..5d2a16f 100644 --- a/sail/pl_4.c +++ b/sail/pl_4.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_4.c,v 1.13 2001/02/05 01:10:11 christos Exp $ */ +/* $NetBSD: pl_4.c,v 1.14 2003/08/07 09:37:44 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_4.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_4.c,v 1.13 2001/02/05 01:10:11 christos Exp $"); +__RCSID("$NetBSD: pl_4.c,v 1.14 2003/08/07 09:37:44 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pl_5.c b/sail/pl_5.c index 44c37c2..c8d9229 100644 --- a/sail/pl_5.c +++ b/sail/pl_5.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_5.c,v 1.15 2001/02/05 01:10:11 christos Exp $ */ +/* $NetBSD: pl_5.c,v 1.16 2003/08/07 09:37:44 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_5.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_5.c,v 1.15 2001/02/05 01:10:11 christos Exp $"); +__RCSID("$NetBSD: pl_5.c,v 1.16 2003/08/07 09:37:44 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pl_6.c b/sail/pl_6.c index f45ea10..9e204b8 100644 --- a/sail/pl_6.c +++ b/sail/pl_6.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_6.c,v 1.10 2001/02/05 01:10:11 christos Exp $ */ +/* $NetBSD: pl_6.c,v 1.11 2003/08/07 09:37:44 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_6.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_6.c,v 1.10 2001/02/05 01:10:11 christos Exp $"); +__RCSID("$NetBSD: pl_6.c,v 1.11 2003/08/07 09:37:44 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pl_7.c b/sail/pl_7.c index 82a4afb..4a3bd62 100644 --- a/sail/pl_7.c +++ b/sail/pl_7.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_7.c,v 1.26 2001/12/06 12:21:00 blymn Exp $ */ +/* $NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_7.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_7.c,v 1.26 2001/12/06 12:21:00 blymn Exp $"); +__RCSID("$NetBSD: pl_7.c,v 1.27 2003/08/07 09:37:44 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/pl_main.c b/sail/pl_main.c index 85fd88e..6183420 100644 --- a/sail/pl_main.c +++ b/sail/pl_main.c @@ -1,4 +1,4 @@ -/* $NetBSD: pl_main.c,v 1.15 2001/02/05 01:10:11 christos Exp $ */ +/* $NetBSD: pl_main.c,v 1.16 2003/08/07 09:37:44 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pl_main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: pl_main.c,v 1.15 2001/02/05 01:10:11 christos Exp $"); +__RCSID("$NetBSD: pl_main.c,v 1.16 2003/08/07 09:37:44 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/player.h b/sail/player.h index ea7cde4..0419adc 100644 --- a/sail/player.h +++ b/sail/player.h @@ -1,4 +1,4 @@ -/* $NetBSD: player.h,v 1.10 2001/01/04 05:34:56 jwise Exp $ */ +/* $NetBSD: player.h,v 1.11 2003/08/07 09:37:44 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sail/sail.6 b/sail/sail.6 index 1fccdd0..b40c022 100644 --- a/sail/sail.6 +++ b/sail/sail.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: sail.6,v 1.11 2002/09/26 16:33:54 wiz Exp $ +.\" $NetBSD: sail.6,v 1.13 2003/08/07 09:37:44 agc Exp $ .\" .\" Copyright (c) 1988, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -183,7 +179,7 @@ Movement commands within the same update "overwrite" each other, in a sense. .SH THE HISTORY OF SAIL I wrote the first version of .I Sail -on a PDP 11/70 in the fall of 1980. +on a PDP\-11/70 in the fall of 1980. Needless to say, the code was horrendous, not portable in any sense of the word, and didn't work. The program was not diff --git a/sail/sync.c b/sail/sync.c index 29639d4..861a4b1 100644 --- a/sail/sync.c +++ b/sail/sync.c @@ -1,4 +1,4 @@ -/* $NetBSD: sync.c,v 1.20 2001/02/05 01:10:11 christos Exp $ */ +/* $NetBSD: sync.c,v 1.21 2003/08/07 09:37:45 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)sync.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: sync.c,v sync.c,v 1.20 2001/02/05 01:10:11 christos Exp $"); +__RCSID("$NetBSD: sync.c,v 1.21 2003/08/07 09:37:45 agc Exp $"); #endif #endif /* not lint */ diff --git a/sail/version.c b/sail/version.c index 68ac04d..4c3b934 100644 --- a/sail/version.c +++ b/sail/version.c @@ -1,4 +1,4 @@ -/* $NetBSD: version.c,v 1.4 1997/10/13 19:46:01 christos Exp $ */ +/* $NetBSD: version.c,v 1.5 2003/08/07 09:37:45 agc Exp $ */ /* * Copyright (c) 1983, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: version.c,v 1.4 1997/10/13 19:46:01 christos Exp $"); +__RCSID("$NetBSD: version.c,v 1.5 2003/08/07 09:37:45 agc Exp $"); #endif #endif /* not lint */ diff --git a/snake/snake/pathnames.h.in b/snake/snake/pathnames.h.in index 3c2bac0..2f54471 100644 --- a/snake/snake/pathnames.h.in +++ b/snake/snake/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/04/22 08:34:33 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:45 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/snake/snake/snake.6.in b/snake/snake/snake.6.in index d4fc06c..accbab8 100644 --- a/snake/snake/snake.6.in +++ b/snake/snake/snake.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: snake.6,v 1.10 2002/09/26 16:12:43 wiz Exp $ +.\" $NetBSD: snake.6,v 1.11 2003/08/07 09:37:45 agc Exp $ .\" .\" Copyright (c) 1980, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/snake/snake/snake.c b/snake/snake/snake.c index 5381d04..10045d5 100644 --- a/snake/snake/snake.c +++ b/snake/snake/snake.c @@ -1,4 +1,4 @@ -/* $NetBSD: snake.c,v 1.17 2001/08/31 07:17:02 jsm Exp $ */ +/* $NetBSD: snake.c,v 1.18 2003/08/07 09:37:45 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)snake.c 8.2 (Berkeley) 1/7/94"; #else -__RCSID("$NetBSD: snake.c,v 1.17 2001/08/31 07:17:02 jsm Exp $"); +__RCSID("$NetBSD: snake.c,v 1.18 2003/08/07 09:37:45 agc Exp $"); #endif #endif /* not lint */ diff --git a/snake/snscore/snscore.c b/snake/snscore/snscore.c index 967fff3..8741c0f 100644 --- a/snake/snscore/snscore.c +++ b/snake/snscore/snscore.c @@ -1,4 +1,4 @@ -/* $NetBSD: snscore.c,v 1.13 2000/05/08 07:56:05 mycroft Exp $ */ +/* $NetBSD: snscore.c,v 1.14 2003/08/07 09:37:47 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)snscore.c 8.1 (Berkeley) 7/19/93"; #else -__RCSID("$NetBSD: snscore.c,v 1.13 2000/05/08 07:56:05 mycroft Exp $"); +__RCSID("$NetBSD: snscore.c,v 1.14 2003/08/07 09:37:47 agc Exp $"); #endif #endif /* not lint */ diff --git a/tests/caesar.197816in b/tests/caesar.197816in new file mode 100644 index 0000000..49f2889 --- /dev/null +++ b/tests/caesar.197816in @@ -0,0 +1 @@ +Wtl blm sn atkm ynxk wxg Tnmhk diff --git a/tests/caesar.197816out b/tests/caesar.197816out new file mode 100644 index 0000000..a3206f3 --- /dev/null +++ b/tests/caesar.197816out @@ -0,0 +1 @@ +Das ist zu hart fuer den Autor diff --git a/tests/caesar.test b/tests/caesar.test index 3b3c9ca..e40de2f 100755 --- a/tests/caesar.test +++ b/tests/caesar.test @@ -1,7 +1,7 @@ #!/bin/sh # tests/caesar.test - test functionality of caesar. # -# Copyright (c) 1999 Joseph Samuel Myers. +# Copyright (c) 1999, 2003 Joseph Samuel Myers. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -42,3 +42,8 @@ testno 2 caesar/caesar 21 test.out 2>&1 || failtest compare test.out tests/caesar.constout rm -f test.out + +testno 3 +caesar/caesar test.out 2>&1 || failtest +compare test.out tests/caesar.197816out +rm -f test.out diff --git a/tetris/input.c b/tetris/input.c index cae49c8..469fa79 100644 --- a/tetris/input.c +++ b/tetris/input.c @@ -1,4 +1,4 @@ -/* $NetBSD: input.c,v 1.8 2002/12/29 15:12:17 kristerw Exp $ */ +/* $NetBSD: input.c,v 1.9 2003/08/07 09:37:47 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/input.h b/tetris/input.h index 8bbd0d3..5ff868b 100644 --- a/tetris/input.h +++ b/tetris/input.h @@ -1,4 +1,4 @@ -/* $NetBSD: input.h,v 1.3 1999/01/03 02:00:17 hubertf Exp $ */ +/* $NetBSD: input.h,v 1.4 2003/08/07 09:37:48 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/pathnames.h.in b/tetris/pathnames.h.in index c6a3942..d4ed05f 100644 --- a/tetris/pathnames.h.in +++ b/tetris/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.2 1995/04/22 07:42:37 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.3 2003/08/07 09:37:48 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/scores.c b/tetris/scores.c index 480b4c1..544d581 100644 --- a/tetris/scores.c +++ b/tetris/scores.c @@ -1,4 +1,4 @@ -/* $NetBSD: scores.c,v 1.11 2002/06/02 22:17:38 wiz Exp $ */ +/* $NetBSD: scores.c,v 1.12 2003/08/07 09:37:48 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/scores.h b/tetris/scores.h index 387d021..eac47aa 100644 --- a/tetris/scores.h +++ b/tetris/scores.h @@ -1,4 +1,4 @@ -/* $NetBSD: scores.h,v 1.2 1995/04/22 07:42:40 cgd Exp $ */ +/* $NetBSD: scores.h,v 1.3 2003/08/07 09:37:48 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/screen.c b/tetris/screen.c index 5b81e4f..db7a90e 100644 --- a/tetris/screen.c +++ b/tetris/screen.c @@ -1,4 +1,4 @@ -/* $NetBSD: screen.c,v 1.16 2001/11/02 18:27:00 christos Exp $ */ +/* $NetBSD: screen.c,v screen.c,v 1.18 2003/08/07 09:37:48 agc Exp $ */ /* For Linux: still using old termcap interface from version 1.13. */ /*- @@ -16,11 +16,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/screen.h b/tetris/screen.h index d9e6b47..070440f 100644 --- a/tetris/screen.h +++ b/tetris/screen.h @@ -1,4 +1,4 @@ -/* $NetBSD: screen.h,v 1.6 2000/05/22 12:42:48 blymn Exp $ */ +/* $NetBSD: screen.h,v 1.7 2003/08/07 09:37:48 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/shapes.c b/tetris/shapes.c index 32c7814..568b78e 100644 --- a/tetris/shapes.c +++ b/tetris/shapes.c @@ -1,4 +1,4 @@ -/* $NetBSD: shapes.c,v 1.5 2002/06/02 22:17:38 wiz Exp $ */ +/* $NetBSD: shapes.c,v 1.6 2003/08/07 09:37:48 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/tetris.6.in b/tetris/tetris.6.in index 16184a1..c61d556 100644 --- a/tetris/tetris.6.in +++ b/tetris/tetris.6.in @@ -1,4 +1,4 @@ -.\" $NetBSD: tetris.6,v 1.9 2002/09/26 18:32:05 wiz Exp $ +.\" $NetBSD: tetris.6,v 1.10 2003/08/07 09:37:48 agc Exp $ .\" .\" Copyright (c) 1992, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/tetris/tetris.c b/tetris/tetris.c index 474a662..7fad938 100644 --- a/tetris/tetris.c +++ b/tetris/tetris.c @@ -1,4 +1,4 @@ -/* $NetBSD: tetris.c,v 1.15 2002/06/02 22:17:38 wiz Exp $ */ +/* $NetBSD: tetris.c,v 1.16 2003/08/07 09:37:48 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/tetris/tetris.h b/tetris/tetris.h index 769f2d2..68268f2 100644 --- a/tetris/tetris.h +++ b/tetris/tetris.h @@ -1,4 +1,4 @@ -/* $NetBSD: tetris.h,v 1.8 2000/01/01 10:15:17 jsm Exp $ */ +/* $NetBSD: tetris.h,v 1.9 2003/08/07 09:37:49 agc Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -15,11 +15,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/trek/USD.doc/Makefile.bsd b/trek/USD.doc/Makefile.bsd index a01b232..f191202 100644 --- a/trek/USD.doc/Makefile.bsd +++ b/trek/USD.doc/Makefile.bsd @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/01/05 12:34:27 pooka Exp $ +# $NetBSD: Makefile,v 1.4 2003/07/10 10:34:20 lukem Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 DIR= usd/31.trek @@ -6,6 +6,6 @@ SRCS= trek.me MACROS= -me paper.ps: ${SRCS} - ${TBL} ${SRCS} | ${ROFF} ${MACROS} > ${.TARGET} + ${TOOL_TBL} ${SRCS} | ${TOOL_ROFF_PS} ${MACROS} > ${.TARGET} .include diff --git a/trek/USD.doc/trek.me b/trek/USD.doc/trek.me index a287c84..4316d27 100644 --- a/trek/USD.doc/trek.me +++ b/trek/USD.doc/trek.me @@ -1,4 +1,4 @@ -.\" $NetBSD: trek.me,v 1.2 1995/04/22 10:59:49 cgd Exp $ +.\" $NetBSD: trek.me,v 1.3 2003/08/07 09:37:55 agc Exp $ .\" .\" Copyright (c) 1980, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/trek/abandon.c b/trek/abandon.c index 872d15d..db79d0a 100644 --- a/trek/abandon.c +++ b/trek/abandon.c @@ -1,4 +1,4 @@ -/* $NetBSD: abandon.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ +/* $NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)abandon.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: abandon.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); +__RCSID("$NetBSD: abandon.c,v 1.6 2003/08/07 09:37:49 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/attack.c b/trek/attack.c index fa1fe31..8a34b93 100644 --- a/trek/attack.c +++ b/trek/attack.c @@ -1,4 +1,4 @@ -/* $NetBSD: attack.c,v 1.4 1997/10/12 21:24:26 christos Exp $ */ +/* $NetBSD: attack.c,v 1.5 2003/08/07 09:37:49 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)attack.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: attack.c,v 1.4 1997/10/12 21:24:26 christos Exp $"); +__RCSID("$NetBSD: attack.c,v 1.5 2003/08/07 09:37:49 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/autover.c b/trek/autover.c index 5e82d25..56706a2 100644 --- a/trek/autover.c +++ b/trek/autover.c @@ -1,4 +1,4 @@ -/* $NetBSD: autover.c,v 1.4 1997/10/12 21:24:27 christos Exp $ */ +/* $NetBSD: autover.c,v 1.5 2003/08/07 09:37:49 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)autover.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: autover.c,v 1.4 1997/10/12 21:24:27 christos Exp $"); +__RCSID("$NetBSD: autover.c,v 1.5 2003/08/07 09:37:49 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/capture.c b/trek/capture.c index 93a9d25..700cb7d 100644 --- a/trek/capture.c +++ b/trek/capture.c @@ -1,4 +1,4 @@ -/* $NetBSD: capture.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ +/* $NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)capture.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: capture.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); +__RCSID("$NetBSD: capture.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/cgetc.c b/trek/cgetc.c index 19d8b85..d1c423d 100644 --- a/trek/cgetc.c +++ b/trek/cgetc.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgetc.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ +/* $NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)cgetc.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: cgetc.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); +__RCSID("$NetBSD: cgetc.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/check_out.c b/trek/check_out.c index 104bc10..10e731f 100644 --- a/trek/check_out.c +++ b/trek/check_out.c @@ -1,4 +1,4 @@ -/* $NetBSD: check_out.c,v 1.4 1997/10/12 21:24:31 christos Exp $ */ +/* $NetBSD: check_out.c,v 1.5 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)check_out.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: check_out.c,v 1.4 1997/10/12 21:24:31 christos Exp $"); +__RCSID("$NetBSD: check_out.c,v 1.5 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/checkcond.c b/trek/checkcond.c index 2485d1c..9a969d1 100644 --- a/trek/checkcond.c +++ b/trek/checkcond.c @@ -1,4 +1,4 @@ -/* $NetBSD: checkcond.c,v 1.4 1997/10/12 21:24:32 christos Exp $ */ +/* $NetBSD: checkcond.c,v 1.5 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)checkcond.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: checkcond.c,v 1.4 1997/10/12 21:24:32 christos Exp $"); +__RCSID("$NetBSD: checkcond.c,v 1.5 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/compkl.c b/trek/compkl.c index d20ba98..ecc6979 100644 --- a/trek/compkl.c +++ b/trek/compkl.c @@ -1,4 +1,4 @@ -/* $NetBSD: compkl.c,v 1.4 1997/10/12 21:24:33 christos Exp $ */ +/* $NetBSD: compkl.c,v 1.5 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)compkl.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: compkl.c,v 1.4 1997/10/12 21:24:33 christos Exp $"); +__RCSID("$NetBSD: compkl.c,v 1.5 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/computer.c b/trek/computer.c index d7bf7ea..818b5b9 100644 --- a/trek/computer.c +++ b/trek/computer.c @@ -1,4 +1,4 @@ -/* $NetBSD: computer.c,v 1.8 2000/07/03 03:57:44 matt Exp $ */ +/* $NetBSD: computer.c,v 1.9 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)computer.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: computer.c,v 1.8 2000/07/03 03:57:44 matt Exp $"); +__RCSID("$NetBSD: computer.c,v 1.9 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/damage.c b/trek/damage.c index 2183da6..979b230 100644 --- a/trek/damage.c +++ b/trek/damage.c @@ -1,4 +1,4 @@ -/* $NetBSD: damage.c,v 1.5 2002/07/20 08:36:23 grant Exp $ */ +/* $NetBSD: damage.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)damage.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: damage.c,v 1.5 2002/07/20 08:36:23 grant Exp $"); +__RCSID("$NetBSD: damage.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/damaged.c b/trek/damaged.c index d133043..8e6c08a 100644 --- a/trek/damaged.c +++ b/trek/damaged.c @@ -1,4 +1,4 @@ -/* $NetBSD: damaged.c,v 1.4 1997/10/12 21:24:37 christos Exp $ */ +/* $NetBSD: damaged.c,v 1.5 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)damaged.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: damaged.c,v 1.4 1997/10/12 21:24:37 christos Exp $"); +__RCSID("$NetBSD: damaged.c,v 1.5 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/dcrept.c b/trek/dcrept.c index a3e6e55..b57120c 100644 --- a/trek/dcrept.c +++ b/trek/dcrept.c @@ -1,4 +1,4 @@ -/* $NetBSD: dcrept.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ +/* $NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dcrept.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dcrept.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); +__RCSID("$NetBSD: dcrept.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/destruct.c b/trek/destruct.c index e3c6729..fdf3dad 100644 --- a/trek/destruct.c +++ b/trek/destruct.c @@ -1,4 +1,4 @@ -/* $NetBSD: destruct.c,v 1.6 2000/07/03 03:57:44 matt Exp $ */ +/* $NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)destruct.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: destruct.c,v 1.6 2000/07/03 03:57:44 matt Exp $"); +__RCSID("$NetBSD: destruct.c,v 1.7 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/dock.c b/trek/dock.c index 5af80f9..9a373a7 100644 --- a/trek/dock.c +++ b/trek/dock.c @@ -1,4 +1,4 @@ -/* $NetBSD: dock.c,v 1.5 1999/09/08 21:45:32 jsm Exp $ */ +/* $NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dock.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dock.c,v 1.5 1999/09/08 21:45:32 jsm Exp $"); +__RCSID("$NetBSD: dock.c,v 1.6 2003/08/07 09:37:50 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/dumpgame.c b/trek/dumpgame.c index b9bd050..f0d4cbd 100644 --- a/trek/dumpgame.c +++ b/trek/dumpgame.c @@ -1,4 +1,4 @@ -/* $NetBSD: dumpgame.c,v 1.7 1999/09/08 21:45:32 jsm Exp $ */ +/* $NetBSD: dumpgame.c,v 1.8 2003/08/07 09:37:51 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dumpgame.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dumpgame.c,v 1.7 1999/09/08 21:45:32 jsm Exp $"); +__RCSID("$NetBSD: dumpgame.c,v 1.8 2003/08/07 09:37:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/dumpme.c b/trek/dumpme.c index b58fd02..c06cf12 100644 --- a/trek/dumpme.c +++ b/trek/dumpme.c @@ -1,4 +1,4 @@ -/* $NetBSD: dumpme.c,v 1.4 1997/10/12 21:24:43 christos Exp $ */ +/* $NetBSD: dumpme.c,v 1.5 2003/08/07 09:37:51 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dumpme.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dumpme.c,v 1.4 1997/10/12 21:24:43 christos Exp $"); +__RCSID("$NetBSD: dumpme.c,v 1.5 2003/08/07 09:37:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/dumpssradio.c b/trek/dumpssradio.c index 567c648..8062322 100644 --- a/trek/dumpssradio.c +++ b/trek/dumpssradio.c @@ -1,4 +1,4 @@ -/* $NetBSD: dumpssradio.c,v 1.4 1997/10/12 21:24:45 christos Exp $ */ +/* $NetBSD: dumpssradio.c,v 1.5 2003/08/07 09:37:51 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)dumpssradio.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: dumpssradio.c,v 1.4 1997/10/12 21:24:45 christos Exp $"); +__RCSID("$NetBSD: dumpssradio.c,v 1.5 2003/08/07 09:37:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/events.c b/trek/events.c index a494727..512a93d 100644 --- a/trek/events.c +++ b/trek/events.c @@ -1,4 +1,4 @@ -/* $NetBSD: events.c,v 1.6 2001/06/12 15:17:12 wiz Exp $ */ +/* $NetBSD: events.c,v 1.7 2003/08/07 09:37:51 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)events.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: events.c,v 1.6 2001/06/12 15:17:12 wiz Exp $"); +__RCSID("$NetBSD: events.c,v 1.7 2003/08/07 09:37:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/externs.c b/trek/externs.c index 153f044..3b834d0 100644 --- a/trek/externs.c +++ b/trek/externs.c @@ -1,4 +1,4 @@ -/* $NetBSD: externs.c,v 1.7 2001/02/05 01:12:46 christos Exp $ */ +/* $NetBSD: externs.c,v 1.8 2003/08/07 09:37:51 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)externs.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: externs.c,v 1.7 2001/02/05 01:12:46 christos Exp $"); +__RCSID("$NetBSD: externs.c,v 1.8 2003/08/07 09:37:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/getcodi.c b/trek/getcodi.c index f0157a9..f6af1db 100644 --- a/trek/getcodi.c +++ b/trek/getcodi.c @@ -1,4 +1,4 @@ -/* $NetBSD: getcodi.c,v 1.4 1997/10/12 21:24:49 christos Exp $ */ +/* $NetBSD: getcodi.c,v 1.5 2003/08/07 09:37:51 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getcodi.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: getcodi.c,v 1.4 1997/10/12 21:24:49 christos Exp $"); +__RCSID("$NetBSD: getcodi.c,v 1.5 2003/08/07 09:37:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/getpar.c b/trek/getpar.c index d5f679a..125cb9c 100644 --- a/trek/getpar.c +++ b/trek/getpar.c @@ -1,4 +1,4 @@ -/* $NetBSD: getpar.c,v 1.10 2002/10/18 14:12:14 itojun Exp $ */ +/* $NetBSD: getpar.c,v 1.11 2003/08/07 09:37:51 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)getpar.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: getpar.c,v 1.10 2002/10/18 14:12:14 itojun Exp $"); +__RCSID("$NetBSD: getpar.c,v 1.11 2003/08/07 09:37:51 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/getpar.h b/trek/getpar.h index dbb8314..23b2bab 100644 --- a/trek/getpar.h +++ b/trek/getpar.h @@ -1,4 +1,4 @@ -/* $NetBSD: getpar.h,v 1.6 1999/09/08 21:18:01 jsm Exp $ */ +/* $NetBSD: getpar.h,v 1.8 2003/11/17 11:16:10 wiz Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -36,7 +32,7 @@ */ typedef void (*cmdfun) __P((int)); -struct cvntab /* used for getcodpar() paramater list */ +struct cvntab /* used for getcodpar() parameter list */ { const char *abrev; const char *full; diff --git a/trek/help.c b/trek/help.c index 41c9413..d4c6c42 100644 --- a/trek/help.c +++ b/trek/help.c @@ -1,4 +1,4 @@ -/* $NetBSD: help.c,v 1.6 1999/09/08 21:45:32 jsm Exp $ */ +/* $NetBSD: help.c,v 1.7 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)help.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: help.c,v 1.6 1999/09/08 21:45:32 jsm Exp $"); +__RCSID("$NetBSD: help.c,v 1.7 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/impulse.c b/trek/impulse.c index cb4f08b..2303977 100644 --- a/trek/impulse.c +++ b/trek/impulse.c @@ -1,4 +1,4 @@ -/* $NetBSD: impulse.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ +/* $NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)impulse.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: impulse.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); +__RCSID("$NetBSD: impulse.c,v 1.6 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/initquad.c b/trek/initquad.c index 5d38ba1..bb75ee9 100644 --- a/trek/initquad.c +++ b/trek/initquad.c @@ -1,4 +1,4 @@ -/* $NetBSD: initquad.c,v 1.4 1997/10/12 21:24:55 christos Exp $ */ +/* $NetBSD: initquad.c,v 1.5 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)initquad.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: initquad.c,v 1.4 1997/10/12 21:24:55 christos Exp $"); +__RCSID("$NetBSD: initquad.c,v 1.5 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/kill.c b/trek/kill.c index 1cf12a3..053f1db 100644 --- a/trek/kill.c +++ b/trek/kill.c @@ -1,4 +1,4 @@ -/* $NetBSD: kill.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: kill.c,v 1.7 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)kill.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: kill.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $"); +__RCSID("$NetBSD: kill.c,v 1.7 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/klmove.c b/trek/klmove.c index 1c03ccd..0ab26fe 100644 --- a/trek/klmove.c +++ b/trek/klmove.c @@ -1,4 +1,4 @@ -/* $NetBSD: klmove.c,v 1.4 1997/10/12 21:24:57 christos Exp $ */ +/* $NetBSD: klmove.c,v 1.5 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)klmove.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: klmove.c,v 1.4 1997/10/12 21:24:57 christos Exp $"); +__RCSID("$NetBSD: klmove.c,v 1.5 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/lose.c b/trek/lose.c index 4bc2bbd..efb89fd 100644 --- a/trek/lose.c +++ b/trek/lose.c @@ -1,4 +1,4 @@ -/* $NetBSD: lose.c,v 1.6 2001/02/05 01:12:46 christos Exp $ */ +/* $NetBSD: lose.c,v 1.7 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)lose.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: lose.c,v 1.6 2001/02/05 01:12:46 christos Exp $"); +__RCSID("$NetBSD: lose.c,v 1.7 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/lrscan.c b/trek/lrscan.c index 6056948..0cc0045 100644 --- a/trek/lrscan.c +++ b/trek/lrscan.c @@ -1,4 +1,4 @@ -/* $NetBSD: lrscan.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ +/* $NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)lrscan.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: lrscan.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); +__RCSID("$NetBSD: lrscan.c,v 1.6 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/main.c b/trek/main.c index 2c3598e..345a732 100644 --- a/trek/main.c +++ b/trek/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.10 2001/07/22 13:34:01 wiz Exp $ */ +/* $NetBSD: main.c,v 1.11 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: main.c,v 1.10 2001/07/22 13:34:01 wiz Exp $"); +__RCSID("$NetBSD: main.c,v 1.11 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/move.c b/trek/move.c index c9d297a..d1941b5 100644 --- a/trek/move.c +++ b/trek/move.c @@ -1,4 +1,4 @@ -/* $NetBSD: move.c,v 1.5 1998/08/30 09:19:40 veego Exp $ */ +/* $NetBSD: move.c,v 1.6 2003/08/07 09:37:52 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: move.c,v 1.5 1998/08/30 09:19:40 veego Exp $"); +__RCSID("$NetBSD: move.c,v 1.6 2003/08/07 09:37:52 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/nova.c b/trek/nova.c index 82164a6..7c5a876 100644 --- a/trek/nova.c +++ b/trek/nova.c @@ -1,4 +1,4 @@ -/* $NetBSD: nova.c,v 1.5 1998/08/30 09:19:40 veego Exp $ */ +/* $NetBSD: nova.c,v 1.6 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)nova.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: nova.c,v 1.5 1998/08/30 09:19:40 veego Exp $"); +__RCSID("$NetBSD: nova.c,v 1.6 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/out.c b/trek/out.c index c7ac084..550c2c2 100644 --- a/trek/out.c +++ b/trek/out.c @@ -1,4 +1,4 @@ -/* $NetBSD: out.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: out.c,v 1.7 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)out.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: out.c,v 1.6 1999/07/21 13:19:11 hubertf Exp $"); +__RCSID("$NetBSD: out.c,v 1.7 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/phaser.c b/trek/phaser.c index 8fe1925..e4f6dc3 100644 --- a/trek/phaser.c +++ b/trek/phaser.c @@ -1,4 +1,4 @@ -/* $NetBSD: phaser.c,v 1.8 2000/07/10 10:19:27 itojun Exp $ */ +/* $NetBSD: phaser.c,v 1.9 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)phaser.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: phaser.c,v 1.8 2000/07/10 10:19:27 itojun Exp $"); +__RCSID("$NetBSD: phaser.c,v 1.9 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/play.c b/trek/play.c index 3be6b94..a4dd6eb 100644 --- a/trek/play.c +++ b/trek/play.c @@ -1,4 +1,4 @@ -/* $NetBSD: play.c,v 1.7 2001/02/05 01:12:46 christos Exp $ */ +/* $NetBSD: play.c,v 1.8 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)play.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: play.c,v 1.7 2001/02/05 01:12:46 christos Exp $"); +__RCSID("$NetBSD: play.c,v 1.8 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/ram.c b/trek/ram.c index c6ba07f..008c691 100644 --- a/trek/ram.c +++ b/trek/ram.c @@ -1,4 +1,4 @@ -/* $NetBSD: ram.c,v 1.4 1997/10/12 21:25:08 christos Exp $ */ +/* $NetBSD: ram.c,v 1.5 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)ram.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: ram.c,v 1.4 1997/10/12 21:25:08 christos Exp $"); +__RCSID("$NetBSD: ram.c,v 1.5 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/ranf.c b/trek/ranf.c index 35506b4..24e3328 100644 --- a/trek/ranf.c +++ b/trek/ranf.c @@ -1,4 +1,4 @@ -/* $NetBSD: ranf.c,v 1.4 1997/10/12 21:25:09 christos Exp $ */ +/* $NetBSD: ranf.c,v 1.5 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)ranf.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: ranf.c,v 1.4 1997/10/12 21:25:09 christos Exp $"); +__RCSID("$NetBSD: ranf.c,v 1.5 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/rest.c b/trek/rest.c index a2f8310..2077de8 100644 --- a/trek/rest.c +++ b/trek/rest.c @@ -1,4 +1,4 @@ -/* $NetBSD: rest.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ +/* $NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)rest.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: rest.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); +__RCSID("$NetBSD: rest.c,v 1.6 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/schedule.c b/trek/schedule.c index 70a9cf3..6fba0f9 100644 --- a/trek/schedule.c +++ b/trek/schedule.c @@ -1,4 +1,4 @@ -/* $NetBSD: schedule.c,v 1.4 1997/10/12 21:25:11 christos Exp $ */ +/* $NetBSD: schedule.c,v 1.5 2003/08/07 09:37:53 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)schedule.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: schedule.c,v 1.4 1997/10/12 21:25:11 christos Exp $"); +__RCSID("$NetBSD: schedule.c,v 1.5 2003/08/07 09:37:53 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/score.c b/trek/score.c index 686356c..9deb214 100644 --- a/trek/score.c +++ b/trek/score.c @@ -1,4 +1,4 @@ -/* $NetBSD: score.c,v 1.4 1997/10/12 21:25:13 christos Exp $ */ +/* $NetBSD: score.c,v 1.5 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: score.c,v 1.4 1997/10/12 21:25:13 christos Exp $"); +__RCSID("$NetBSD: score.c,v 1.5 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/setup.c b/trek/setup.c index 41875b9..1f14f27 100644 --- a/trek/setup.c +++ b/trek/setup.c @@ -1,4 +1,4 @@ -/* $NetBSD: setup.c,v 1.7 2000/07/03 03:57:44 matt Exp $ */ +/* $NetBSD: setup.c,v 1.8 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: setup.c,v 1.7 2000/07/03 03:57:44 matt Exp $"); +__RCSID("$NetBSD: setup.c,v 1.8 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/setwarp.c b/trek/setwarp.c index 56ec60f..449d65f 100644 --- a/trek/setwarp.c +++ b/trek/setwarp.c @@ -1,4 +1,4 @@ -/* $NetBSD: setwarp.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ +/* $NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)setwarp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: setwarp.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); +__RCSID("$NetBSD: setwarp.c,v 1.6 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/shield.c b/trek/shield.c index c9a5352..b49e037 100644 --- a/trek/shield.c +++ b/trek/shield.c @@ -1,4 +1,4 @@ -/* $NetBSD: shield.c,v 1.7 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: shield.c,v 1.8 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)shield.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: shield.c,v 1.7 1999/07/21 13:19:11 hubertf Exp $"); +__RCSID("$NetBSD: shield.c,v 1.8 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/snova.c b/trek/snova.c index 85085f7..ef7a42d 100644 --- a/trek/snova.c +++ b/trek/snova.c @@ -1,4 +1,4 @@ -/* $NetBSD: snova.c,v 1.4 1997/10/12 21:25:18 christos Exp $ */ +/* $NetBSD: snova.c,v 1.5 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)snova.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: snova.c,v 1.4 1997/10/12 21:25:18 christos Exp $"); +__RCSID("$NetBSD: snova.c,v 1.5 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/srscan.c b/trek/srscan.c index 7456d23..1ce750a 100644 --- a/trek/srscan.c +++ b/trek/srscan.c @@ -1,4 +1,4 @@ -/* $NetBSD: srscan.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: srscan.c,v 1.6 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)srscan.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: srscan.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $"); +__RCSID("$NetBSD: srscan.c,v 1.6 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/systemname.c b/trek/systemname.c index 74ca777..64193f5 100644 --- a/trek/systemname.c +++ b/trek/systemname.c @@ -1,4 +1,4 @@ -/* $NetBSD: systemname.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $ */ +/* $NetBSD: systemname.c,v 1.6 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)systemname.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: systemname.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $"); +__RCSID("$NetBSD: systemname.c,v 1.6 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/torped.c b/trek/torped.c index d2305ca..e270b6d 100644 --- a/trek/torped.c +++ b/trek/torped.c @@ -1,4 +1,4 @@ -/* $NetBSD: torped.c,v 1.6 2000/07/03 03:57:44 matt Exp $ */ +/* $NetBSD: torped.c,v 1.7 2003/08/07 09:37:54 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)torped.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: torped.c,v 1.6 2000/07/03 03:57:44 matt Exp $"); +__RCSID("$NetBSD: torped.c,v 1.7 2003/08/07 09:37:54 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/trek.6 b/trek/trek.6 index d3376ee..083cacf 100644 --- a/trek/trek.6 +++ b/trek/trek.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: trek.6,v 1.10 2002/09/26 18:32:05 wiz Exp $ +.\" $NetBSD: trek.6,v 1.11 2003/08/07 09:37:55 agc Exp $ .\" .\" Copyright (c) 1980, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/trek/trek.h b/trek/trek.h index eaede63..31efa6a 100644 --- a/trek/trek.h +++ b/trek/trek.h @@ -1,4 +1,4 @@ -/* $NetBSD: trek.h,v 1.8 1999/09/17 17:06:08 jsm Exp $ */ +/* $NetBSD: trek.h,v 1.9 2003/08/07 09:37:55 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/trek/visual.c b/trek/visual.c index 26fd5b2..03f621f 100644 --- a/trek/visual.c +++ b/trek/visual.c @@ -1,4 +1,4 @@ -/* $NetBSD: visual.c,v 1.5 1999/09/08 21:45:33 jsm Exp $ */ +/* $NetBSD: visual.c,v 1.6 2003/08/07 09:37:55 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)visual.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: visual.c,v 1.5 1999/09/08 21:45:33 jsm Exp $"); +__RCSID("$NetBSD: visual.c,v 1.6 2003/08/07 09:37:55 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/warp.c b/trek/warp.c index 8f1a47b..c82aa1b 100644 --- a/trek/warp.c +++ b/trek/warp.c @@ -1,4 +1,4 @@ -/* $NetBSD: warp.c,v 1.7 2001/04/25 02:33:10 simonb Exp $ */ +/* $NetBSD: warp.c,v 1.8 2003/08/07 09:37:55 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)warp.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: warp.c,v 1.7 2001/04/25 02:33:10 simonb Exp $"); +__RCSID("$NetBSD: warp.c,v 1.8 2003/08/07 09:37:55 agc Exp $"); #endif #endif /* not lint */ diff --git a/trek/win.c b/trek/win.c index 5b7c8f2..218680e 100644 --- a/trek/win.c +++ b/trek/win.c @@ -1,4 +1,4 @@ -/* $NetBSD: win.c,v 1.6 2001/02/05 01:12:46 christos Exp $ */ +/* $NetBSD: win.c,v 1.7 2003/08/07 09:37:55 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -38,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: win.c,v 1.6 2001/02/05 01:12:46 christos Exp $"); +__RCSID("$NetBSD: win.c,v 1.7 2003/08/07 09:37:55 agc Exp $"); #endif #endif /* not lint */ diff --git a/worm/worm.6 b/worm/worm.6 index ed0ec64..11110b3 100644 --- a/worm/worm.6 +++ b/worm/worm.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: worm.6,v 1.9 2003/02/25 10:34:47 wiz Exp $ +.\" $NetBSD: worm.6,v 1.10 2003/08/07 09:37:56 agc Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/worm/worm.c b/worm/worm.c index 19a0124..3e00fa4 100644 --- a/worm/worm.c +++ b/worm/worm.c @@ -1,4 +1,4 @@ -/* $NetBSD: worm.c,v 1.23 2001/12/06 12:24:00 blymn Exp $ */ +/* $NetBSD: worm.c,v 1.24 2003/08/07 09:37:56 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)worm.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: worm.c,v 1.23 2001/12/06 12:24:00 blymn Exp $"); +__RCSID("$NetBSD: worm.c,v 1.24 2003/08/07 09:37:56 agc Exp $"); #endif #endif /* not lint */ diff --git a/worms/worms.6 b/worms/worms.6 index a8fd398..f4cc819 100644 --- a/worms/worms.6 +++ b/worms/worms.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: worms.6,v 1.12 2002/09/26 16:12:43 wiz Exp $ +.\" $NetBSD: worms.6,v 1.13 2003/08/07 09:37:57 agc Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/worms/worms.c b/worms/worms.c index 37e64e4..3607f88 100644 --- a/worms/worms.c +++ b/worms/worms.c @@ -1,4 +1,4 @@ -/* $NetBSD: worms.c,v 1.11 1999/07/30 02:23:27 hubertf Exp $ */ +/* $NetBSD: worms.c,v 1.12 2003/08/07 09:37:57 agc Exp $ */ /* * Copyright (c) 1980, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -43,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ #if 0 static char sccsid[] = "@(#)worms.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: worms.c,v 1.11 1999/07/30 02:23:27 hubertf Exp $"); +__RCSID("$NetBSD: worms.c,v 1.12 2003/08/07 09:37:57 agc Exp $"); #endif #endif /* not lint */ diff --git a/wtf/Makefrag b/wtf/Makefrag index a1d787b..a26c2bd 100644 --- a/wtf/Makefrag +++ b/wtf/Makefrag @@ -1,6 +1,6 @@ # Makefrag - makefile fragment for wtf # -# Copyright (c) 1999 Joseph Samuel Myers. +# Copyright (c) 1999, 2003 Joseph Samuel Myers. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,4 +34,5 @@ wtf_install: wtf_all $(INSTALL_SCRIPT) wtf/wtf $(INSTALL_PREFIX)$(GAMESDIR)/wtf $(HIDE_GAME) wtf $(INSTALL_DATA) wtf/acronyms $(INSTALL_PREFIX)$(WTF_ACRONYMFILE) + $(INSTALL_DATA) wtf/acronyms.comp $(INSTALL_PREFIX)$(WTF_ACRONYMFILE).comp $(INSTALL_MANUAL) wtf/wtf.6 diff --git a/wtf/acronyms b/wtf/acronyms index de9ff5b..068be76 100644 --- a/wtf/acronyms +++ b/wtf/acronyms @@ -1,4 +1,4 @@ -$NetBSD: acronyms,v 1.113 2003/02/05 20:11:04 mason Exp $ +$NetBSD: acronyms,v 1.129 2003/11/22 18:01:46 jschauma Exp $ AFAICR as far as I can recall AFAICT as far as I can tell @@ -7,13 +7,17 @@ AFAIR as far as I recall AFAIU as far as I understand AFD away from desktop AFK away from keyboard +AFU all fucked up AFW away from window AIU as I understand AIUI as I understand it AKA also known as +ASAIC as soon as I can ASAP as soon as possible +ATM at the moment AWOL absent without official leave AYBABTU all your base are belong to us +B/C because BBL [I'll] be back later BBS be back soon BBT be back tomorrow @@ -34,6 +38,8 @@ CMIIW correct me if I'm wrong CNP continued [in my] next post COB close of business [day] CYA see you around +D/L download +DIY do it yourself DKDC don't know, don't care DSTM don't shoot the messenger DTRT do the right thing @@ -42,10 +48,12 @@ DWIM do what I mean EG evil grin EMSG email message EOB end of business [day] +EOD end of discussion EOL end of life ETLA extended three letter acronym EWAG experienced wild-ass guess FAQ frequently asked question +FCFS first come first served FIIK fuck[ed] if I know FIIR fuck[ed] if I remember FM fucking magic @@ -58,17 +66,28 @@ FUD fear, uncertainty and doubt FWIW for what it's worth FYI for your information G grin +G/C garbage collect +GAC get a clue +GAL get a life GIGO garbage in, garbage out GMTA great minds think alike GTFO get the fuck out +GTG got to go HAND have a nice day HHIS hanging head in shame +HICA here it comes again HTH hope this helps +IAC in any case IANAL I am not a lawyer +IC I see +ICBW I could be wrong +ICCL I couldn't care less IHAFC I haven't a fucking clue +IHBW I have been wrong IHNFC I have no fucking clue IIANM if I am not mistaken IIRC if I recall correctly +IIUC if I understand correctly IMAO in my arrogant opinion IMCO in my considered opinion IMHO in my humble opinion @@ -80,7 +99,8 @@ ISAGN I see a great need ISTM it seems to me ISTR I seem to recall ITYM I think you mean -IYSS If you say so +IYSS if you say so +J/K just kidding JIC just in case JK just kidding JMO just my opinion @@ -95,25 +115,31 @@ LMAO laughing my ass off LMSO laughing my socks off LOL laughing out loud LTNS long time no see -MMU memory management unit +MIA missing in action MOTAS member of the appropriate sex MOTOS member of the opposite sex MOTSS member of the same sex MTF more to follow MYOB mind your own business +N/M never mind NBD no big deal NFC no fucking clue NFI no fucking idea NFW no fucking way NIH not invented here +NOYB none of your business +NOYFB none of your fucking business NP no problem NRFPT not ready for prime time NRN no reply necessary OIC oh, I see +OMG oh, my god +OT off topic OTL out to lunch OTOH on the other hand OTT over the top OTTOMH off the top of my head +PEBKAC problem exists between keyboard and chair PFO please fuck off PFY pimply faced youth PITA pain in the ass @@ -135,6 +161,7 @@ ROTFL rolling on the floor laughing RP responsible person RSN real soon now RTFB read the fine/fucking book +RTFC read the fine/fucking code RTFM read the fine/fucking manual RTFMP read the fine/fucking man page RTFS read the fine/fucking source @@ -147,37 +174,54 @@ SMLSFB so many losers, so few bullets SMOP simple matter of programming SNAFU situation normal, all fucked up SNERT snot-nosed egotistical rude teenager +SNR signal to noise ratio SO significant other SOB son of [a] bitch SOL shit out [of] luck SOP standard operating procedure SSIA subject says it all +STFA search the fucking archives +STFU shut the fuck up SUS stupid user syndrome SWAG silly, wild-assed guess SWAHBI silly, wild-assed hare-brained idea SWMBO she who must be obeyed TANSTAAFL there ain't no such thing as a free lunch +TBC to be continued TBD to be {decided,determined,done} +TBOMK the best of my knowledge TIA thanks in advance +TINC there is no cabal TLA three letter acronym TLB translation lookaside buffer TMA too many abbreviations TMI too much information TOEFL test of english as a foreign language +TRT the right thing +TTBOMK to the best of my knowledge TTFN ta ta for now TTYL talk to you later TWIAVBP the world is a very big place TYVM thank you very much +U/L upload UTSL use the source, Luke VEG very evil grin +W/ with +W/O without WAG wild-ass guess +WB welcome back +WFM works for me WIBNI wouldn't it be nice if +WIP work in progress WOFTAM waste of fucking time and money WOMBAT waste of money, brain, and time WRT with respect to WTF {what,where,who,why} the fuck WTH {what,where,who,why} the hell WYSIWYG what you see is what you get +YHBT you have been trolled +YHL you have lost YKWIM you know what I mean YMA yo momma's ass YMMV your mileage may vary +YW you're welcome diff --git a/wtf/acronyms.comp b/wtf/acronyms.comp new file mode 100644 index 0000000..7e807c8 --- /dev/null +++ b/wtf/acronyms.comp @@ -0,0 +1,185 @@ +$NetBSD: acronyms.comp,v 1.28 2003/12/02 18:14:17 sketch Exp $ + +ABI application binary interface +ACPI advanced configuration and power interface +ADC analog [to] digital converter +AGP accelerated graphics port +ANSI American National Standards Institute +API application programming interface +APIC advanced programmable interrupt controller +AT advanced technology +ATA advanced technology attachment +ATAPI advanced technology attachment packet interface +ATX advanced technology extended +BEDO burst extended data output +BGP border gateway protocol +BIOS basic input/output system +BLOB binary large object +BSD berkeley software distribution +CAD computer-aided design +CAV constant angular velocity (as opposed to CLV) +CD compact disc +CDRAM cache dynamic random access memory +CGA color graphics array +CHS cylinder/head/sector +CIDR classless inter-domain routing +CLI command line interface +CLV constant linear velocity (as opposed to CAV) +CPU central processing unit +CRLF carriage return line feed +CRT cathode ray tube +CSS cascading style sheets +CVS concurrent versions system +DAC digital [to] analog converter +DDC display data channel +DDR double data rate +DDWG digital display working group +DMA direct memory access +DNS domain name system +DRAM dynamic random access memory +DSL digital subscriber line +DTD document type definition +DVD digital versatile disc +DVI digital visual interface +ECP enhanced capability port +EDID extended display identification data +EDO extended data out +EEPROM electrically erasable programmable read only memory +EGA enhanced graphics array +EISA extended industry standard architecture +EPP enhanced parallel port +EPROM erasable programmable read only memory +ESDRAM enhanced synchronous dynamic random access memory +FBRAM frame buffer random access memory +FFS fast file system +FLOPS floating [point] operations per second +FPM fast page mode +FQDN fully qualified domain name +FTP file transfer protocol +GIF graphics interchange format +GNU gnu's not unix +GPL gnu/general public license +GPU graphics processing unit +GUI graphics user interface +HDCP high-bandwidth digital content protection +HTML hyper-text markup language +HTTP hyper-text transfer protocol +I2O intelligent input/output +IANA internet assigned number authority +IC integrated circuit +ICB internet citizen's band +ICMP internet control message protocol +IDE integrated drive electronics +IEC International Electrotechnical Commission +IEEE institute [of] electrical [and] electronics engineers +IESG internet engineering steering group +IETF internet engineering task force +IKE internet key exchange +IMAP internet mail access protocol +INCITS InterNational Committee on Information Technology Standards +IO input/output +IOCTL input/output control +IP internet protocol +IPNG internet protocol, next generation +IPSEC internet protocol security +IRC internet relay chat +IRQ interrupt request +IRTF internet research task force +ISA industry standard architecture +ISDN integrated services digital network +ISO International Standards Organization +ISOC internet society +ISP internet service provider +JPEG joint photographic experts group +KVA kernel virtual address +LAN local area network +LBA logical block addressing +LCD liquid crystal display +LDAP lightweight directory access protocol +LSB least significant bit [or: byte] +LUN logical unit number +MAC media access control +MBR master boot record +MDRAM multibank dynamic random access memory +MIPS million instructions per second +MMU memory management unit +MSB most significant bit [or: byte] +MTA mail transfer agent +MTU maximum transmission unit +MUA mail user agent +NAT network address translation +NIC network interface card +NIS network information service +NUMA non uniform memory access +OTP one time password +PAX portable archive exchange +PCI peripheral component interconnect +PCMCIA Personal Computer Memory Card International Association +PDP page descriptor page +PERL practical extraction [and] report language +PGP pretty good privacy +PIC programmable interrupt controller +PID process id +PIO programmed input/output +PNG portable network graphics +POP post office protocol +POSIX portable operating system interface [for] unix +POST power on self test +PPP point-to-point protocol +PPPOE point-to-point protocol over ethernet +PROM programmable read only memory +PTE page table entry +PTLA pseudo top level aggregator +PTP page table page +RAID redundant array of inexpensive disks +RAM random access memory +RCS revision control system +RFC request for comments +RGB red green blue +RISC reduced instruction set computing +ROM read only memory +RPM revolutions per minute +RTF rich text format +S/PDIF sony/phillips digital interface +SAM serial access memory +SASI Shugart Associates system interface (predecessor to SCSI) +SATA serial advanced technology attachment +SCSI small computer system interface +SDRAM synchronous dynamic random access memory +SGRAM synchronous graphics random access memory +SLDRAM synchronous-link dynamic random access memory +SMART self-monitoring analysis and reporting technology +SMP symmetric multiprocessing +SMTP simple mail transfer protocol +SPD serial presence detect +SRAM static random access memory +SSH secure shell +SSL secure sockets layer +SVGA super video graphics array +TCL tool command language +TCP transmission control protocol +TFT thin film transistor +TLA top level aggregator +TLD top level domain +TMDS transition minimized differential signaling +TTY teletype +TZ time zone +UC uncacheable +UDP user datagram protocol +UPS uninterruptible power supply +URI uniform resource identifier +URL uniform resource locator +USB universal serial bus +USWC uncacheable speculative write combining +UUCP unix-to-unix copy protocol +VCM virtual channel memory +VESA video electronics standards association +VGA video graphics array +VPN virtual private network +VRAM video random access memory +WRAM window random access memory +WWW world wide web +XGA extended graphics array +XML extensible markup language +XSL extensible stylesheet language +XT extended technology diff --git a/wtf/wtf.6.in b/wtf/wtf.6.in index 93cdc1a..cf50ebd 100644 --- a/wtf/wtf.6.in +++ b/wtf/wtf.6.in @@ -1,8 +1,8 @@ -.\" $NetBSD: wtf.6,v 1.5 2002/09/26 16:12:44 wiz Exp $ +.\" $NetBSD: wtf.6,v 1.8 2003/04/25 19:08:31 jmmv Exp $ .\" .\" Public Domain .\" -.Dd July 21, 1999 +.Dd April 25, 2003 .Dt WTF 6 .Os .Sh NAME @@ -10,6 +10,8 @@ .Nd translates acronyms for you .Sh SYNOPSIS .Nm +.Op Fl f Ar dbfile +.Op Fl t Ar type .Op Ar is .Ar acronym Ar ... .Sh DESCRIPTION @@ -29,6 +31,21 @@ is specified on the command line, it will be ignored, allowing the fairly natural .Dq wtf is WTF usage. +.Pp +The following options are available: +.Bl -tag -width flag +.It Fl f Ar dbfile +Overrides the default acronym database, bypassing the value of the +.Ev ACRONYMDB +variable. +.It Fl t Ar type +Specifies the acronym's type. +Simply put, it makes the program use the acronyms database named +.Pa @wtf_acronymfile@.type , +where +.Ar type +is given by the argument. +.El .Sh ENVIRONMENT .Bl -tag -width ACRONYMDB .It Ev ACRONYMDB @@ -38,9 +55,11 @@ environment variable to the name of a file in the proper format (acronym[tab]meaning). .El .Sh FILES -.Bl -tag -width @wtf_acronymfile@ -compact +.Bl -tag -width @wtf_acronymfile@.XXXX -compact .It Pa @wtf_acronymfile@ default acronym database. +.It Pa @wtf_acronymfile@.comp +computer-related acronym database. .El .Sh SEE ALSO .Xr whatis 1 diff --git a/wtf/wtf.in b/wtf/wtf.in index 23ac184..4b67f62 100755 --- a/wtf/wtf.in +++ b/wtf/wtf.in @@ -1,18 +1,48 @@ #!/bin/sh # -# $NetBSD: wtf,v 1.8 2003/02/06 15:17:01 salo Exp $ +# $NetBSD: wtf,v 1.11 2003/04/25 19:08:31 jmmv Exp $ # # Public domain # +usage() { + echo "usage: `basename $0` [-f dbfile] [-t type] [is] " + exit 1 +} + acronyms=${ACRONYMDB:-@wtf_acronymfile@} +args=`getopt f:t: $*` +if [ $? -ne 0 ]; then + usage +fi +set -- $args +while [ $# -gt 0 ]; do + case "$1" in + -f) + acronyms=$2; shift + ;; + -t) + acronyms=@wtf_acronymfile@.$2; shift + ;; + --) + shift; break + ;; + esac + shift +done + if [ X"$1" = X"is" ] ; then shift fi if [ $# -lt 1 ] ; then - echo "Usage: `basename $0` [is] " + usage +fi + +if [ ! -f $acronyms ]; then + echo "`basename $0`: cannot open acronyms database file \`$acronyms'" + exit 1 fi rv=0 diff --git a/wump/pathnames.h.in b/wump/pathnames.h.in index c6c1105..8b023e4 100644 --- a/wump/pathnames.h.in +++ b/wump/pathnames.h.in @@ -1,4 +1,4 @@ -/* $NetBSD: pathnames.h,v 1.3 1995/04/22 08:19:48 cgd Exp $ */ +/* $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:57 agc Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -12,11 +12,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/wump/wump.6 b/wump/wump.6 index f2f5450..67ae2c3 100644 --- a/wump/wump.6 +++ b/wump/wump.6 @@ -1,4 +1,4 @@ -.\" $NetBSD: wump.6,v 1.5 1997/10/12 03:36:41 lukem Exp $ +.\" $NetBSD: wump.6,v 1.6 2003/08/07 09:37:57 agc Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -14,11 +14,7 @@ .\" 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 University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" diff --git a/wump/wump.c b/wump/wump.c index fa616db..da7a630 100644 --- a/wump/wump.c +++ b/wump/wump.c @@ -1,4 +1,4 @@ -/* $NetBSD: wump.c,v 1.14 2001/08/31 07:16:22 jsm Exp $ */ +/* $NetBSD: wump.c,v 1.15 2003/08/07 09:37:57 agc Exp $ */ /* * Copyright (c) 1989, 1993 @@ -16,11 +16,7 @@ * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -47,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\ #if 0 static char sccsid[] = "@(#)wump.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: wump.c,v 1.14 2001/08/31 07:16:22 jsm Exp $"); +__RCSID("$NetBSD: wump.c,v 1.15 2003/08/07 09:37:57 agc Exp $"); #endif #endif /* not lint */