Commit Graph

998 Commits

Author SHA1 Message Date
wiz
f969f104bd Formatting improvements (from OpenBSD) 2001-07-11 16:11:36 +00:00
wiz
25e280d9bf Typo fixes. From OpenBSD. 2001-07-10 16:56:39 +00:00
mason
8b7b300873 s/Upon you knees if you appear/Upon your knees if you appear/
Confirmed against <http://www.alcyone.com/max/lit/devils/>.
2001-06-24 23:25:19 +00:00
wiz
3f9984fc90 existent', not existant' 2001-06-19 13:42:07 +00:00
wiz
0a600be867 receive, not recieve 2001-06-12 15:17:10 +00:00
lukem
073b3ed1ba fix building of phantasia ($FILES dependency on $PROG broke things) 2001-06-06 17:34:19 +00:00
lukem
4af1b6e1a6 fix building of cards.pck 2001-06-06 17:31:28 +00:00
wiz
fc2eb0a5ad Remove unnecessary quotes in Dt. 2001-06-05 12:41:04 +00:00
wiz
4abaa1bb50 No argument for .Os. 2001-06-05 11:11:07 +00:00
christos
ebe68eb4f9 Overhaul error handling and reporting for regular expressions.
Provide a RE_OK() macro that tests if the current compiled pattern
works and a RE_ERROR() macro that prints what went wrong as well
as the particular RE implementation can handle.
2001-06-04 21:21:42 +00:00
aymeric
37e6eb8fe5 Bail out when regex pattern is invalid if using regcomp or regcmp.
Remove trailing \n's also.

Addresses PR#13109
2001-06-04 20:56:56 +00:00
christos
42c813cc0b don't deref -1. 2001-06-02 17:30:28 +00:00
abs
d590e6f410 Its is Dr. Elizabeth Dehner, not Dehaver.
From the vast and bewildering trek trivia of norm@sandbox.org.uk
2001-05-02 10:42:34 +00:00
simonb
6f6fe2f3ad Spell occurred correctly. 2001-04-25 02:33:08 +00:00
pooka
e1d6858626 NetBSD: You choose the hardware, we'll bring the OS.
from David Brownlee on netbsd-advocacy

