From 146cf7beecd3927e914ed6b4d6afc91d6bc6431f Mon Sep 17 00:00:00 2001 From: electron271 <66094410+electron271@users.noreply.github.com> Date: Sat, 12 Sep 2026 10:47:32 -0500 Subject: [PATCH 1/7] pending fix by doclic --- .gitignore | 10 +- README.md | 7 +- grainpit.cgi/Makefile | 51 ++++ grainpit.cgi/README | 2 + grainpit.cgi/config.def.h | 8 + grainpit.cgi/generate.c | 543 ++++++++++++++++++++++++++++++++++++++ grainpit.cgi/main.c | 76 ++++++ 7 files changed, 694 insertions(+), 3 deletions(-) create mode 100644 grainpit.cgi/Makefile create mode 100644 grainpit.cgi/README create mode 100644 grainpit.cgi/config.def.h create mode 100644 grainpit.cgi/generate.c create mode 100644 grainpit.cgi/main.c diff --git a/.gitignore b/.gitignore index a90c756..f93db44 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,12 @@ # profiling bs perf.data* flamegraph.svg -callgrind.out* \ No newline at end of file +callgrind.out* + +# grainpit.cgi stuff +grainpit.cgi/grainpit.cgi +grainpit.cgi/main.o +grainpit.cgi/config.h +grainpit.cgi/generated.h +grainpit.cgi/generate +grainpit.cgi/generate.o diff --git a/README.md b/README.md index a95fe2b..9939a48 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,12 @@ this is planned to be the preferred way to use grainpit once its completed currently this is empty in the repo because the general project structure for it is still being figured out -### cgi script (unofficial) +### cgi script -see +> [!NOTE] +> this currently does not support the full feature set and may be out of date as it does not directly depend on the main grainpit library + +written in c unlike the rest of the project (also means compatibility if you are on a machine without support for rust), thank you to @doclic for writing this implementation ## features diff --git a/grainpit.cgi/Makefile b/grainpit.cgi/Makefile new file mode 100644 index 0000000..b3b7d94 --- /dev/null +++ b/grainpit.cgi/Makefile @@ -0,0 +1,51 @@ +# Copyright (C) 2026 doclic +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +.POSIX: + +# compiler for the machine that runs the build +BUILDCC = $(CC) +BUILDCFLAGS = $(CFLAGS) +BUILDLDFLAGS = $(LDFLAGS) + +# compiler for the machine that runs final program +HOSTCC = $(CC) +HOSTCFLAGS = $(CFLAGS) +HOSTLDFLAGS = $(LDFLAGS) + +.PHONY: all clean + +.DEFAULT: all + +all: grainpit.cgi + +clean: + rm -f grainpit.cgi main.o generated.h generate generate.o + +grainpit.cgi: main.o + $(HOSTCC) $(HOSTLDFLAGS) -ograinpit.cgi main.o + +main.o: main.c config.h generated.h + $(HOSTCC) $(HOSTCFLAGS) -c main.c + +config.h: + cp config.def.h config.h + +generated.h: generate + ./generate + +generate: generate.o + $(BUILDCC) $(BUILDLDFLAGS) -ogenerate generate.o + +generate.o: generate.c + $(BUILDCC) $(BUILDCFLAGS) -c generate.c diff --git a/grainpit.cgi/README b/grainpit.cgi/README new file mode 100644 index 0000000..510fb28 --- /dev/null +++ b/grainpit.cgi/README @@ -0,0 +1,2 @@ +grainpit.cgi + diff --git a/grainpit.cgi/config.def.h b/grainpit.cgi/config.def.h new file mode 100644 index 0000000..f626942 --- /dev/null +++ b/grainpit.cgi/config.def.h @@ -0,0 +1,8 @@ +/* Default configuration file for grainpit.cgi */ + +/* make sure they all with a slash */ +static const char *grainpit_extraurls[] = { + "https://example.com/", +}; +/* range from 0 to 100, 0 means never, 100 means always */ +static int grainpit_extraurls_chance = 5; diff --git a/grainpit.cgi/generate.c b/grainpit.cgi/generate.c new file mode 100644 index 0000000..c2f5bce --- /dev/null +++ b/grainpit.cgi/generate.c @@ -0,0 +1,543 @@ +/* I'm sorry for you if you have to read this. */ + +#define _POSIX_C_SOURCE 200809L + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define hcf() do { \ + fprintf(stderr, "big bad error at %s:%d, errno: %s\n", \ + __FILE__, __LINE__, strerror(errno)); \ + unlink("generated.h"); \ + exit(1); \ +} while(0) + +#define TOKEN_MAX_LENGTH 4096 +/* needs to be a power of 2 */ +#define TOKEN_MAX_COUNT 4096 +#define NEXT_TOK_ODDS_MAX_LEN 262144 +#define MAP_MAX_LEN 131072 +#define MAP_MAX_MASK (MAP_MAX_LEN - 1) +#define TOKEN_CONTENTS_MAX_LENGTH 1048576 +#define CONTEXT_WINDOW_LENGTH 5 + +struct tokodds { + uint32_t context[CONTEXT_WINDOW_LENGTH]; + uint16_t odds[TOKEN_MAX_COUNT]; +}; +struct finaltokodds { + uint32_t context[CONTEXT_WINDOW_LENGTH]; + uint32_t totalodds; + uint32_t nexttokoddsoff; + uint32_t nexttokoddslen; +}; +struct nexttokoddsent { + uint32_t tok; + uint32_t odds; +}; + +static FILE *out; +static struct tokodds *oddsmap; +static struct finaltokodds *finaloddsmap; + +/* Murmur3_32 hash */ +static uint32_t +ctxhash(const uint32_t *in, size_t len, uint32_t seed) +{ + size_t i; + uint32_t h, k; + + h = seed; + i = 0; + for (i = 0; i < CONTEXT_WINDOW_LENGTH; i++) { + k = i < len ? in[i] : 0xFFFFFFFF; + k *= 0xcc9e2d51; + k = (k << 15) | (k >> 17); /* ROL 15 */ + k *= 0x1b873593; + h ^= k; + h = (h << 13) | (h >> 19); /* ROL 13 */ + h *= 5; + h += 0xe6546b64; + } + h ^= len; + h ^= h >> 16; + h *= 0x85ebca6b; + h ^= h >> 13; + h *= 0xc2b2ae35; + h ^= h >> 16; + + return h; +} + +static int +contexteql(const uint32_t *restrict context, size_t len, + const struct tokodds *restrict tokodds) +{ + size_t i; + + for (i = 0; i < len; i++) + if (tokodds->context[i] != context[i]) + return 0; + if (i < CONTEXT_WINDOW_LENGTH && tokodds->context[i] != 0xFFFFFFFF) + return 0; + return 1; +} + +static void +train(const char *name, uint32_t seed) +{ + FILE *f; + size_t i, j, k, toklen, tokcount; + int c; + static struct nexttokoddsent nexttokodds[NEXT_TOK_ODDS_MAX_LEN]; + static unsigned char tokcont[TOKEN_CONTENTS_MAX_LENGTH]; + /* + 1 for NUL */ + static unsigned char tok[TOKEN_MAX_LENGTH + 1]; + char path[PATH_MAX]; + static uint32_t tokoffs[TOKEN_MAX_COUNT]; + uint32_t context[CONTEXT_WINDOW_LENGTH], duplicates, nexttokoddslen, + nexttokoddsoff, oddsmaplen, oddsmapmask, tokcontlen, tokind, + trunchash; + + memset(oddsmap, 0xFF, sizeof(*oddsmap) * MAP_MAX_LEN); + memset(finaloddsmap, 0xFF, sizeof(*finaloddsmap) * MAP_MAX_LEN); + memset(context, 0xFF, sizeof(context)); + nexttokoddsoff = 0; + oddsmaplen = 0; + tokcount = 0; + tokcontlen = 0; + + /* yes, there is no length check. no i don't care */ + sprintf(path, "../grainpit/data/%s.txt", name); + f = fopen(path, "rb"); + if (f == NULL) + hcf(); + + for (;;) { + c = fgetc(f); + if (c == EOF) { + if (feof(f)) + break; + hcf(); + } + if (isalnum(c)) { + tok[0] = c; + i = 1; + for (;;) { + if (i >= TOKEN_MAX_LENGTH) + hcf(); + c = fgetc(f); + if (c == EOF) { + if (feof(f)) + break; + hcf(); + } + if (!isalnum(c)) { + if (ungetc(c, f) == EOF) + hcf(); + break; + } + tok[i] = c; + i++; + } + } else if (isspace(c)) { + tok[0] = c; + i = 1; + for (;;) { + if (i >= TOKEN_MAX_LENGTH) + hcf(); + c = fgetc(f); + if (c == EOF) { + if (feof(f)) + break; + hcf(); + } + if (!isspace(c)) { + if (ungetc(c, f) == EOF) + hcf(); + break; + } + tok[i] = c; + i++; + } + } else if (c == '<') { + tok[0] = c; + i = 1; + for (;;) { + if (i >= TOKEN_MAX_LENGTH) + hcf(); + c = fgetc(f); + if (c == EOF) { + if (feof(f)) + break; + hcf(); + } + tok[i] = c; + i++; + if (c == '>') + break; + } + } else { + if ((c & 0x80) == 0x00) + toklen = 1; + else if ((c & 0xC0) == 0x80) + hcf(); + else if ((c & 0xE0) == 0xC0) + toklen = 2; + else if ((c & 0xF0) == 0xE0) + toklen = 3; + else if ((c & 0xF8) == 0xF0) + toklen = 4; + else + hcf(); + tok[0] = c; + i = 1; + while (i < toklen) { + c = fgetc(f); + if (c == EOF) { + if (feof(f)) { + /* different msg for EOF */ + errno = 0; + hcf(); + } + hcf(); + } + tok[i] = c; + i++; + } + } + + toklen = i; + tok[toklen] = 0; + + for (i = 0; i < tokcount; i++) { + if (memcmp(tok, tokcont + tokoffs[i], toklen + 1) == 0) + break; + } + if (i == tokcount) { + if (tokcount == TOKEN_MAX_COUNT) + hcf(); + if ((tokcontlen + toklen + 1) > + TOKEN_CONTENTS_MAX_LENGTH) + hcf(); + memcpy(tokcont + tokcontlen, tok, toklen + 1); + tokoffs[i] = tokcontlen; + tokcontlen += toklen + 1; + tokcount++; + } + + tokind = i; + + for (i = 1; i <= CONTEXT_WINDOW_LENGTH; i++) { + if (context[i - 1] == 0xFFFFFFFF) break; + trunchash = ctxhash(context, i, seed); + trunchash &= MAP_MAX_MASK; + j = trunchash; + while (!contexteql(context, i, &oddsmap[j])) { + if (oddsmap[j].context[0] != 0xFFFFFFFF) { + j++; + j &= MAP_MAX_MASK; + if (j == trunchash) + hcf(); + continue; + } + memcpy(oddsmap[j].context, context, + sizeof(*oddsmap[j].context) * i); + memset(oddsmap[j].context + i, 0xFF, + sizeof(*oddsmap[j].context) * + (CONTEXT_WINDOW_LENGTH - i)); + memset(oddsmap[j].odds, 0x00, + sizeof(oddsmap[j].odds)); + oddsmaplen++; + break; + } + oddsmap[j].odds[tokind]++; + } + memmove(context + 1, context, + sizeof(*context) * (CONTEXT_WINDOW_LENGTH - 1)); + context[0] = tokind; + } + + /* oddsmaplen = (oddsmaplen * 1.5) rounded to next higher power of 2 */ + oddsmaplen += oddsmaplen >> 1; + oddsmaplen--; + oddsmaplen |= oddsmaplen >> 1; + oddsmaplen |= oddsmaplen >> 2; + oddsmaplen |= oddsmaplen >> 4; + oddsmaplen |= oddsmaplen >> 8; + oddsmaplen |= oddsmaplen >> 16; + oddsmapmask = oddsmaplen; + oddsmaplen++; + + if (oddsmaplen > MAP_MAX_LEN) { + fprintf(stderr, "%s odds map truncated\n", name); + oddsmapmask = MAP_MAX_MASK; + oddsmaplen = MAP_MAX_LEN; + } + + duplicates = 0; + for (i = 0; i < MAP_MAX_LEN; i++) { + if (oddsmap[i].context[0] == 0xFFFFFFFF) + continue; + + trunchash = ctxhash(oddsmap[i].context, CONTEXT_WINDOW_LENGTH, + seed); + trunchash &= oddsmapmask; + j = trunchash; + + + if (finaloddsmap[j].context[0] != 0xFFFFFFFF) + duplicates++; + + while (finaloddsmap[j].context[0] != 0xFFFFFFFF) { + j++; + j &= oddsmapmask; + } + + memcpy(&finaloddsmap[j].context, &oddsmap[i].context, + sizeof(finaloddsmap[j].context)); + finaloddsmap[j].totalodds = 0; + + nexttokoddslen = 0; + for (k = 0; k < tokcount; k++) { + finaloddsmap[j].totalodds += oddsmap[i].odds[k]; + if (oddsmap[i].odds[k] != 0) + nexttokoddslen++; + } + + if ((nexttokoddsoff + nexttokoddslen) > NEXT_TOK_ODDS_MAX_LEN) + hcf(); + finaloddsmap[j].nexttokoddsoff = nexttokoddsoff; + finaloddsmap[j].nexttokoddslen = nexttokoddslen; + + for (k = 0; k < tokcount; k++) { + if (oddsmap[i].odds[k] == 0) + continue; + nexttokodds[nexttokoddsoff].tok = k; + nexttokodds[nexttokoddsoff].odds = oddsmap[i].odds[k]; + nexttokoddsoff++; + } + } + + if (duplicates != 0) + fprintf(stderr, "%s map has %" PRIu32 " duplicates\n", + name, duplicates); + + if (fprintf(out, + "#define %s_TOKEN_COUNT %zu\n" + "#define %s_MAP_MASK 0x%.8" PRIx32 "\n" + "#define %s_HASH_SEED 0x%.8" PRIx32 "\n" + "struct %s_ctx_odds {\n" + "\tuint32_t ctx[CONTEXT_WINDOW_LENGTH];\n" + "\tuint32_t total_odds;\n" + "\tuint32_t tok_odds_off;\n" + "\tuint32_t tok_odds_len;\n" + "};\n" + "struct %s_tok_odds {\n" + "\tuint32_t tok;\n" + "\tuint32_t odds;\n" + "};\n" + "static struct %s_ctx_odds %s_ctx_odds_map[] = {\n", + name, tokcount, name, oddsmapmask, name, seed, + name, name, name, name) < 0) + hcf(); + + for (i = 0; i < oddsmaplen; i++) { + if (fputs("\t{ { ", out) == EOF) + hcf(); + for (j = 0; j < CONTEXT_WINDOW_LENGTH; j++) + if (fprintf(out, "0x%.8" PRIx32 ", ", + finaloddsmap[i].context[j]) < 0) + hcf(); + if (fprintf(out, + "}, %10" PRIu32 ", %10" PRIu32 ", 0x%.8" PRIx32 " },\n", + finaloddsmap[i].totalodds, finaloddsmap[i].nexttokoddsoff, + finaloddsmap[i].nexttokoddslen) < 0) + hcf(); + } + + if (fprintf(out, + "};\n" + "static struct %s_tok_odds %s_tok_odds_list[] = {\n", + name, name) < 0) + hcf(); + + for (i = 0; i < nexttokoddsoff; i++) + if (fprintf(out, + "\t{ 0x%.8" PRIx32 ", 0x%.8" PRIx32 " },\n", + nexttokodds[i].tok, nexttokodds[i].odds) < 0) + hcf(); + + if (fprintf(out, + "};\n" + "static uint32_t %s_offs[] = { ", + name) < 0) + hcf(); + + for (i = 0; i < tokcount; i++) + if (fprintf(out, "%" PRIu32 ", ", tokoffs[i]) < 0) + hcf(); + + if (fprintf(out, + "};\n" + "static unsigned char %s_cont[] = { ", + name) < 0) + hcf(); + + for (i = 0; i < tokcontlen; i++) + if (fprintf(out, "0x%.2hhx, ", tokcont[i]) < 0) + hcf(); + + if (fprintf(out, + "};\n" + "\n" + "static size_t\n" + "%s_generate(unsigned char *out, size_t outlen, size_t tokens)\n" + "{\n" + "\tsize_t ctxlen, i, j;\n" + "\tconst unsigned char *tokname, *startout;\n" + "\tuint32_t ctx[CONTEXT_WINDOW_LENGTH], rngval, tokind, " + "trunchash;\n" + "\n" + "\tstartout = out;\n" + "\n" + "\ttokind = random() %% %s_TOKEN_COUNT;\n" + "\tfor (i = 0; i < CONTEXT_WINDOW_LENGTH; i++)\n" + "\t\tctx[i] = 0xFFFFFFFF;\n" + "\n" + "\tfor (;;) {\n" + "\t\ttokname = %s_cont + %s_offs[tokind];\n" + "\t\twhile (*tokname != 0x00) {\n" + "\t\t\t*out = *tokname;\n" + "\t\t\tout++;\n" + "\t\t\toutlen--;\n" + "\t\t\tif (outlen == 0)\n" + "\t\t\t\treturn out - startout;\n" + "\t\t\ttokname++;\n" + "\t\t}\n" + "\n" + "\t\ttokens--;\n" + "\t\tif (tokens == 0)\n" + "\t\t\treturn out - startout;\n" + "\n" + "\t\tmemmove(ctx + 1, ctx,\n" + "\t\t sizeof(*ctx) * (CONTEXT_WINDOW_LENGTH - 1));\n" + "\t\tctx[0] = tokind;\n" + "\n" + "\t\tfor (ctxlen = CONTEXT_WINDOW_LENGTH; ctxlen > 0; ctxlen--) {\n" + "\t\t\ttrunchash = markov_ctxhash(ctx, ctxlen, %s_HASH_SEED);\n" + "\t\t\ttrunchash &= %s_MAP_MASK;\n" + "\t\t\ti = trunchash;\n" + "\t\t\tfor (;;) {\n" + "\t\t\t\tfor (j = 0; j < CONTEXT_WINDOW_LENGTH; j++)\n" + "\t\t\t\t\tif (ctx[j] != %s_ctx_odds_map[i].ctx[j]) {\n" + "\t\t\t\t\t\ti++;\n" + "\t\t\t\t\t\ti &= %s_MAP_MASK;\n" + "\t\t\t\t\t\tif (i == trunchash)\n" + "\t\t\t\t\t\t\tgoto nextctxwindow;\n" + "\t\t\t\t\t\tgoto nextctxodds;\n" + "\t\t\t\t\t}\n" + "\t\t\t\tbreak;\n" + "nextctxodds:\n" + "\t\t\t\tcontinue;\n" + "\t\t\t}\n" + "\n" + "\t\t\trngval = random() %% %s_ctx_odds_map[i].total_odds;\n" + "\t\t\tfor (j = %s_ctx_odds_map[i].tok_odds_off;\n" + "\t\t\t j < (%s_ctx_odds_map[i].tok_odds_off +\n" + "\t\t\t %s_ctx_odds_map[i].tok_odds_len);\n" + "\t\t\t j++) {\n" + "\t\t\t\tif (%s_tok_odds_list[j].odds > rngval)\n" + "\t\t\t\t\tbreak;\n" + "\t\t\t\trngval -= %s_tok_odds_list[j].odds;\n" + "\t\t\t}\n" + "\n" + "\t\t\ttokind = %s_tok_odds_list[j].tok;\n" + "\t\t\tgoto nexttoken;\n" + "nextctxwindow:\n" + "\t\t\tcontinue;\n" + "\t\t}\n" + "\t\t/* dead end, stop here */\n" + "\t\tbreak;\n" + "nexttoken:\n" + "\t\tcontinue;\n" + "\t}\n" + "\n" + "\treturn out - startout;\n" + "}\n", + name, name, name, name, name, name, name, name, name, name, name, + name, name, name, name) < 0) + hcf(); + + fclose(f); +} + +int +main(void) +{ + oddsmap = malloc(MAP_MAX_LEN * sizeof(*oddsmap)); + if (oddsmap == NULL) + hcf(); + finaloddsmap = malloc(MAP_MAX_LEN * sizeof(*finaloddsmap)); + if (finaloddsmap == NULL) + hcf(); + + out = fopen("generated.h", "w"); + if (out == NULL) + hcf(); + + if (fprintf(out, + "/* Machine generated code, see generate.c */\n" + "\n" + "#include \n" + "#include \n" + "#include \n" + "\n" + "#define CONTEXT_WINDOW_LENGTH %d\n" + "\n" + "/* Murmur3_32 hash */\n" + "static uint32_t\n" + "markov_ctxhash(const uint32_t *in, size_t len, uint32_t seed)\n" + "{\n" + "\tsize_t i;\n" + "\tuint32_t h, k;\n" + "\n" + "\th = seed;\n" + "\ti = 0;\n" + "\tfor (i = 0; i < CONTEXT_WINDOW_LENGTH; i++) {\n" + "\t\tk = i < len ? in[i] : 0xFFFFFFFF;\n" + "\t\tk *= 0xcc9e2d51;\n" + "\t\tk = (k << 15) | (k >> 17); /* ROL 15 */\n" + "\t\tk *= 0x1b873593;\n" + "\t\th ^= k;\n" + "\t\th = (h << 13) | (h >> 19); /* ROL 13 */\n" + "\t\th *= 5;\n" + "\t\th += 0xe6546b64;\n" + "\t}\n" + "\th ^= len;\n" + "\th ^= h >> 16;\n" + "\th *= 0x85ebca6b;\n" + "\th ^= h >> 13;\n" + "\th *= 0xc2b2ae35;\n" + "\th ^= h >> 16;\n" + "\n" + "\treturn h;\n" + "}\n" + "\n", + CONTEXT_WINDOW_LENGTH) < 0) + hcf(); + + train("html", 0x00000001); + train("url_name", 0x00000005); + train("config", 0x00000004); + train("url", 0x00000010); + + return 0; +} diff --git a/grainpit.cgi/main.c b/grainpit.cgi/main.c new file mode 100644 index 0000000..9010c04 --- /dev/null +++ b/grainpit.cgi/main.c @@ -0,0 +1,76 @@ +#define _XOPEN_SOURCE 500 + +#include +#include +#include +#include + +#include "config.h" +#include "generated.h" + +#define ARRAYSIZE(x) (sizeof(x)/sizeof(*(x))) + +static unsigned char buf[262144]; + +int +main(int argc, char **argv) +{ + size_t bufpos, i; + const char *ext, *path_info; + + path_info = getenv("PATH_INFO"); + if (path_info == NULL) + path_info = ""; + if (path_info[0] == '/' && path_info[1] == 0) + path_info = ""; + + srandom(time(NULL)); + + ext = strrchr(path_info, '.'); + if (ext == NULL) + ext = ""; + if (path_info[0] != 0 && strcmp(ext, ".html") != 0) { + buf[markov3_generate(buf, sizeof(buf) - 1, 512)] = 0; + if (printf("Content-Type: text/plain; charset=UTF-8\n\n%s", + buf) < 0) + return 1; + return 0; + } + + if (fputs( + "Content-Type: text/html; charset=UTF-8\n" + "\n" + "

