~ruther/guix-local

ref: 6568d2bd6e4e047dd95b00a7a6e7501a16491eb5 guix-local/gnu/packages/patches/libarchive-mtree-filename-length-fix.patch -rw-r--r-- 580 bytes
6568d2bd — Ludovic Courtès search-paths: Add 'evaluate-search-paths', from (guix scripts package). 11 years ago
                                                                                
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
Description: Patch to fix filename length calculation when writing mtree archives.
Author: Dave Reisner <dreisner@archlinux.org>
Origin: upstream

--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -1855,9 +1855,9 @@
 		return (ret);
 	}
 
-	/* Make a basename from dirname and slash */
+	/* Make a basename from file->parentdir.s and slash */
 	*slash  = '\0';
-	file->parentdir.length = slash - dirname;
+	file->parentdir.length = slash - file->parentdir.s;
 	archive_strcpy(&(file->basename),  slash + 1);
 	return (ret);
 }