fix support for hardlinks in tarballs

bestouff · Jun 25, 2020 · 4f6e7db · 4f6e7db
1 parent ce4de57
commit 4f6e7db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/genext2fs.c b/genext2fs.c
@@ -2397,7 +2397,7 @@ add2fs_from_tarball(filesystem *fs, uint32 this_nod, FILE * fh, int squash_uids,
 					fseek(fh, padding, SEEK_CUR);
 					break;
 				case '1':
-					if(!(hlnod = find_path(fs, this_nod, dir)))
+					if(!(hlnod = find_path(fs, this_nod, tarhead->linkedname)))
 					{
 						error_msg("tarball entry %s skipped: can't find hardlink destination '%s' to create '%s''", path, dir, name);
 						fseek(fh, filesize + padding, SEEK_CUR);

diff --git a/test.sh b/test.sh
@@ -86,4 +86,4 @@ ftest 3db16dd57bd15c1c80dd6bc900411c58 4096 default device_table.txt
 ltest c21b5a3cad405197e821ba7143b0ea9b 200 1024 123456789 device_table_link.txt
 ltest 18b04b4bea2f7ebf315a116be5b92589 200 1024 1234567890 device_table_link.txt
 ltest 8aaed693b75dbdf77607f376d661027a 200 4096 12345678901 device_table_link.txt
-atest 402860495b7e2e1f714e017ef37466c6 200 1024 H4sIAAAAAAACA+3VQQ6CMBCF4a49RU8AnZaZOY8sSIgNTRASj29FVyzUTQno+zYlwAL4M7SqTXEuU+ZlzdbrckxBlJga5SafV/ViLJsNzNfpPFprxpSmd/d9un5QVT3MMZbvL03zfX/yTpyx4Uj9n+9BrzUcp3/Xd2k//UVC7u9Y1FjB/G/QP/bDpZpuU9n+qvpVf9a8T1Bg8sb6LqW6PY9Fn+7v+z8+8n72f2ZZ5p8I+/92/csO2ef/P6/6e/fo79C/uDbO7ckAAAAAAAAAAAAAAAAAwC+4A2+TDLQAKAAA
+atest 2dc494bb633cdd5e56a2ac8209f6dfbc 200 1024 H4sIAAAAAAAAA+3W32qDMBQG8FzvKfIE+X+S51GGrMw2YBW2t19qBrJd1BZ6LJvf7yZFhRz5POlRWrAzRSKa1+L3Ov+2PiayxifjyvWULAlJ/KUJMZ3HZpBSDDmP155bu/9HKX3+PPaH07saP7jeb84/pdX8LdlAqXwnNrjghXRdzrptBsbSkL9+a4ZX3g/gEnAM4Ur+tORPseTvXFmk4Snnp53n3/ZT+/LsIuBplO4OXebdY73/l/M/Rl/631BMQkbesqqd97/Sp6nvefe4J/9E4XL+m2iE9LxlVY/Kv76H/V43Kf0RSv+XIYt3j1vn/+X/35C1mP+3UPPnHbLv6f+afyjngJB2i+F05/kDAAAAAAAAAAAAAMD/8wXpgh0JACgAAA==