sites

commit daafc6fcb9669cf44f875b3d0ff6602f579cb4c8
parent bae33de2dbe1362b24774f94a181f99729349189
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sun, 17 Nov 2019 18:42:16 +0100

build-page: fix highlight of menus starting with the same name

check for / or end of string (NUL byte).

This happened on the menu for st for the patches: alpha and
alphafocushighlight.

Diffstat:
M
build-page.c
 | 
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/build-page.c b/build-page.c
@@ -214,7 +214,7 @@ menu_panel(char *domain, char *page, char *this, int depth)
 	char newdir[PATH_MAX];
 	char *d_list[DIR_MAX], *d;
 	size_t d_len, l;
-	int i;
+	int i, highlight;
 
 	if ((dp = opendir(this ? this : ".")) == NULL)
 		die_perror("opendir: %s", this ? this : ".");
@@ -235,10 +235,13 @@ menu_panel(char *domain, char *page, char *this, int depth)
 		if (!stat_isdir(newdir))
 			continue;
 
+		highlight = page && !strncmp(newdir, page, strlen(newdir)) &&
+			strchr("/", page[strlen(newdir)]); /* / or NUL */
+
 		for (i = 0; i < depth + 1; ++i)
 			putchar('\t');
 		fputs("<li>", stdout);
-		if (page && !strncmp(newdir, page, strlen(newdir))) {
+		if (highlight) {
 			printf("<a href=\"//%s/%s/\"><b>", domain, newdir);
 			print_name(d);
 			fputs("/</b></a>", stdout);
@@ -248,7 +251,7 @@ menu_panel(char *domain, char *page, char *this, int depth)
 			fputs("/</a>", stdout);
 		}
 
-		if (page && !strncmp(newdir, page, strlen(newdir))) {
+		if (highlight) {
 			putchar('\n');
 			for (i = 0; i < depth + 2; ++i)
 				putchar('\t');