From mboxrd@z Thu Jan 1 00:00:00 1970 From: john at keeping.me.uk (John Keeping) Date: Mon, 20 May 2019 23:05:38 +0100 Subject: [PATCH] ui-shared: restrict to 15 levels In-Reply-To: <20190520195506.16860-1-Jason@zx2c4.com> References: <20190520195506.16860-1-Jason@zx2c4.com> Message-ID: <20190520215620.GA31545@john.keeping.me.uk> On Mon, May 20, 2019 at 09:55:06PM +0200, Jason A. Donenfeld wrote: > Perhaps a more ideal version of this would be to not print breadcrumbs > at all for paths that don't exist in the given repo at the given oid. > > Signed-off-by: Jason A. Donenfeld > Reported-by: Fydor Wire Snark > --- > I've committed this, and it works. But if anyone would like to give the > implementation a stab, I think a better approach might be simply > skipping printing of breadcrumbs in cases where the path doesn't exist > in the repo. This way we're not limited to some reasonable constant such > as 15. That works for some pages, but I'm not sure it works in general (or at least it's not always trivial to figure out if the path exists). One example is ui-log, where it's perfectly reasonably to ask for the log restricted to a path which doesn't exist in HEAD, and I'm not sure at what point we decide that checking if the path exists at any point in the history is more expensive than printing a long path here. > ui-shared.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/ui-shared.c b/ui-shared.c > index d27a5fd..d2358f2 100644 > --- a/ui-shared.c > +++ b/ui-shared.c > @@ -945,12 +945,13 @@ static void cgit_print_path_crumbs(char *path) > { > char *old_path = ctx.qry.path; > char *p = path, *q, *end = path + strlen(path); > + int levels = 0; > > ctx.qry.path = NULL; > cgit_self_link("root", NULL, NULL); > ctx.qry.path = p = path; > while (p < end) { > - if (!(q = strchr(p, '/'))) > + if (!(q = strchr(p, '/')) || levels > 15) > q = end; > *q = '\0'; > html_txt("/"); > @@ -958,6 +959,7 @@ static void cgit_print_path_crumbs(char *path) > if (q < end) > *q = '/'; > p = q + 1; > + ++levels; > } > ctx.qry.path = old_path; > } > -- > 2.21.0