X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/agedu/blobdiff_plain/f2e528936aac5fb2f68693ce8cda348c2a7c1a91..995db5990865ab0772e0f0902ba39c1fb9336fa3:/html.c diff --git a/html.c b/html.c index 47e4372..48f1827 100644 --- a/html.c +++ b/html.c @@ -11,13 +11,12 @@ #include #include +#include "agedu.h" #include "html.h" -#include "malloc.h" +#include "alloc.h" #include "trie.h" #include "index.h" -#define lenof(x) ( sizeof((x)) / sizeof(*(x)) ) - #define MAXCOLOUR 511 struct html { @@ -164,12 +163,14 @@ static void get_indices(const void *t, char *path, unsigned long *xi1, unsigned long *xi2) { size_t pathlen = strlen(path); + int c1 = path[pathlen], c2 = (pathlen > 0 ? path[pathlen-1] : 0); *xi1 = trie_before(t, path); - path[pathlen] = '\001'; - path[pathlen+1] = '\0'; + make_successor(path); *xi2 = trie_before(t, path); - path[pathlen] = '\0'; + path[pathlen] = c1; + if (pathlen > 0) + path[pathlen-1] = c2; } static unsigned long long fetch_size(const void *t, char *path, @@ -342,7 +343,7 @@ static void write_report_line(struct html *ctx, struct vector *vec) size = vec->sizes[MAXCOLOUR]; htprintf(ctx, "\n" "%lluMb\n", - ((size + ((1<<11)-1)) >> 11)); /* convert to Mb, rounding up */ + ((size + ((1<<20)-1)) >> 20)); /* convert to Mb, rounding up */ /* * Generate a colour bar. @@ -391,7 +392,7 @@ char *html_query(const void *t, unsigned long index, struct html actx, *ctx = &actx; char *path, *path2, *p, *q, *href; char agebuf1[80], agebuf2[80]; - size_t pathlen, hreflen; + size_t pathlen, subdirpos, hreflen; unsigned long index2; int i; struct vector **vecs; @@ -424,7 +425,7 @@ char *html_query(const void *t, unsigned long index, */ htprintf(ctx, "\n"); trie_getpath(t, index, path); - htprintf(ctx, "agedu: "); + htprintf(ctx, "<title>%s: ", PNAME); htescape(ctx, path, strlen(path), 0); htprintf(ctx, "\n"); htprintf(ctx, "\n"); @@ -442,26 +443,37 @@ char *html_query(const void *t, unsigned long index, */ htprintf(ctx, "

\n"); q = path; - for (p = strchr(path, '/'); p; p = strchr(p+1, '/')) { + for (p = strchr(path, pathsep); p && p[1]; p = strchr(p, pathsep)) { int doing_href = 0; + char c, *zp; + /* * See if this path prefix exists in the trie. If so, * generate a hyperlink. */ - *p = '\0'; + zp = p; + if (p == path) /* special case for "/" at start */ + zp++; + + p++; + + c = *zp; + *zp = '\0'; index2 = trie_before(t, path); trie_getpath(t, index2, path2); if (!strcmp(path, path2) && cfg->format) { snprintf(href, hreflen, cfg->format, index2); + if (!*href) /* special case that we understand */ + strcpy(href, "./"); htprintf(ctx, "", href); doing_href = 1; } - *p = '/'; - htescape(ctx, q, p - q, 1); - q = p + 1; + *zp = c; + htescape(ctx, q, zp - q, 1); if (doing_href) htprintf(ctx, ""); - htprintf(ctx, "/"); + htescape(ctx, zp, p - zp, 1); + q = p; } htescape(ctx, q, strlen(q), 1); htprintf(ctx, "\n"); @@ -527,6 +539,9 @@ char *html_query(const void *t, unsigned long index, get_indices(t, path, &xi1, &xi2); xi1++; pathlen = strlen(path); + subdirpos = pathlen + 1; + if (pathlen > 0 && path[pathlen-1] == pathsep) + subdirpos--; while (xi1 < xi2) { trie_getpath(t, xi1, path2); get_indices(t, ctx->path2, &xj1, &xj2); @@ -538,7 +553,7 @@ char *html_query(const void *t, unsigned long index, vecs = sresize(vecs, vecsize, struct vector *); } assert(strlen(path2) > pathlen); - vecs[nvecs] = make_vector(ctx, path2, 1, path2 + pathlen + 1); + vecs[nvecs] = make_vector(ctx, path2, 1, path2 + subdirpos); for (i = 0; i <= MAXCOLOUR; i++) vecs[0]->sizes[i] -= vecs[nvecs]->sizes[i]; nvecs++;