[PATCH 2/2] shared: use strbuf for expanding macros

2018-06-16 Thread John Keeping
Avoid a fixed size buffer by using struct strbuf to build the expanded value. Signed-off-by: John Keeping --- shared.c | 73 +--- 1 file changed, 27 insertions(+), 46 deletions(-) diff --git a/shared.c b/shared.c index 32d0f46..6ce3990 100644

[PATCH 1/2] shared: allocate return value from expand_macros()

2018-06-16 Thread John Keeping
In preparation for switching the implementation of expand_macros away from a static buffer, return an allocated buffer and update all callers to release it. Signed-off-by: John Keeping --- cgit.c | 33 +++-- shared.c| 5 ++--- ui-shared.c | 9 ++--- 3

Re: [PATCH 07/11] ui-blame: free read_sha1_file() buffer after use

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 10:02:05AM +0800, Andy Green wrote: > Signed-off-by: Andy Green > --- > ui-blame.c |3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/ui-blame.c b/ui-blame.c > index 17e2d60..a5c7d69 100644 > --- a/ui-blame.c > +++ b/ui-blame.c > @@ -206,6 +206,9 @@ static

Re: [PATCH 2/2] gcc8.1: fix strcat warning

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 07:34:07AM +0800, Andy Green wrote: > ../ui-ssdiff.c: In function ‘replace_tabs’: > ../ui-ssdiff.c:142:4: warning: ‘strncat’ output truncated copying between 1 > and 8 bytes from a string of length 8 [-Wstringop-truncation] > strncat(result, spaces, 8 - (strlen(result)

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread John Keeping
On Sat, Jun 16, 2018 at 01:38:31AM -0400, Todd Zullinger wrote: > When make is run with multiple jobs, doc-man and doc-html fail. The a2x > command tries to write %.5.xml for each invocation, overwriting each > other. > > Work around this by copying %.5 to %.5+ in doc-man. This is a rather >

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread Jason A. Donenfeld
Hey John, That seems like a reasonable approach. Feel free to queue it up in jk/for-jason. Jason ___ CGit mailing list CGit@lists.zx2c4.com https://lists.zx2c4.com/mailman/listinfo/cgit

Re: [PATCH 1/2] gcc8.1: fix strncpy bounds warnings

2018-06-16 Thread John Keeping
On Sat, Jun 16, 2018 at 09:12:08PM +0800, Andy Green wrote: > > > On June 16, 2018 9:04:48 PM GMT+08:00, John Keeping > wrote: > >On Wed, Jun 13, 2018 at 07:33:59AM +0800, Andy Green wrote: > >> These warnings are coming on default Fedora 28 build and probably > >others using gcc 8.1 > >> >

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread Thomas Moschny
Todd Zullinger : > When make is run with multiple jobs, doc-man and doc-html fail. The > a2x command tries to write %.5.xml for each invocation, overwriting > each other. > > Work around this by copying %.5 to %.5+ in doc-man. This is a rather > gross hack, but nothing better came to mind.

Re: [PATCH 1/2] gcc8.1: fix strncpy bounds warnings

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 07:33:59AM +0800, Andy Green wrote: > These warnings are coming on default Fedora 28 build and probably others > using gcc 8.1 > > ../shared.c: In function ‘expand_macro’: > ../shared.c:483:3: warning: ‘strncpy’ specified bound depends on the length > of the source

Re: [PATCH 06/11] ui-tree: free read_sha1_file() buffer after use

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 10:02:00AM +0800, Andy Green wrote: > Free up the buffer allocated in read_sha1_file() > > Signed-off-by: Andy Green Reviewed-by: John Keeping I've extracted this from the series and pushed it on my for-jason branch: https://git.zx2c4.com/cgit/log/?h=jk/for-jason >

Re: Rendering of README.md inline with inner tree view dirs

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 09:47:38AM +0800, Andy Green wrote: > > > On 06/12/2018 05:31 PM, John Keeping wrote: > > On Tue, Jun 12, 2018 at 01:53:27PM +0800, Andy Green wrote: > >> On 06/11/2018 11:38 PM, John Keeping wrote: > >>> On Mon, Jun 11, 2018 at 04:05:38PM +0800, Andy Green wrote: > > >>

Re: [PATCH 05/11] ui-tree: use render fileters to display content

2018-06-16 Thread John Keeping
If you're including these patches in your series, please fix my typo in the subject ("fileters" has a stray 'e') :-) On Wed, Jun 13, 2018 at 10:01:55AM +0800, Andy Green wrote: > From: John Keeping > > This allows applying filters to files in the repository, for example to > render Markdown or

Re: [PATCH 1/2] gcc8.1: fix strncpy bounds warnings

2018-06-16 Thread Andy Green
On June 16, 2018 9:04:48 PM GMT+08:00, John Keeping wrote: >On Wed, Jun 13, 2018 at 07:33:59AM +0800, Andy Green wrote: >> These warnings are coming on default Fedora 28 build and probably >others using gcc 8.1 >> >> ../shared.c: In function ‘expand_macro’: >> ../shared.c:483:3: warning:

Re: [PATCH 00/11] Render READMEs inline in tree view

2018-06-16 Thread John Keeping
On Thu, Jun 14, 2018 at 11:47:41AM +0800, Andy Green wrote: > On 06/13/2018 10:01 AM, Andy Green wrote: > > The following series adds config to allow rendering of > > selected READMEs inline after the tree view, where > > present in the directory being viewed. > > > > It builds on John Keeping's

Re: [PATCH] Encode value and field before calculating cookie digest, the same way secure_value() does

2018-06-16 Thread John Keeping
On Thu, Apr 12, 2018 at 08:54:31PM +0300, thev...@gmail.com wrote: > From: Vlad Safronov > > Bugfix: Encode value and field before calculating cookie digest, the same way > as secure_value() does > so validating will work correctly on encoded values. Missing sign-off (see [1] for what this

Re: Rendering of README.md inline with inner tree view dirs

2018-06-16 Thread John Keeping
On Sat, Jun 16, 2018 at 03:12:09PM +0100, John Keeping wrote: > > >> 3) You can see on the top level of the tree, the README.md references > > >> > > >> > > >> > > >> This url format works in github. In the cgit About view, this resolves > > >> to > > >> > > >>

Re: [PATCH 05/11] ui-tree: use render fileters to display content

2018-06-16 Thread Andy Green
On 06/16/2018 10:26 PM, John Keeping wrote: If you're including these patches in your series, please fix my typo in the subject ("fileters" has a stray 'e') :-) OK. On Wed, Jun 13, 2018 at 10:01:55AM +0800, Andy Green wrote: From: John Keeping This allows applying filters to files in

Re: [PATCH 07/11] ui-blame: free read_sha1_file() buffer after use

2018-06-16 Thread Andy Green
On 06/16/2018 10:23 PM, John Keeping wrote: On Wed, Jun 13, 2018 at 10:02:05AM +0800, Andy Green wrote: Signed-off-by: Andy Green --- ui-blame.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/ui-blame.c b/ui-blame.c index 17e2d60..a5c7d69 100644 --- a/ui-blame.c +++

Re: [PATCH 1/1] RFC: git: update to v2.18.0-rc2

2018-06-16 Thread Jason A. Donenfeld
On Sat, Jun 16, 2018 at 6:14 PM John Keeping wrote: > But we still have a few mentions of sha1 in our code. Most of this is > sha1 and sha2 in struct cgit_query, but these aren't actually hashes > most of the time, they can be any object reference that Git understands, > so I think we should

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread Todd Zullinger
Thomas Moschny wrote: > Todd Zullinger : > >> When make is run with multiple jobs, doc-man and doc-html fail. The >> a2x command tries to write %.5.xml for each invocation, overwriting >> each other. >> >> Work around this by copying %.5 to %.5+ in doc-man. This is a rather >> gross hack, but

Re: [PATCH 1/1] snapshot: support special value 'all' to enable all formats

2018-06-16 Thread John Keeping
On Thu, Jun 07, 2018 at 10:05:50PM +0200, Christian Hesse wrote: > From: Christian Hesse > > Signed-off-by: Christian Hesse Reviewed-by: John Keeping > --- > cgitrc.5.txt | 1 + > shared.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/cgitrc.5.txt b/cgitrc.5.txt > index

Re: [PATCH] ui-tag: Fix inconsistent capitalization

2018-06-16 Thread John Keeping
On Sun, Jun 10, 2018 at 06:28:49PM -0400, Jon DeVree wrote: > Way back in 2009 all of these were lower cased except this one > occurrence. > > Signed-off-by: Jon DeVree Thanks! I've picked this up in jk/for-jason. > --- > ui-tag.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >

Re: Bug: cgit shows empty pages, when viewing Tag-Only-Repo

2018-06-16 Thread John Keeping
On Fri, May 04, 2018 at 08:20:10AM +0200, Björn Lässig wrote: > I use repositories for holding some tags. > Unfortunately cgit shows only > > Repository seems to be empty > > I looked into the code and saw the problem, but i have not the insight > to fix this. > > one (small) example for the

Re: Adding short commit id to repo Log tab

2018-06-16 Thread John Keeping
Sorry for the delay responding. On Wed, Apr 11, 2018 at 12:00:28PM +0300, Vlad wrote: > I think adding short (7 chars) commit id to repository Log tab output > might be more useful than file or line count.. > > I have examined the code, it it not easy to add an extra column > to the output. > >

Re: Translation

2018-06-16 Thread John Keeping
On Mon, Jun 04, 2018 at 10:24:24AM +0200, Malte Kiefer wrote: > first of all I want to say thank you for this amazing software. > I start to using it, and I really like it. > > Then I wanted to inquire with you if you think about offering cgit in > multiple languages? > I would like to translate

Re: [PATCH 10/11] config: add tree-readme list

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 10:02:20AM +0800, Andy Green wrote: > Allows the user to specify a list of filenames that should be > rendered inline with tree view, if present in the directory. > > Signed-off-by: Andy Green As mentioned in reply to the cover leter, I think this needs to be a repo

Re: cache-size implementation downsides

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 03:02:42PM -0400, Konstantin Ryabitsev wrote: > 2. I have witnessed cache corruption due to collisions (which is > a bug in itself). One of our frontends was hit by a lot of agressive > crawling of snapshots that raised the load to 60+ (many, many gzip > processes). After

Re: [PATCH 1/1] RFC: git: update to v2.18.0-rc2

2018-06-16 Thread Christian Hesse
John Keeping on Sat, 2018/06/16 17:14: > With Andy's fix, > > Reviewed-by: John Keeping That is in git 2.17.1 commit already. ;) -- main(a){char*c=/*Schoene Gruesse */"B?IJj;MEH" "CX:;",b;for(a/*Best regards my address:*/=0;b=c[a++];)

Re: [PATCH] expand environmentvariables in root-title and root-descr

2018-06-16 Thread John Keeping
On Thu, Apr 12, 2018 at 11:19:12AM +0200, b.laes...@pengutronix.de wrote: > From: Björn Lässig > > For having personanlized cgit configuration i need to use > > root-desc=$REMOTE_USER@$HTTP_HOST Missing sign-off (see [1] for what this means). Also, this needs a corresponding change in

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread John Keeping
Hi Todd, On Sat, Jun 16, 2018 at 12:32:06PM -0400, Todd Zullinger wrote: > John Keeping wrote: > > How about the patch below instead? It's a bigger change to the output > > format for HTML, but as a side effect it fixes the parallel build. > > It does, but only if the targets are 'doc-man

Re: [PATCH 2/2] gcc8.1: fix strcat warning

2018-06-16 Thread Christian Hesse
John Keeping on Sat, 2018/06/16 14:11: > On Wed, Jun 13, 2018 at 07:34:07AM +0800, Andy Green wrote: > > ../ui-ssdiff.c: In function ‘replace_tabs’: > > ../ui-ssdiff.c:142:4: warning: ‘strncat’ output truncated copying between > > 1 and 8 bytes from a string of length 8 [-Wstringop-truncation] >

Re: [PATCH 2/2] gcc8.1: fix strcat warning

2018-06-16 Thread Andy Green
On 06/17/2018 05:52 AM, Christian Hesse wrote: John Keeping on Sat, 2018/06/16 14:11: On Wed, Jun 13, 2018 at 07:34:07AM +0800, Andy Green wrote: ../ui-ssdiff.c: In function ‘replace_tabs’: ../ui-ssdiff.c:142:4: warning: ‘strncat’ output truncated copying between 1 and 8 bytes from a string

[PATCH] Update COPYING

2018-06-16 Thread Todd Zullinger
The address of the Free Software Foundation has changed since the license was added in 7640d90 ("Add license file and copyright notices", 2006-12-10). Update the license file from gnu.org¹. The only non-whitespace changes are the updated FSF address and two references to the L in LGPL changed

Re: [PATCH 09/11] ui-tree: ls_tail: add walk table param

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 10:02:15AM +0800, Andy Green wrote: > Arrange that walk_tree_ctx is available in ls_tail, we > will make use of it shortly. > > Signed-off-by: Andy Green Reviewed-by: John Keeping > --- > ui-tree.c |6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >

Re: [PATCH 08/11] ui-tree: print_object: add is_inline param

2018-06-16 Thread John Keeping
On Wed, Jun 13, 2018 at 10:02:10AM +0800, Andy Green wrote: > We will reuse print_object to render things inline shortly. > > Add a parameter that lets us adapt its behaviour slightly > for that case. > > Signed-off-by: Andy Green > --- > ui-tree.c |7 --- > 1 file changed, 4

Re: [PATCH 1/1] RFC: git: update to v2.18.0-rc2

2018-06-16 Thread John Keeping
On Thu, Jun 14, 2018 at 12:52:25AM +0200, Christian Hesse wrote: > From: Christian Hesse > > Update to git version v2.18.0-rc2. Required changes follow upstream commits: > > * Convert find_unique_abbrev* to struct object_id > (aab9583f7b5ea5463eb3f653a0b4ecac7539dc94) > * sha1_file: convert

[PATCH] cgitrc.5: fix auth filter return value documentation

2018-06-16 Thread John Keeping
We don't treat all return values as invalid! Signed-off-by: John Keeping --- cgitrc.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 4da166c..3e53bbd 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -715,7 +715,7 @@ auth filter::

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread Todd Zullinger
Hi John, John Keeping wrote: > How about the patch below instead? It's a bigger change to the output > format for HTML, but as a side effect it fixes the parallel build. It does, but only if the targets are 'doc-man doc-html'. For the default 'doc' target which includes 'doc-pdf', the issue is

Re: [RFC PATCH] Makefile: work around parallel make issues in docs

2018-06-16 Thread Todd Zullinger
Hi, John Keeping wrote: > On Sat, Jun 16, 2018 at 12:32:06PM -0400, Todd Zullinger wrote: >> We might also want to drop 'doc-pdf' from the default 'doc' >> target. The alternative is driving the asciidoc pipeline >> for the pdf generation too. That looks a little more >> involved than doing it