While I'm in here, sort the file using tools/do_sort to get the recently
added fortunes into order.
2001-04-21 23:11:30 +00:00
hubertf
1bbc6b0055 Some entries from Richard Rauch, posted on netbsd-advocacy. 2001-04-21 14:49:08 +00:00
wiz
14dbdf5518 Negative exit code cleanup: Replace exit(-x) with exit(x).
As seen on tech-userlevel.
2001-04-06 11:13:45 +00:00
wiz
4982acfa1c mdoc'ify. 2001-04-04 11:41:01 +00:00
wiz
8a84240a6e Whitespace and/or punctuation fixes. 2001-04-02 22:47:29 +00:00
wiz
d41deffb56 mdoc'ify, and clean up in the process. 2001-04-02 22:46:18 +00:00
wiz
834bb1b3ab Whitespace and/or punctuation fixes. 2001-04-02 22:42:37 +00:00
wiz
d6a5b6cce4 Convert to mdoc. Still needs tbl for two tables that have more than 6
columns, but looks much nicer now.
2001-04-02 22:41:43 +00:00
simonb
eb5ddb38e4 Build the data files in the obj/compile directory and install them with
FILES and FILESDIR.
"Problem" reported by David Querbach on current-users.
2001-03-27 02:23:28 +00:00
jsm
ab8b63434d Make mostly gcc -W clean, and other cleanup:
Use const.
Add __noreturn__ attributes.
Add a __format__ attribute.
Add __unused__ attributes.
Use symbolic constants for open() and lseek().
Declare types of all function parameters; convert some function
definitions to ISO C form.
Ensure standard file descriptors are open on startup.
Check for errors writing output of makedefs.
Avoid duplicate definitions of variables.
2001-03-25 20:43:58 +00:00
garbled
4d1c182377 Fix problem noted in PR 6649 (trailing whitespace on .Nm) 2001-03-07 22:30:38 +00:00
cgd
668a4dd967 convert to use getprogname() 2001-02-19 22:39:39 +00:00
pooka
e2ced2d617 kill dupe 2001-02-10 18:14:13 +00:00
simonb
73c32f039c Fix simple typo. From bdc@world.std.com in PR misc/12150. 2001-02-07 22:59:19 +00:00
christos
b67c82fdfe fix redundant decls and nested externs 2001-02-05 01:12:46 +00:00
christos
dc6488eb8e remove redundant decls. 2001-02-05 01:10:08 +00:00
christos
16263c885d remove duplicate decls 2001-02-05 01:04:25 +00:00
christos
1b1c2fdcec fix nested externs 2001-02-05 01:02:45 +00:00
christos
c18d8e65fc remove redundant decls 2001-02-05 01:01:27 +00:00
christos
a0d324ea8d - rename getchar to lgetchar to avoid conflicts with the stdio getchar
- fix redundant decls and nested externs
- use snprintf instead of sprintf
2001-02-05 00:57:32 +00:00
christos
d3c5cea8f0 remove redundant decls 2001-02-05 00:42:14 +00:00
christos
7a04a9fd9e eliminate nested externs 2001-02-05 00:40:45 +00:00
christos
bc32159d26 fix redundant decls and nested externs. while I am here change my copyright
to TNF.
2001-02-05 00:37:43 +00:00
christos
1f9a3967e4 fix nested externs 2001-02-05 00:30:38 +00:00
christos
a2bee8edad fix nested extern and usage message 2001-02-05 00:29:44 +00:00
christos
b176d7de54 remove redundant decl 2001-02-05 00:28:30 +00:00
christos
f06735e877 fix nested extern 2001-02-05 00:27:35 +00:00
christos
d249c86e88 remove redundant decl 2001-02-05 00:23:59 +00:00
christos
a3807f8fed fix redundant decls and nested externs 2001-02-05 00:22:52 +00:00
christos
57bae04512 fix nested extern 2001-02-05 00:20:58 +00:00
christos
762fbcf25e eliminate redundant decls 2001-02-05 00:20:05 +00:00
mjl
bdb00d0bd7 Tyop: foresight, not forsight (FreeBSD PR/24637) 2001-01-30 00:25:30 +00:00
jdolecek
a30fb66eca play(): use snprintf() instead of hard-to-parse strncpy() calls 2001-01-25 20:41:41 +00:00
itojun
af50a10f87 avoid strange typcast. 2001-01-20 15:06:34 +00:00
cgd
d594ce939b comment or delete text after CPP directives. 2001-01-16 02:50:27 +00:00
cgd
bcc8ec9959 include stdlib.h for prototypes (typically for exit()). 2001-01-16 02:44:43 +00:00
cgd
9cfe468c74 avoid C sequence point issues warned about by development version of gcc. 2001-01-16 02:41:17 +00:00
jwise
06f3cba6d2 The capital of Mordor is _not_ Minas Morgul. 2001-01-12 04:33:51 +00:00
lukem
f8141417ed - openlog "huntd" instead of "HUNT"
- consistently log non-critical errors at LOG_WARNING not LOG_ERR
- consistently use positive numbers for exit() and _exit()
- one warning was using printf() instead of syslog()
2001-01-09 23:49:54 +00:00
lukem
443a19e035 convert to using .WAIT 2001-01-09 03:13:39 +00:00
lukem
de3e6adaf6 use more standard %ll_ in favour of %q_ 2001-01-04 17:24:35 +00:00
itojun
7fde9b10c9 need string.h for prototype (checked with alpha) 2001-01-04 06:33:18 +00:00
jwise
a5f75468c7 Normalize signature of ship handling functions -- struct ship * from and
struct ship * to are now always the first two args.
2001-01-04 06:16:51 +00:00
jwise
d62e34ecca Various stylistic nits. 2001-01-04 05:34:56 +00:00
jwise
cf3f63cd97 Use License templates from localsrc for license on new files. 2001-01-04 05:06:15 +00:00
jwise
9baf035b4e Break out curses display-related globals into a new header file, so that
<curses.h> doesn't have to be included all over the place.
2001-01-04 04:41:41 +00:00
jwise
61a39e0b38 More rationalization of include files:
a.) Don't include a zillion system headers from "extern.h" (actually, don't
    include any).
