ui-clone.c: Fix off-by-one error in pack path

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

1 file changed, 11 insertions, 5 deletions

diff --git a/ui-clone.c b/ui-clone.cindex 1e6238d..e35d3d3 100644--- a/ui-clone.c+++ b/ui-clone.c@@ -32,16 +32,22 @@ static int print_ref_info(const char *refname, const unsigned char *sha1, static void print_pack_info(void) { 	struct packed_git *pack;-	int ofs;+	char *offset;  	ctx.page.mimetype = "text/plain"; 	ctx.page.filename = "objects/info/packs"; 	cgit_print_http_headers();-	ofs = strlen(ctx.repo->path) + strlen("/objects/pack/"); 	prepare_packed_git();-	for (pack = packed_git; pack; pack = pack->next)-		if (pack->pack_local)-			htmlf("P %s\n", pack->pack_name + ofs);+	for (pack = packed_git; pack; pack = pack->next) {+		if (pack->pack_local) {+			offset = strrchr(pack->pack_name, '/');+			if (offset && offset[1] != '\0')+				++offset;+			else+				offset = pack->pack_name;+			htmlf("P %s\n", offset);+		}+	} }  static void send_file(char *path)
diff --git a/ui-clone.c b/ui-clone.c
index 1e6238d..e35d3d3 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -32,16 +32,22 @@ static int print_ref_info(const char *refname, const unsigned char *sha1,
 static void print_pack_info(void)
 {
 	struct packed_git *pack;
-	int ofs;
+	char *offset;
 
 	ctx.page.mimetype = "text/plain";
 	ctx.page.filename = "objects/info/packs";
 	cgit_print_http_headers();
-	ofs = strlen(ctx.repo->path) + strlen("/objects/pack/");
 	prepare_packed_git();
-	for (pack = packed_git; pack; pack = pack->next)
-		if (pack->pack_local)
-			htmlf("P %s\n", pack->pack_name + ofs);
+	for (pack = packed_git; pack; pack = pack->next) {
+		if (pack->pack_local) {
+			offset = strrchr(pack->pack_name, '/');
+			if (offset && offset[1] != '\0')
+				++offset;
+			else
+				offset = pack->pack_name;
+			htmlf("P %s\n", offset);
+		}
+	}
 }
 
 static void send_file(char *path)