30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
|
From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dave Reisner <dreisner@archlinux.org>
|
||
|
|
Date: Thu, 21 Feb 2013 19:01:06 -0500
|
||
|
|
Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301.
|
||
|
|
Signed-off-by: Andres Mejia <amejia004@gmail.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
libarchive/archive_write_set_format_mtree.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
|
||
|
|
index 9c0613c..f37f723 100644
|
||
|
|
--- a/libarchive/archive_write_set_format_mtree.c
|
||
|
|
+++ b/libarchive/archive_write_set_format_mtree.c
|
||
|
|
@@ -1855,9 +1855,9 @@ mtree_entry_setup_filenames(struct archive_write *a, struct mtree_entry *file,
|
||
|
|
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);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|