This is my website and it is Amazing!!

\n", + stdout) == EOF) + return 1; + for (i = 0; i < 16; i++) { + if (fputs("\n", buf) < 0) + return 1; + buf[markov2_generate(buf, sizeof(buf) - 1, 16)] = 0; + if (printf("%s
", buf) < 0) + return 1; + } + + buf[markov1_generate(buf, sizeof(buf) - 1, 4096)] = 0; + /* XXX modify href */ + if (fputs(buf, stdout) == EOF) + return 1; + + return 0; +} From 7162034d17f918d0f57c66131a801198f4df7ae7 Mon Sep 17 00:00:00 2001 From: electron271 <66094410+electron271@users.noreply.github.com> Date: Sat, 12 Sep 2026 10:56:06 -0500 Subject: [PATCH 2/7] forgot to remove the 0bsd portion from this file whoops --- grainpit.cgi/Makefile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/grainpit.cgi/Makefile b/grainpit.cgi/Makefile index b3b7d94..d662353 100644 --- a/grainpit.cgi/Makefile +++ b/grainpit.cgi/Makefile @@ -1,16 +1,3 @@ -# Copyright (C) 2026 doclic -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -# PERFORMANCE OF THIS SOFTWARE. - .POSIX: # compiler for the machine that runs the build From 653af0425f2c72d4db586c4c75070d762fc5177f Mon Sep 17 00:00:00 2001 From: doclic Date: Sat, 12 Sep 2026 18:16:32 +0200 Subject: [PATCH 3/7] cgi: abort on error --- grainpit.cgi/generate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grainpit.cgi/generate.c b/grainpit.cgi/generate.c index c2f5bce..19c216d 100644 --- a/grainpit.cgi/generate.c +++ b/grainpit.cgi/generate.c @@ -16,7 +16,7 @@ fprintf(stderr, "big bad error at %s:%d, errno: %s\n", \ __FILE__, __LINE__, strerror(errno)); \ unlink("generated.h"); \ - exit(1); \ + abort(); \ } while(0) #define TOKEN_MAX_LENGTH 4096 From 70747638eed40da8827e2eb96337067cdee72bc0 Mon Sep 17 00:00:00 2001 From: doclic Date: Sat, 12 Sep 2026 18:22:02 +0200 Subject: [PATCH 4/7] cgi: adjust limits for the new data set --- grainpit.cgi/generate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grainpit.cgi/generate.c b/grainpit.cgi/generate.c index 19c216d..2ccd1a7 100644 --- a/grainpit.cgi/generate.c +++ b/grainpit.cgi/generate.c @@ -21,9 +21,10 @@ #define TOKEN_MAX_LENGTH 4096 /* needs to be a power of 2 */ -#define TOKEN_MAX_COUNT 4096 +#define TOKEN_MAX_COUNT 8192 #define NEXT_TOK_ODDS_MAX_LEN 262144 -#define MAP_MAX_LEN 131072 +/* needs to be a power of 2 */ +#define MAP_MAX_LEN 524288 #define MAP_MAX_MASK (MAP_MAX_LEN - 1) #define TOKEN_CONTENTS_MAX_LENGTH 1048576 #define CONTEXT_WINDOW_LENGTH 5 From 2af8f6a84cb025a91061902af7c3d2df5f57420c Mon Sep 17 00:00:00 2001 From: doclic Date: Sat, 12 Sep 2026 18:24:00 +0200 Subject: [PATCH 5/7] cgi: use new names in main --- grainpit.cgi/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/grainpit.cgi/main.c b/grainpit.cgi/main.c index 9010c04..01fcb87 100644 --- a/grainpit.cgi/main.c +++ b/grainpit.cgi/main.c @@ -30,7 +30,7 @@ main(int argc, char **argv) if (ext == NULL) ext = ""; if (path_info[0] != 0 && strcmp(ext, ".html") != 0) { - buf[markov3_generate(buf, sizeof(buf) - 1, 512)] = 0; + buf[config_generate(buf, sizeof(buf) - 1, 512)] = 0; if (printf("Content-Type: text/plain; charset=UTF-8\n\n%s", buf) < 0) return 1; @@ -51,23 +51,23 @@ main(int argc, char **argv) ARRAYSIZE(grainpit_extraurls)], stdout) == EOF) return 1; bufpos = 0; - bufpos += markov4_generate( + bufpos += url_generate( buf + bufpos, sizeof(buf) - bufpos - 3, 4); buf[bufpos++] = '/'; - bufpos += markov4_generate( + bufpos += url_generate( buf + bufpos, sizeof(buf) - bufpos - 2, 4); buf[bufpos++] = '/'; - bufpos += markov4_generate( + bufpos += url_generate( buf + bufpos, sizeof(buf) - bufpos - 1, 4); buf[bufpos++] = 0; if (printf("%s.html'>", buf) < 0) return 1; - buf[markov2_generate(buf, sizeof(buf) - 1, 16)] = 0; + buf[url_name_generate(buf, sizeof(buf) - 1, 16)] = 0; if (printf("%s
", buf) < 0) return 1; } - buf[markov1_generate(buf, sizeof(buf) - 1, 4096)] = 0; + buf[html_generate(buf, sizeof(buf) - 1, 4096)] = 0; /* XXX modify href */ if (fputs(buf, stdout) == EOF) return 1; From 84aa3f0eaf614337aa8bb47a805aa4f9e44f10ab Mon Sep 17 00:00:00 2001 From: doclic Date: Sat, 12 Sep 2026 18:24:11 +0200 Subject: [PATCH 6/7] cgi: don't take arguments in main --- grainpit.cgi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grainpit.cgi/main.c b/grainpit.cgi/main.c index 01fcb87..5a98e59 100644 --- a/grainpit.cgi/main.c +++ b/grainpit.cgi/main.c @@ -13,7 +13,7 @@ static unsigned char buf[262144]; int -main(int argc, char **argv) +main(void) { size_t bufpos, i; const char *ext, *path_info; From 5515f847d3b6fd98eaafe8527e7bd6b6e26b1eee Mon Sep 17 00:00:00 2001 From: electron271 <66094410+electron271@users.noreply.github.com> Date: Sat, 12 Sep 2026 11:29:25 -0500 Subject: [PATCH 7/7] update readme --- grainpit.cgi/README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/grainpit.cgi/README b/grainpit.cgi/README index 510fb28..db9ef04 100644 --- a/grainpit.cgi/README +++ b/grainpit.cgi/README @@ -1,2 +1,6 @@ grainpit.cgi +build with make +if you need to edit config edit config.h +the compilation uses a lot of memory (like 8gb) go complain to doclic if it causes issues +