section-from-path > 1

section-from-path > 1

[mricon]

Hi, all:

It appears that section-from-path > 1 has the same affect as 1.
E.g. setting it to 2 or 3 makes no difference.


Cheers,
-- 
Konstantin Ryabitsev
Senior Systems Administrator
Linux Foundation Collab Projects
Montr?al, Qu?bec

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 730 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20130626/973a2bd3/attachment.asc>

[PATCH] Fix section-from-path > 1

[cgit]

When having found the first path separator occurrence at position i, we
invoked strchr() on the same position i in subsequent iterations
resulting in the same path separator being returned by strchr() over and
over again. Increase the position by one to skip the occurrence that has
just been found and advance to the next separator.

Reported-by: Konstantin Ryabitsev <mricon at kernel.org>
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
Completely untested but I think something like this might fix it.

 scan-tree.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scan-tree.c b/scan-tree.c
index 2684b44..7cd8f08 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -148,14 +148,14 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
 	}
 
 	if (ctx.cfg.section_from_path) {
-		n  = ctx.cfg.section_from_path;
+		n = ctx.cfg.section_from_path;
 		if (n > 0) {
-			slash = rel.buf;
-			while (slash && n && (slash = strchr(slash, '/')))
+			slash = rel.buf - 1;
+			while (slash && n && (slash = strchr(slash + 1, '/')))
 				n--;
 		} else {
 			slash = rel.buf + rel.len;
-			while (slash && n && (slash = xstrrchr(rel.buf, slash, '/')))
+			while (slash && n && (slash = xstrrchr(rel.buf, slash - 1, '/')))
 				n++;
 		}
 		if (slash && !n) {
-- 
1.8.3.1.764.g8b6e9d8

[PATCH] Fix section-from-path > 1

[mricon]

On 28/06/13 05:06 AM, Lukas Fleischer wrote:
> When having found the first path separator occurrence at position i, we
> invoked strchr() on the same position i in subsequent iterations
> resulting in the same path separator being returned by strchr() over and
> over again. Increase the position by one to skip the occurrence that has
> just been found and advance to the next separator.
> 
> Reported-by: Konstantin Ryabitsev <mricon at kernel.org>
> Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
> ---
> Completely untested but I think something like this might fix it.

It appears to work correctly in my tests. Thanks!

Best,
-- 
Konstantin Ryabitsev
Senior Systems Administrator
Linux Foundation Collab Projects
Montr?al, Qu?bec

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 730 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20130628/8b73e5d8/attachment.asc>

section-from-path > 1

[Jason]

The relevant code is here:

        if (ctx.cfg.section_from_path) {
                n  = ctx.cfg.section_from_path;
                if (n > 0) {
                        slash = rel.buf;
                        while (slash && n && (slash = strchr(slash, '/')))
                                n--;
                } else {
                        slash = rel.buf + rel.len;
                        while (slash && n && (slash = xstrrchr(rel.buf,
slash, '/')))
                                n++;
                }
                if (slash && !n) {
                        *slash = '\0';
                        repo->section = xstrdup(rel.buf);
                        *slash = '/';
                        if (!prefixcmp(repo->name, repo->section)) {
                                repo->name += strlen(repo->section);
                                if (*repo->name == '/')
                                        repo->name++;
                        }
                }
        }

I haven't looked at this closely, but do you see a bug that resembles the
issue you're seeing? Currently on vacation and I can look in more depth
when I return.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20130812/a687edfb/attachment.html>

section-from-path > 1

[Jason]

Caught up to mailing list posts. Thanks for the fix Lukas. Disregard prior
message.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20130812/aa54401a/attachment.html>