Skip to content

Commit deadb9c

Browse files
committed
Merge pull request xapi-project#9 from euanh/master
impl: Strip leading slash from filename if prefix is supplied
2 parents 18b07e0 + 0758153 commit deadb9c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/impl.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,8 @@ let serve_tar_to_raw total_size c dest prezeroed progress expected_prefix ignore
507507
else
508508
let p_len = String.length p in
509509
let file_name_len = String.length hdr.Tar.Header.file_name in
510-
return (String.sub hdr.Tar.Header.file_name p_len (file_name_len - p_len)) ) >>= fun filename ->
510+
let filename = String.sub hdr.Tar.Header.file_name p_len (file_name_len - p_len) in
511+
return (Filename.basename filename)) >>= fun filename ->
511512
let zero = Cstruct.sub header 0 (Tar.Header.compute_zero_padding_length hdr) in
512513
(* either 'counter' or 'counter.checksum' *)
513514
if endswith ".checksum" filename then begin

0 commit comments

Comments
 (0)