diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-04-28 07:50:45 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-04-28 07:50:45 +0000 |
| commit | 3b8f08459569bf0faa21473e5cec2491e95c9349 (patch) | |
| tree | 80f45dd81ca716bcd7ca9674581e1fc40b93cd34 /games/fortune | |
| parent | 9d2ab4a62d6733c45958627ac113bdbd818d1e2a (diff) | |
| parent | b2ba55951383498f252746f618d513139da06e8e (diff) | |
Notes
Diffstat (limited to 'games/fortune')
| -rw-r--r-- | games/fortune/datfiles/fortunes | 4 | ||||
| -rw-r--r-- | games/fortune/fortune/fortune.c | 8 | ||||
| -rw-r--r-- | games/fortune/unstr/Makefile | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes index c6928a885a12..790c39ee07a9 100644 --- a/games/fortune/datfiles/fortunes +++ b/games/fortune/datfiles/fortunes @@ -41033,7 +41033,7 @@ Sex is an emotion in motion. % Sex is as honest a product benefit for fragrance [perfume] as taste is for diet Coke. - -- Malcolm DacDougall + -- Malcolm MacDougall % Sex is good, but not as good as fresh sweet corn. -- Garrison Keillor @@ -46677,7 +46677,7 @@ they had just discovered that he lived in New Hampshire, not Vermont. taken another one of those damned Vermont winters!" % THE OLD POOL SHOOTER had won many a game in his life. But now it was time -to hang up the cue. When he did, all the other cues came crashing go the +to hang up the cue. When he did, all the other cues came crashing to the floor. "Sorry," he said with a smile. diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c index d5ce1b9c80e4..2fb2be0e249e 100644 --- a/games/fortune/fortune/fortune.c +++ b/games/fortune/fortune/fortune.c @@ -486,7 +486,7 @@ add_file(int percent, const char *file, const char *dir, FILEDESC **head, if (Offend) { if (was_malloc) free(tpath); - path = offensive; + path = tpath = offensive; offensive = NULL; was_malloc = TRUE; DPRINTF(1, (stderr, "\ttrying \"%s\"\n", path)); @@ -508,7 +508,7 @@ over: if (All_forts && offensive != NULL) { if (was_malloc) free(tpath); - path = offensive; + path = tpath = offensive; offensive = NULL; was_malloc = TRUE; DPRINTF(1, (stderr, "\ttrying \"%s\"\n", path)); @@ -806,10 +806,6 @@ is_fortfile(const char *file, char **datp, char **posp, int check_for_offend) strcat(datfile, ".dat"); if (access(datfile, R_OK) < 0) { DPRINTF(2, (stderr, "FALSE (no readable \".dat\" file)\n")); -#ifdef DEBUG - if (Debug < 2) - DPRINTF(0, (stderr, "Warning: file \"%s\" unreadable\n", datfile)); -#endif free(datfile); return (FALSE); } diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile index 428b10922737..e943d976eac6 100644 --- a/games/fortune/unstr/Makefile +++ b/games/fortune/unstr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= unstr -NO_MAN= +MAN= CFLAGS+= -I${.CURDIR}/../strfile .include <bsd.prog.mk> |
