mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-26 18:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-snapshot.c: specify archiver_args.baselen

Browse Source 
The struct member was introduces in git commit d53fe8187c38, but the cgit
testsuite failed to detect that cgit always generated archives without
prefixes, i.e. the result from cgit_repobasename was ignored.

This fixes the bug and the testsuite.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2008-10-05 13:13:03 +02:00
parent f82b19407d
commit 204669ff4a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/t0107-snapshot.sh
View File

@ -21,7 +21,10 @@ run_test 'strip off the header lines' '
' '
run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz' run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz'
run_test 'untar' 'tar -xf trash/test.tar.gz -C trash' run_test 'untar' '
rm -rf trash/foo &&
tar -xf trash/test.tar.gz -C trash
'
run_test 'count files' ' run_test 'count files' '
c=$(ls -1 trash/foo/ | wc -l) && c=$(ls -1 trash/foo/ | wc -l) &&

6
ui-snapshot.c
View File

@ -82,7 +82,13 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
return 1; return 1;
} }
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
if (prefix) {
args.base = fmt("%s/", prefix); args.base = fmt("%s/", prefix);
args.baselen = strlen(prefix) + 1;
} else {
args.base = "";
args.baselen = 0;
}
args.tree = commit->tree; args.tree = commit->tree;
args.time = commit->date; args.time = commit->date;
ctx.page.mimetype = xstrdup(format->mimetype); ctx.page.mimetype = xstrdup(format->mimetype);