neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bugs, add sequence 2000

This commit is contained in:
Neale Pickett 2011-02-23 17:29:34 -07:00
parent b396efe9b8
commit 7aced93118
12 changed files with 43 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/problems.txt
View File

@ -1,12 +1,7 @@
Bugs
====
* We need some programs so that we never have to edit .db files
directly. I truncated tokens.db with > instead of >>.
* Get erin to edit net-re
* Tanks documentation referencing wrong CSS
* Sequence 300 continues to be a pain in the ass
* ctfd wget won't overwrite
* tanks/winners.awk needs +x
* tanks/winner.awk printing out address instead of path? How did
this ever work?
@ -26,11 +21,6 @@ Physical
Possibly fixed
--------------
* sequence 300; puzzler isn't taking the unicode character right
Won't fix
---------
* tanks/designer.cgi: s/token/team hash/

2
packages/mcp/src/common.c
View File

@ -267,7 +267,7 @@ fgrepx(char const *needle, char const *filename)
break;
} else if (EOF == c) { /* End of file */
break;
} else if (('\0' == p) || (*p != c)) {
} else if (('\0' == p) || (*p != (char)c)) {
p = needle;
/* Discard the rest of the line */
do {

7
packages/mcp/src/puzzler.cgi.c
View File

@ -1,3 +1,4 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include "common.h"
@ -60,6 +61,12 @@ main(int argc, char *argv[])
char needle[400];
my_snprintf(needle, sizeof(needle), "%ld %s", points, answer);
{
FILE *f = fopen("/tmp/form", "w");
fprintf(f, "%s\n%s\n", answer, needle);
fclose(f);
}
if (! fgrepx(needle,
package_path("%s/answers.txt", category))) {
cgi_page("Wrong answer", "");

18
packages/rlyeh/rlyeh.mk
View File

@ -1,23 +1,17 @@
RLYEH_PKGDIR = $(TARGET)/rlyeh
RLYEH_BUILDDIR = $(BUILD)/rlyeh
RLYEH_TAR = $(CACHE)/rlyeh.tar.gz
RLYEH_URL = "http://woozle.org/~neale/gitweb.cgi?p=rlyeh;a=snapshot;h=master;sf=tgz"
RLYEH_URL = "http://woozle.org/~neale/projects/rlyeh"
$(RLYEH_TAR):
@ mkdir -p $(@D)
wget -O $@ $(RLYEH_URL)
rlyeh-source: $(RLYEH_BUILDDIR)/rlyeh
$(RLYEH_BUILDDIR)/rlyeh: $(RLYEH_TAR)
mkdir -p $(RLYEH_BUILDDIR)
zcat $(RLYEH_TAR) | (cd $(RLYEH_BUILDDIR) && tar xf -)
rlyeh-source: $(RLYEH_BUILDDIR)
$(RLYEH_BUILDDIR):
git clone $(RLYEH_URL) $@
rlyeh-build: rlyeh-source
$(MAKE) -C $(RLYEH_BUILDDIR)/rlyeh
$(MAKE) -C $(RLYEH_BUILDDIR)
rlyeh-install: rlyeh-build
mkdir -p $(RLYEH_PKGDIR)/bin
cp $(RLYEH_BUILDDIR)/rlyeh/rlyeh $(RLYEH_PKGDIR)/bin
cp $(RLYEH_BUILDDIR)/rlyeh $(RLYEH_PKGDIR)/bin
$(call COPYTREE, packages/rlyeh/service, $(RLYEH_PKGDIR)/service)
$(call COPYTREE, packages/rlyeh/tokens, $(RLYEH_PKGDIR)/tokens)

0
packages/sequence/800/.create.py → packages/sequence/1000/.create.py
View File

8
packages/sequence/800/index.mdwn → packages/sequence/1000/index.mdwn
View File

@ -1,3 +1,6 @@
No more blanks! From now on you must use techniques from previous
puzzles to resequence the answer.
00000000 00 5e 03 6f 72 73 00 57 04 72 6f 63 61 00 56 05 |.^.ors.W.roca.V.|
00000010 72 65 63 69 70 00 5d 05 63 61 76 61 74 00 5b 01 |recip.].cavat.[.|
00000020 73 00 5c 05 69 74 20 65 78 00 59 05 69 6f 6e 20 |s.\.it ex.Y.ion |
@ -5,8 +8,3 @@
00000040 00 53 05 74 6f 64 64 6c 00 55 01 20 |.S.toddl.U. |
0000004c
________________________________________
^ ^
83 94

0
packages/sequence/800/key → packages/sequence/1000/key
View File

0
packages/sequence/800/summary → packages/sequence/1000/summary
View File

7
packages/sequence/2000/index.mdwn Normal file
View File

@ -0,0 +1,7 @@
00000000 ff 41 42 43 44 45 46 47 48 ff 49 4a 4b 4c 4d 4e |.ABCDEFGH.IJKLMN|
00000010 4f 50 ff 51 52 53 54 55 56 57 58 ff 59 5a 0a 54 |OP.QRSTUVWX.YZ.T|
00000020 68 65 20 72 6f 61 69 6e 20 11 00 53 70 10 01 7f |he roain ..Sp...|
00000030 73 74 61 79 73 20 6d 10 00 6b 6c 79 13 01 74 0c |stays m..kly..t.|
00000040 00 70 6c 10 00 df 2c 20 61 6e 64 2c 02 61 6e ff |.pl..., and,.an.|
00000050 73 77 65 72 20 69 73 20 cd 22 31 00 6e 65 21 03 |swer is ."1.ne!.|
00000060 1d 01 22 2e 01 0a |.."...|

1
packages/sequence/2000/key Normal file
View File

@ -0,0 +1 @@
planes mainstay

2
packages/sequence/300/key
View File

@ -1,2 +1,2 @@
┤
&#9508;

40
packages/tanks/tanks.mk
View File

@ -1,42 +1,36 @@
TANKS_PKGDIR = $(TARGET)/tanks
TANKS_BUILDDIR = $(BUILD)/tanks
TANKS_TAR = $(CACHE)/tanks.tar.gz
TANKS_URL = "http://woozle.org/~neale/gitweb.cgi?p=ctanks;a=snapshot;h=master;sf=tgz"
TANKS_URL = "http://woozle.org/~neale/projects/ctanks"
$(TANKS_TAR):
@ mkdir -p $(@D)
wget -O $@ $(TANKS_URL)
tanks-source: $(TANKS_BUILDDIR)/ctanks
$(TANKS_BUILDDIR)/ctanks: $(TANKS_TAR)
mkdir -p $(TANKS_BUILDDIR)
zcat $(TANKS_TAR) | (cd $(TANKS_BUILDDIR) && tar xf -)
tanks-source: $(TANKS_BUILDDIR)
$(TANKS_BUILDDIR):
git clone $(TANKS_URL) $@
tanks-build: tanks-source
$(MAKE) -C $(TANKS_BUILDDIR)/ctanks
$(MAKE) -C $(TANKS_BUILDDIR)
# "html" instead of "www" to prevent automatic links
tanks-install: tanks-build
mkdir -p $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/ctanks/forftanks $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/ctanks/designer.cgi $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/ctanks/rank.awk $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/ctanks/winners.awk $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/forftanks $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/designer.cgi $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/rank.awk $(TANKS_PKGDIR)/bin
cp $(TANKS_BUILDDIR)/winner.awk $(TANKS_PKGDIR)/bin
$(call COPYTREE, packages/tanks/html, $(TANKS_PKGDIR)/html)
cp packages/mcp/www/ctf.css $(TANKS_PKGDIR)/html/style.css
cp packages/mcp/www/grunge.png $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/ctanks/nav.html.inc $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/ctanks/tanks.js $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/ctanks/forf.html $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/ctanks/intro.html $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/ctanks/figures.js $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/ctanks/procs.html $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/ctanks/designer.js $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/nav.html.inc $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/tanks.js $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/forf.html $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/intro.html $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/figures.js $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/procs.html $(TANKS_PKGDIR)/html
cp $(TANKS_BUILDDIR)/designer.js $(TANKS_PKGDIR)/html
$(call COPYTREE, packages/tanks/service, $(TANKS_PKGDIR)/service)
$(call COPYTREE, $(TANKS_BUILDDIR)/ctanks/examples, $(TANKS_PKGDIR)/examples)
$(call COPYTREE, $(TANKS_BUILDDIR)/examples, $(TANKS_PKGDIR)/examples)
tanks-clean:
rm -rf $(TANKS_BUILDDIR)