]> git.cameronkatri.com Git - cgit.git/commitdiff
ui-clone.c: Fix off-by-one error in pack path
authorJason A. Donenfeld <Jason@zx2c4.com>
Mon, 9 Feb 2015 11:27:44 +0000 (12:27 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Mon, 9 Feb 2015 11:29:57 +0000 (12:29 +0100)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
ui-clone.c

index 1e6238d08eb2c48da6bac5ddaba5e71bea47f199..e35d3d310e1434852a956718d75eecd2e0059265 100644 (file)
@@ -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)