b.) Break a global jmp_buf variable into a new file, so <setjmp.h> doesn't
    have to be pulled in everywhere (it's only used in two places).

The (one line) new file is (c) TNF with a three-clause license, FW(L)IW.
2001-01-04 03:51:23 +00:00
jwise
aac077fce8 Rationalize inclusion of header files: cut down on `include everything
everywhere' a little (more to go), and as per KNF, local includes after
system includes.
2001-01-04 03:21:16 +00:00
jwise
43894be666 Second half of static-ization of local funcs. 2001-01-04 02:43:32 +00:00
jwise
d5c5fed0c7 G/C undocumented and unimplemented `-D' (debug) option. 2001-01-04 01:56:27 +00:00
jwise
bca097d567 First half of static-ization of local funcs. 2001-01-04 01:53:24 +00:00
jwise
a6dfac213f De-`register' 2001-01-04 01:13:34 +00:00
jwise
3ad2426f33 Fix getopt usage (again) in case where user does not choose a scenario on
the command line.
2001-01-01 22:33:01 +00:00
jwise
fdb512d4b5 Missed commit -- ANSIfy in preparation for further work. 2001-01-01 22:23:29 +00:00
jwise
e6d2cd0771 Fix getopt() usage. 2001-01-01 22:05:04 +00:00
jwise
dfea9f08db ANSIfy in preparation for further work. 2001-01-01 21:57:37 +00:00
sommerfeld
83454472f9 ${PRINTOBJDIR}ify 2000-12-30 17:51:26 +00:00
mycroft
9fcf4550a2 Another one that really belongs here... 2000-12-17 10:08:08 +00:00
mycroft
34fedde795 Compress the other entries vertically. 2000-12-17 09:35:21 +00:00
mycroft
562421c4f3 Reformat one entry for vertical space. 2000-12-17 09:25:38 +00:00
mycroft
c1647142f9 Yes, it's about damn time fortune(6) got some new material. 2000-12-17 09:17:51 +00:00
tsarna
793ecee1b1 CNN, BSD declare Bush winner. 2000-12-14 02:38:02 +00:00
jwise
8ebca10bc2 Fix warning. 2000-11-30 22:07:24 +00:00
jwise
3e7481b12e Use random() instead of rand(), and seed from time(3) instead of from getpid(). 2000-11-30 22:06:04 +00:00
jwise
48253ebcef Change the macro to roll a six-sided die from die() to dieroll() (for
obvious reasons of convention).
2000-11-30 22:02:20 +00:00
jwise
f876814eec ANSIfy in preparation for changes. 2000-11-30 21:50:58 +00:00
jwise
91d3d6a540 Use getopt(3) for flag processing. 2000-11-30 21:38:57 +00:00
jwise
65d4c9fc15 Fix style nit. 2000-11-30 21:31:33 +00:00
jwise
ed516eb73f ANSIfy in preparation for other changes. 2000-11-30 21:29:32 +00:00
soren
3dbb440e9f Just print basename in usage string. 2000-11-21 00:18:52 +00:00
lukem
51ea0cba47 remove unnecessary command name after .Nm 2000-11-07 05:51:54 +00:00
lukem
87567a7fcd use lowercase with .Nm to match actual command name 2000-11-07 05:49:31 +00:00
mrg
f601feea40 fix a bug in the call to srandom(): xor time() with getpid(), don't add them!
now fortune(6) run in an unending loop does not appear to show the same
fortunes over and over and over.
2000-10-31 13:27:56 +00:00
hubertf
42f9d6c1e4 NetBSD will put hair on a UNIX admin's chest
-- Jason R. Fink
2000-10-09 00:58:16 +00:00
mjl
b1342ea8af Removed duplicate entry. Fixes FreeBSD PR/21629. 2000-09-29 00:40:40 +00:00
jsm
5fd015d6f6 In cypher(), don't attempt to make sense of words other than VERBs or
KNIFE when a verb is required.  Add AUXVERB for "make", "move",
"climb" (as in "make love", "climb up") and ignore AUXVERB as a verb,
going on to the next word, instead of treating these words as
adjectives.  When creating new verbs from "put on", "put down", "take
off", mark them as type VERB.  Mostly from Paul Janzen
<pjanzen@foatdi.harvard.edu>.
2000-09-25 19:37:58 +00:00
jsm
ca0c4d77e3 Add new flags OBJ_PERSON and OBJ_NONOBJ to the objflags array. 2000-09-25 14:44:59 +00:00
jsm
e2872de219 Add OBJ_AN flag to objflags so as to use "a" or "an" appropriately in
messages; avoids "a amulet", "a Elf".  Define and use macros to use
"a", "an", "the", "is", "are" appropriately.  Partly based on OpenBSD.
2000-09-25 14:08:08 +00:00
jsm
293597460a Remove excess blank lines. From OpenBSD. 2000-09-25 14:06:20 +00:00
jsm
4cf0caf4ef Fix loving already loved goddess; avoid fallthrough after loving
goddess; give error on "love amulet".  From OpenBSD.
2000-09-25 14:05:52 +00:00
jsm
9cffc34578 Use defined constant FINAL instead of hardcoded 275. From OpenBSD. 2000-09-25 00:33:18 +00:00
jsm
f97a3c82c3 Fix logic error in use of n and wordnumber in murder() when using
laser.  From OpenBSD.
2000-09-25 00:28:54 +00:00
jsm
572a824811 Discard any part of a line of input that goes beyond our buffer rather
than treating it as our next line of input.  From OpenBSD.
2000-09-24 15:51:40 +00:00
jsm
96232c1c4d Give less cryptic messages than "-1%" when WEIGHT or CUMBER are zero. 2000-09-24 14:42:18 +00:00
jsm
ad9cea40fa Add explicit no-ops to empty loops following the NetBSD style guide. 2000-09-24 14:20:23 +00:00
jsm
579d7e283b Make hash table static in parse.c. 2000-09-24 14:11:09 +00:00
jsm
91d0e30d01 Use NULL instead of 0 (from OpenBSD). Also add or adjust comments. 2000-09-24 09:47:22 +00:00
jsm
ac1f171d5b Correct spelling "dont" to "don't". From OpenBSD. 2000-09-24 09:46:57 +00:00
jsm
44c05578b0 Make functions local to parse.c static. 2000-09-24 09:46:28 +00:00
jsm
b40caee28a Give a better message for trying to eat things it doesn't make sense
to eat.  For something eatable, check first whether you're holding it,
then whether you have a knife, then whether you're stuffed (gives
better message for "eat coconuts" when you don't have any).  From
OpenBSD.
2000-09-24 09:46:03 +00:00
jsm
6e6404a77d Clean up fly.c by making local variables and functions static and
removing abs() macro.
2000-09-24 09:44:28 +00:00
jsm
c2a6fb8d9d Prevent CUMBER from going negative; avoid division by zero if it is
zero.
2000-09-24 09:41:53 +00:00
jsm
1b39778596 Attempt to disambiguate BODY for kicking. Avoid crashing or nonsense
messages on "kick door" and "kick man".  From OpenBSD.
2000-09-24 09:39:56 +00:00
jsm
1781c4f837 Allow for bathing goddess in love(); give better message for a lover
that isn't present and for certain choices of lover.  From OpenBSD.
2000-09-23 19:51:02 +00:00
jsm
d2c1d833b2 Allow for the bathing goddess in ravage(). From OpenBSD. 2000-09-23 19:45:07 +00:00
jsm
d3579258c9 Use a lookup table to identify whether objects are plural or singular,
instead of testing the final character against 's' in each place.
Avoids oddities about "pot of jewels" and "compass".
2000-09-23 19:23:57 +00:00
simonb
cd2e1c1e91 Use ${COPY} instead of -c for ${INSTALL} commands. 2000-09-23 13:53:41 +00:00
jhawk
650c1aea1c Correct descriptions of "marked" vs. "ignored" -- they were swapped. 2000-09-23 01:52:50 +00:00
jsm
05ca74ab1c Don't say "Kicked." of an object not present; give sensible messages.
From OpenBSD.
2000-09-22 12:38:10 +00:00
jsm
016903dbdb Check for an object being taken not being there before checking for
whether it is too heavy or too bulky; gives a better message for "take
viper" with the viper not present.
2000-09-22 12:37:32 +00:00
jsm
d67a03db02 Give appropriate messages (rather than saying nothing) if an verb is
used with "all" and nothing relevant is present.  From OpenBSD.
2000-09-22 08:19:57 +00:00
jsm
0f933d0d56 Remove all adjectives in parse(), since they are nowhere used. Fixes
crash on "carry old all" shown up by fuzz testing.  Patch from Paul
Janzen <pjanzen@foatdi.harvard.edu>.
2000-09-22 08:19:21 +00:00
jsm
b283f74760 Give an appropriate error on "kill all" rather than a crash or
nonsense message.  From OpenBSD.
2000-09-22 08:18:20 +00:00
jsm
1fc5d09e80 Various improvements to parsing in battlestar, mostly from OpenBSD.
Define a constant WORDLEN.  Always use this constant and NWORD where
appropriate.

Use NWORD - 1 in battlestar.c to avoid off-by-one error.

Increment wordnumber after the INVEN verb to allow it to be followed
by a comma and other actions.

Avoid overflowing elements of the words array if input words are too
long.

Parse "," as AND except when followed by a verb, to allow such
constructions as "take foo, bar, and baz".  Trim AND AND which may
occur from the ", and" in such a list.

Avoid crashes from EVERYTHING in the wrong place by moving it to the
start of OBJECT AND EVERYTHING and NOUNS AND EVERYTHING sequences, and
trimming EVERYTHING AND EVERYTHING.
2000-09-21 17:44:34 +00:00
jsm
6d1847f667 Don't try to wear anything that isn't OBJECT or NOUNS. Don't try to
wear DOOR or anything without a short description.  Fixes crashes on
"wear knfo" (bug reported by Peter Maydell
<pmaydell@chiark.greenend.org.uk>), "wear wear", "wear kick", "wear
door" and "wear goddess".  Partly from OpenBSD.
2000-09-21 10:38:50 +00:00
jsm
a4454d2982 If no hand-to-hand weapons are available, try using the laser to kill
in murder().  From OpenBSD.
2000-09-21 10:22:36 +00:00
jsm
16d8e9af6f die() on EOF; based on OpenBSD. 2000-09-21 09:49:03 +00:00
jsm
956f5c6ba6 From OpenBSD: in kiss(), "take" the bathing goddess if required, and
give a better error message if the person to kiss is not present.
2000-09-21 09:48:10 +00:00
jsm
ca5dbcecd4 Add missing initialisers (avoid gcc -W warnings) and comments giving
room numbers.
2000-09-18 06:14:31 +00:00
jsm
819ea9d1a6 Clean up formatting; partly from OpenBSD. 2000-09-17 23:04:17 +00:00
jsm
31b523eee5 Patches from OpenBSD: add verbs "open"/"unlock" (essentially a no-op),
and "verbose"/"brief" (in verbose mode, always show long room
descriptions), and synonyms "papaya" for "papayas" and "coconut" for
"coconuts".
2000-09-17 23:03:43 +00:00
jsm
cf35dbffa1 Based on OpenBSD: spelling, punctuation, grammar and line length
adjustments, and support for '=' in room descriptions meaning a
literal '-'.
2000-09-10 10:52:56 +00:00
jsm
3e02203ec6 Wording, punctuation and line length improvements. Also adjust test
for killing nonsensical things to fix crash with "kill door".  From
OpenBSD.
2000-09-10 10:51:16 +00:00
jsm
d71839604a Make spacing nicer and add explicit NULL initializers. 2000-09-09 18:03:58 +00:00
jsm
c6bbb5288d Store copy of username with strdup rather than using a fixed length
buffer.  Also make initialization functions and arrays static.
2000-09-09 09:37:58 +00:00
jsm
ce85e35a32 Put prototypes in alphabetical order. 2000-09-09 09:36:23 +00:00
jsm
a7c82eea02 Spelling and punctuation corrections or improvements from OpenBSD. 2000-09-08 17:25:31 +00:00
jsm
af3dee978f Make code clearer; add a macro ROOMDESC for the number of times a room
should be visited for the short description only to be used, and don't
increment beenthere[position] beyond this value.  From OpenBSD.
2000-09-08 17:22:01 +00:00
jsm
ec240586d1 Manpage improvements based on OpenBSD. 2000-09-08 17:18:36 +00:00
abs
90a84d2445 If we install limerick-o.dat, we should also install limerick-o to make it
usable.
2000-08-17 16:54:28 +00:00
abs
5b783e3f48 Split netbsd fortunes into offensive and non offensive.
Split could be considered somewhat arbitrary.
2000-08-17 16:48:52 +00:00
abs
ad603791f5 NetBSD: A pmap for every occasion 2000-08-17 16:27:38 +00:00
mason
a6cd58daee Corrected quote. It was totally missing its (well-known) equivalent of
a punch line.
2000-08-12 23:04:15 +00:00
simonb
251d3a61d0 Use a local implementation of htonl() called h2nl(). htonl() is not
available in all cross-compile environments.

Patches from Chris Demetriou.
2000-07-31 11:39:00 +00:00
ad
689c315829 Add 3 from me. 2000-07-31 11:38:21 +00:00
simonb
959e90b8fb Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros for host programs -
use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:35:03 +00:00
simonb
38a3de49cd Use a local implementation of htonl() called h2nl(). htonl() is not
available in all cross-compile environments.

Patches from Chris Demetriou.
2000-07-31 11:32:33 +00:00
simonb
11a429897a Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros or <err.h> err
function for host programs - use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:29:48 +00:00
simonb
f221c30583 Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros or <err.h> err/warnx
functions for host programs - use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:28:48 +00:00
simonb
0ac29f6624 Don't use <sys/cdefs.h> __COPYRIGHT/__RCSID macros or <err.h> err/errx
functions for host programs - use portable ANSI constructs instead.

Patches from Chris Demetriou.
2000-07-31 11:25:50 +00:00
mycroft
15b7289f72 Rename move() to moveplayer() to avoid clashing with libcurses. 2000-07-23 23:57:23 +00:00
itojun
d303927592 printf() pedant - do not pass variable alone, use %s.
idea from openbsd.  after looking at freebsd commit msgs from kris@freebsd.
2000-07-10 10:19:25 +00:00
msaitoh
f6f00e2615 remove extra period in SEE ALL section 2000-07-05 15:45:28 +00:00
mjl
d9e9bbbcb4 After weeding out duplicate, modify entry to be mathematically
correct at least. (Yes, both were wrong. People can't integrate
nowadays anymore :)
2000-07-03 18:51:45 +00:00
mjl
217fd277fd Remove duplicate (and incorrect) entry. From Anton Berezin
<tobez@tobez.org> in FreeBSD PR/19670
2000-07-03 17:23:37 +00:00
matt
3233065035 More include additions for exit, abs, strcmp, etc. 2000-07-03 03:57:39 +00:00