diff --git a/rootfs.manifest b/rootfs.manifest index d4b2244..233070e 100644 --- a/rootfs.manifest +++ b/rootfs.manifest @@ -409,12 +409,16 @@ filemode 0775 dir /games file /games/adventure file /games/arithmetic +file /games/atc file /games/backgammon file /games/banner file /games/battlestar file /games/bcd +file /games/boggle +file /games/btlgammon file /games/canfield file /games/cfscores +file /games/cribbage file /games/factor file /games/fish file /games/fortune @@ -446,7 +450,10 @@ filemode 0444 dir /games/lib file /games/lib/adventure.dat file /games/lib/battle_strings +file /games/lib/backrules +file /games/lib/bogdict file /games/lib/cfscores +file /games/lib/crib.instr mode 0666 file /games/lib/fortunes.dat file /games/lib/cards.pck @@ -454,6 +461,14 @@ file /games/lib/robots_roll mode 0666 file /games/lib/snakerawscores mode 0666 +dir /games/lib/atc +file /games/lib/atc/ATC_scores +file /games/lib/atc/crossover +file /games/lib/atc/default +file /games/lib/atc/easy +file /games/lib/atc/game_2 +file /games/lib/atc/Game_List +file /games/lib/atc/Killer dir /games/lib/quiz.k file /games/lib/quiz.k/africa file /games/lib/quiz.k/america @@ -772,7 +787,6 @@ file /share/man/cat6/banner.0 file /share/man/cat6/battlestar.0 file /share/man/cat6/bcd.0 file /share/man/cat6/canfield.0 -file /share/man/cat6/crib.0 file /share/man/cat6/cribbage.0 file /share/man/cat6/fish.0 file /share/man/cat6/fortune.0 diff --git a/src/games/btlgammon/Makefile b/src/games/btlgammon/Makefile index 1ddaf11..0ed9eee 100644 --- a/src/games/btlgammon/Makefile +++ b/src/games/btlgammon/Makefile @@ -4,7 +4,7 @@ TOPSRC = $(shell cd ../../..; pwd) include $(TOPSRC)/target.mk #include $(TOPSRC)/cross.mk -CFLAGS = -O +CFLAGS = -O -Wall -Werror OBJS = btlgammon.o all: btlgammon diff --git a/src/games/btlgammon/btlgammon.c b/src/games/btlgammon/btlgammon.c index c3c62e1..6336526 100644 --- a/src/games/btlgammon/btlgammon.c +++ b/src/games/btlgammon/btlgammon.c @@ -6,6 +6,7 @@ #include #include #include +#include #define WHITE 0 #define BROWN 1 @@ -585,7 +586,7 @@ void prtbrd() int main() { - int go[6], tvec[2]; + int go[6]; int k, n, pid, ret, rpid, t; char s[100]; @@ -670,15 +671,18 @@ retry: exit(0); case '!': /* escape to Shell */ - if(s[1] != '\0') + if(s[1] != '\0') { system(s+1); - else if((pid = fork()) == 0) { - execl("/bin/sh", "sh", "-", 0); - fprintf(stderr, "back: cannot exec /bin/sh!\n"); - exit(2); - } - while((rpid = wait(&ret)) != pid && rpid != -1) - ; + } else { + pid = fork(); + if(pid == 0) { + execl("/bin/sh", "sh", "-", (char*)0); + fprintf(stderr, "back: cannot exec /bin/sh!\n"); + exit(2); + } + while((rpid = wait(&ret)) != pid && rpid != -1) + ; + } goto retry; case '?': /* well, what can i do? */ diff --git a/src/games/cribbage/.gitignore b/src/games/cribbage/.gitignore index 4e4ed63..5169e5f 100644 --- a/src/games/cribbage/.gitignore +++ b/src/games/cribbage/.gitignore @@ -1 +1,2 @@ cribbage +crib.instr diff --git a/src/games/cribbage/Makefile b/src/games/cribbage/Makefile index c12729b..e7ba584 100644 --- a/src/games/cribbage/Makefile +++ b/src/games/cribbage/Makefile @@ -18,7 +18,7 @@ MAN = cribbage.0 MANSRC = cribbage.6 LIBS = -lcurses -ltermcap -lc -all: cribbage ${MAN} crib.0 +all: cribbage ${MAN} crib.instr cribbage: ${OBJS} $(CC) $(LDFLAGS) -o $@.elf $(OBJS) $(LIBS) @@ -26,17 +26,16 @@ cribbage: ${OBJS} $(SIZE) $@.elf $(ELF2AOUT) $@.elf $@ && rm $@.elf -crib.0: cribbage.n macro +crib.instr: cribbage.n macro nroff cribbage.n > $@ ${MAN}: ${MANSRC} ${MANROFF} $< > $@ clean: - rm -f *.o core cribbage ${MAN} *.dis + rm -f *.o core cribbage ${MAN} *.dis crib.instr install: all install cribbage $(DESTDIR)/games/ - install -m 644 crib.0 $(DESTDIR)/games/lib/crib.instr + install -m 644 crib.instr $(DESTDIR)/games/lib/crib.instr cp ${MAN} $(DESTDIR)/share/man/cat6/ - cp crib.0 $(DESTDIR)/share/man/cat6/