From 23454acb66be2a88647262d98d50e0f115519ea0 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Sun, 28 Mar 2021 14:39:02 -0400 Subject: Use PREFIX now --- hack/Makefile | 8 +-- hack/config.h | 201 ----------------------------------------------------- hack/def.objects.h | 2 +- hack/hack-config.h | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++ hack/hack.h | 2 +- hack/pathnames.h | 8 ++- 6 files changed, 212 insertions(+), 210 deletions(-) delete mode 100644 hack/config.h create mode 100644 hack/hack-config.h (limited to 'hack') diff --git a/hack/Makefile b/hack/Makefile index 318f3034..c4aed9cb 100644 --- a/hack/Makefile +++ b/hack/Makefile @@ -16,7 +16,7 @@ SRCS+= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \ MAN= hack.6 CLEANFILES+=makedefs FILES=help hh data -FILESDIR=/var/games/hackdir +FILESDIR=$(LOCALSTATEDIR)/games/hackdir CLEANFILES+=hack.onames.h all: $(PROG) @@ -30,12 +30,12 @@ makedefs: makedefs.c hack.h: hack.onames.h $(PROG): $(SRCS) hack.h - $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw + $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) -lncursesw -I$(ROOT) $(STRIP) $(PROG) install: $(PROG) $(MAN) - $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/usr/games/$(PROG) - $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN) + $(GINSTALL) -Dm2755 $(PROG) $(DESTDIR)/$(PREFIX)/games/$(PROG) + $(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/$(PREFIX)/share/man/man6/$(MAN) mkdir -p $(DESTDIR)$(FILESDIR) $(GINSTALL) -Dm660 $(FILES) $(DESTDIR)$(FILESDIR) diff --git a/hack/config.h b/hack/config.h deleted file mode 100644 index 7f51a842..00000000 --- a/hack/config.h +++ /dev/null @@ -1,201 +0,0 @@ -/* $NetBSD: config.h,v 1.10 2011/08/06 19:53:24 dholland Exp $ */ - -/* - * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, - * Amsterdam - * 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 Stichting Centrum voor Wiskunde en - * Informatica, 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. - */ - -/* - * Copyright (c) 1982 Jay Fenlason - * 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. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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 "pathnames.h" - -#ifndef CONFIG /* make sure the compiler doesnt see the typedefs twice */ - -#define CONFIG -#define UNIX /* delete if no fork(), exec() available */ -#define CHDIR /* delete if no chdir() available */ - -/* - * Some include files are in a different place under SYSV - * BSD SYSV - * - * - * - * - * Also, the code for suspend and various ioctls is only given for BSD4.2 - * (I do not have access to a SYSV system.) - */ -#define BSD /* delete this line on System V */ - -/* #define STUPID */ /* avoid some complicated expressions if - your C compiler chokes on them */ - -#define WIZARD "bruno" /* the person allowed to use the -D option */ -#define RECORD "record"/* the file containing the list of topscorers */ -#define NEWS "news" /* the file containing the latest hack news */ -#define HELP "help" /* the file containing a description of the commands */ -#define SHELP "hh" /* abbreviated form of the same */ -#define RUMORFILE "rumors" /* a file with fortune cookies */ -#define DATAFILE "data" /* a file giving the meaning of symbols used */ -#define FMASK 0660 /* file creation mask */ -#define HLOCK "perm" /* an empty file used for locking purposes */ -#define LLOCK "safelock" /* link to previous */ - -#ifdef UNIX -/* - * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more" - * If defined, it can be overridden by the environment variable PAGER. - * Hack will use its internal pager if DEF_PAGER is not defined. - * (This might be preferable for security reasons.) - * #define DEF_PAGER ".../mydir/mypager" - */ - -/* - * If you define MAIL, then the player will be notified of new mail - * when it arrives. If you also define DEF_MAILREADER then this will - * be the default mail reader, and can be overridden by the environment - * variable MAILREADER; otherwise an internal pager will be used. - * A stat system call is done on the mailbox every MAILCKFREQ moves. - */ -/* #define MAIL */ -#define DEF_MAILREADER _PATH_MAIL /* or e.g. /bin/mail */ -#define MAILCKFREQ 100 - - -#define SHELL /* do not delete the '!' command */ - -#ifdef BSD -#define SUSPEND /* let ^Z suspend the game */ -#endif /* BSD */ -#endif /* UNIX */ - -#ifdef CHDIR -/* - * If you define HACKDIR, then this will be the default playground; - * otherwise it will be the current directory. - */ -#ifdef QUEST -#define HACKDIR _PATH_QUEST -#else /* QUEST */ -#define HACKDIR _PATH_HACK -#endif /* QUEST */ - -/* - * Some system administrators are stupid enough to make Hack suid root - * or suid daemon, where daemon has other powers besides that of reading or - * writing Hack files. In such cases one should be careful with chdir's - * since the user might create files in a directory of his choice. - * Of course SECURE is meaningful only if HACKDIR is defined. - */ -#define SECURE /* do setuid(getuid()) after chdir() */ - -/* - * If it is desirable to limit the number of people that can play Hack - * simultaneously, define HACKDIR, SECURE and MAX_NR_OF_PLAYERS. - * #define MAX_NR_OF_PLAYERS 100 - */ -#endif /* CHDIR */ - -/* size of terminal screen is (at least) (ROWNO+2) by COLNO */ -#define COLNO 80 -#define ROWNO 22 - -/* - * small signed integers (8 bits suffice) - * typedef char schar; - * will do when you have signed characters; otherwise use - * typedef short int schar; - * - * Use short chars anyway to avoid warnings. - */ -#if 1 -typedef short int schar; -#else -typedef char schar; -#endif - -/* - * small unsigned integers (8 bits suffice - but 7 bits do not) - * - these are usually object types; be careful with inequalities! - - * typedef unsigned char uchar; - * will be satisfactory if you have an "unsigned char" type; otherwise use - * typedef unsigned short int uchar; - */ -typedef unsigned char uchar; - -/* - * small integers in the range 0 - 127, usually coordinates - * although they are nonnegative they must not be declared unsigned - * since otherwise comparisons with signed quantities are done incorrectly - */ -typedef schar xchar; -typedef xchar boolean; /* 0 or 1 */ -#define TRUE 1 -#define FALSE 0 - -/* - * Declaration of bitfields in various structs; if your C compiler - * doesnt handle bitfields well, e.g., if it is unable to initialize - * structs containing bitfields, then you might use - * #define Bitfield(x,n) uchar x - * since the bitfields used never have more than 7 bits. (Most have 1 bit.) - */ -#define Bitfield(x,n) unsigned x:n - -#define SIZE(x) (int)(sizeof(x) / sizeof(x[0])) - -#endif /* CONFIG */ diff --git a/hack/def.objects.h b/hack/def.objects.h index e9b34d17..3bed8c35 100644 --- a/hack/def.objects.h +++ b/hack/def.objects.h @@ -64,7 +64,7 @@ #ifndef _DEF_OBJECTS_H_ #define _DEF_OBJECTS_H_ /* objects have letter " % ) ( 0 _ ` [ ! ? / = * */ -#include "config.h" +#include "hack-config.h" #include "def.objclass.h" struct objclass objects[] = { diff --git a/hack/hack-config.h b/hack/hack-config.h new file mode 100644 index 00000000..7f51a842 --- /dev/null +++ b/hack/hack-config.h @@ -0,0 +1,201 @@ +/* $NetBSD: config.h,v 1.10 2011/08/06 19:53:24 dholland Exp $ */ + +/* + * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica, + * Amsterdam + * 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 Stichting Centrum voor Wiskunde en + * Informatica, 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. + */ + +/* + * Copyright (c) 1982 Jay Fenlason + * 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. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``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 AUTHOR 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 "pathnames.h" + +#ifndef CONFIG /* make sure the compiler doesnt see the typedefs twice */ + +#define CONFIG +#define UNIX /* delete if no fork(), exec() available */ +#define CHDIR /* delete if no chdir() available */ + +/* + * Some include files are in a different place under SYSV + * BSD SYSV + * + * + * + * + * Also, the code for suspend and various ioctls is only given for BSD4.2 + * (I do not have access to a SYSV system.) + */ +#define BSD /* delete this line on System V */ + +/* #define STUPID */ /* avoid some complicated expressions if + your C compiler chokes on them */ + +#define WIZARD "bruno" /* the person allowed to use the -D option */ +#define RECORD "record"/* the file containing the list of topscorers */ +#define NEWS "news" /* the file containing the latest hack news */ +#define HELP "help" /* the file containing a description of the commands */ +#define SHELP "hh" /* abbreviated form of the same */ +#define RUMORFILE "rumors" /* a file with fortune cookies */ +#define DATAFILE "data" /* a file giving the meaning of symbols used */ +#define FMASK 0660 /* file creation mask */ +#define HLOCK "perm" /* an empty file used for locking purposes */ +#define LLOCK "safelock" /* link to previous */ + +#ifdef UNIX +/* + * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more" + * If defined, it can be overridden by the environment variable PAGER. + * Hack will use its internal pager if DEF_PAGER is not defined. + * (This might be preferable for security reasons.) + * #define DEF_PAGER ".../mydir/mypager" + */ + +/* + * If you define MAIL, then the player will be notified of new mail + * when it arrives. If you also define DEF_MAILREADER then this will + * be the default mail reader, and can be overridden by the environment + * variable MAILREADER; otherwise an internal pager will be used. + * A stat system call is done on the mailbox every MAILCKFREQ moves. + */ +/* #define MAIL */ +#define DEF_MAILREADER _PATH_MAIL /* or e.g. /bin/mail */ +#define MAILCKFREQ 100 + + +#define SHELL /* do not delete the '!' command */ + +#ifdef BSD +#define SUSPEND /* let ^Z suspend the game */ +#endif /* BSD */ +#endif /* UNIX */ + +#ifdef CHDIR +/* + * If you define HACKDIR, then this will be the default playground; + * otherwise it will be the current directory. + */ +#ifdef QUEST +#define HACKDIR _PATH_QUEST +#else /* QUEST */ +#define HACKDIR _PATH_HACK +#endif /* QUEST */ + +/* + * Some system administrators are stupid enough to make Hack suid root + * or suid daemon, where daemon has other powers besides that of reading or + * writing Hack files. In such cases one should be careful with chdir's + * since the user might create files in a directory of his choice. + * Of course SECURE is meaningful only if HACKDIR is defined. + */ +#define SECURE /* do setuid(getuid()) after chdir() */ + +/* + * If it is desirable to limit the number of people that can play Hack + * simultaneously, define HACKDIR, SECURE and MAX_NR_OF_PLAYERS. + * #define MAX_NR_OF_PLAYERS 100 + */ +#endif /* CHDIR */ + +/* size of terminal screen is (at least) (ROWNO+2) by COLNO */ +#define COLNO 80 +#define ROWNO 22 + +/* + * small signed integers (8 bits suffice) + * typedef char schar; + * will do when you have signed characters; otherwise use + * typedef short int schar; + * + * Use short chars anyway to avoid warnings. + */ +#if 1 +typedef short int schar; +#else +typedef char schar; +#endif + +/* + * small unsigned integers (8 bits suffice - but 7 bits do not) + * - these are usually object types; be careful with inequalities! - + * typedef unsigned char uchar; + * will be satisfactory if you have an "unsigned char" type; otherwise use + * typedef unsigned short int uchar; + */ +typedef unsigned char uchar; + +/* + * small integers in the range 0 - 127, usually coordinates + * although they are nonnegative they must not be declared unsigned + * since otherwise comparisons with signed quantities are done incorrectly + */ +typedef schar xchar; +typedef xchar boolean; /* 0 or 1 */ +#define TRUE 1 +#define FALSE 0 + +/* + * Declaration of bitfields in various structs; if your C compiler + * doesnt handle bitfields well, e.g., if it is unable to initialize + * structs containing bitfields, then you might use + * #define Bitfield(x,n) uchar x + * since the bitfields used never have more than 7 bits. (Most have 1 bit.) + */ +#define Bitfield(x,n) unsigned x:n + +#define SIZE(x) (int)(sizeof(x) / sizeof(x[0])) + +#endif /* CONFIG */ diff --git a/hack/hack.h b/hack/hack.h index 575b00ef..4579fae6 100644 --- a/hack/hack.h +++ b/hack/hack.h @@ -64,7 +64,7 @@ #ifndef _HACK_H_ #define _HACK_H_ -#include "config.h" +#include "hack-config.h" #include #include #include diff --git a/hack/pathnames.h b/hack/pathnames.h index 3af190e9..bbd2fa71 100644 --- a/hack/pathnames.h +++ b/hack/pathnames.h @@ -31,7 +31,9 @@ * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 */ -#define _PATH_MAIL "/usr/bin/mail" -#define _PATH_QUEST "/var/games/questdir" -#define _PATH_HACK "/var/games/hackdir" +#include "config.h" + +#define _PATH_MAIL PREFIX"/bin/mail" +#define _PATH_QUEST LOCALSTATEDIR"/games/questdir" +#define _PATH_HACK LOCALSTATEDIR"/games/hackdir" -- cgit v1.2.3-56-ge451