From 780fc4f437c7ea6cbbf95261666653254e284d56 Mon Sep 17 00:00:00 2001 From: "Aaron J. McPhall" Date: Wed, 30 May 2012 12:19:07 -0600 Subject: [PATCH 1/2] puzzles.cgi now inspects map files --- packages/mcp/src/puzzles.cgi.c | 104 ++++++++++++++------------------- 1 file changed, 43 insertions(+), 61 deletions(-) diff --git a/packages/mcp/src/puzzles.cgi.c b/packages/mcp/src/puzzles.cgi.c index f7efed1..3a8e197 100644 --- a/packages/mcp/src/puzzles.cgi.c +++ b/packages/mcp/src/puzzles.cgi.c @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) { int i; - DIR *srv; + DIR *opt; if (-1 == cgi_init(argv)) { return 0; @@ -60,10 +60,10 @@ main(int argc, char *argv[]) { FILE *f = fopen(state_path("puzzles.db"), "r"); - char cat[CAT_MAX]; - char points_str[11]; - long points; - int i; + char cat[CAT_MAX]; + char points_str[11]; + long points; + int i; while (f && (! feof(f))) { read_until_char(f, NULL, 0, ' '); @@ -90,81 +90,63 @@ main(int argc, char *argv[]) if (f) fclose(f); } - srv = opendir(package_path("")); - if (NULL == srv) { - cgi_error("Cannot opendir(\"/srv\")"); + opt = opendir(package_path("")); + if (NULL == opt) { + cgi_error("Cannot opendir(\"/opt\")"); } cgi_head("Open puzzles"); printf("
\n"); - /* For each file in /srv/ ... */ + /* For each file in /opt/ ... */ while (1) { - struct dirent *e = readdir(srv); + struct dirent *e = readdir(opt); char *cat; DIR *puzzles; long catpoints[PUZZLES_MAX]; + long maxpoints = 0; size_t ncatpoints = 0; + if (! e) break; cat = e->d_name; if ('.' == cat[0]) continue; - /* We have to lstat anyway to see if it's a directory; may as - well just barge ahead and watch for errors. */ - - /* Open /srv/ctf/$cat/puzzles/ */ - puzzles = opendir(package_path("%s/puzzles", cat)); - if (NULL == puzzles) { - continue; - } - - while (ncatpoints < PUZZLES_MAX) { - struct dirent *pe = readdir(puzzles); - long points; - char *p; - - if (! pe) break; - - /* Only do this if it's an int */ - points = strtol(pe->d_name, &p, 10); - if (*p) continue; - - catpoints[ncatpoints++] = points; - } - - closedir(puzzles); - - /* Sort points */ - qsort(catpoints, ncatpoints, sizeof(*catpoints), - (int (*)(const void *, const void *))longcmp); - - - /* Print out point values up to one past the last solved puzzle in - this category */ - { - long maxpoints = 0; - - /* Find the most points scored in this category */ - for (i = 0; i < ncats; i += 1) { - if (0 == strcmp(cat, points_by_cat[i].cat)) { - maxpoints = points_by_cat[i].points; - break; - } + + /* Find the most points scored in this category */ + for (i = 0; i < ncats; i += 1) { + if (0 == strcmp(cat, points_by_cat[i].cat)) { + maxpoints = points_by_cat[i].points; + break; } - - printf("
%s
\n", cat); - printf("
\n"); - for (i = 0; i < ncatpoints; i += 1) { - printf(" %ld\n", - cat, catpoints[i], catpoints[i]); - if (catpoints[i] > maxpoints) break; - } - printf("
\n"); } + + /* Read in category's map file, print html until point limit reached */ + FILE *map = fopen(package_path("%s/map.txt", cat), "r"); + if (map == NULL) continue; + + printf("
%s
\n", cat); + printf("
\n"); + + while (i < PUZZLES_MAX && (!feof(map))) { + char hash[20]; + char points_str[20]; + long points; + + read_until_char(map, cat, sizeof(cat), ' '); + read_until_char(map, points_str, sizeof(points_str), '\n'); + points = atol(hash); + + printf(" %ld\n", cat, points, points); + + if (points > maxpoints) break; + } + + printf("
\n"); + fclose(map); } - closedir(srv); + closedir(opt); printf("
\n"); cgi_foot(); From c4affbbd5ff7017eaec56fc17bc1581a80b32e2e Mon Sep 17 00:00:00 2001 From: "Aaron J. McPhall" Date: Wed, 30 May 2012 13:51:40 -0600 Subject: [PATCH 2/2] updates to parsing on puzzles.cgi --- packages/mcp/src/puzzles.cgi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/mcp/src/puzzles.cgi.c b/packages/mcp/src/puzzles.cgi.c index 3a8e197..1ef81db 100644 --- a/packages/mcp/src/puzzles.cgi.c +++ b/packages/mcp/src/puzzles.cgi.c @@ -66,9 +66,11 @@ main(int argc, char *argv[]) int i; while (f && (! feof(f))) { + read_until_char(f, NULL, 0, ' '); read_until_char(f, NULL, 0, ' '); read_until_char(f, cat, sizeof(cat), ' '); - read_until_char(f, points_str, sizeof(points_str), '\n'); + read_until_char(f, points_str, sizeof(points_str), ' '); + read_until_char(f, NULL, 0, '\n'); points = atol(points_str); for (i = 0; i < ncats; i += 1) { @@ -133,8 +135,8 @@ main(int argc, char *argv[]) char points_str[20]; long points; - read_until_char(map, cat, sizeof(cat), ' '); - read_until_char(map, points_str, sizeof(points_str), '\n'); + read_until_char(map, points_str, sizeof(points_str), ' '); + read_until_char(map, cat, sizeof(cat), '\n'); points = atol(hash); printf(" %ld\n", cat, points, points);