Skip to content

Commit 52e18d0

Browse files
authored
Merge pull request #4679 from MidnightCommander/4678_usqfs_missing_files
Ticket #4678: `usqfs` parser ignored first 4 lines of the file listing
2 parents f55ef44 + 4aa2036 commit 52e18d0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/vfs/extfs/helpers/usqfs.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Squash file system
44
#
5-
# tested to comply with unsquashfs version 4.2 (2011/02/28)'s output
5+
# tested to comply with the output of unsquashfs version 4.6.1 (2023/03/25)
66

77
SQUASHFS="${MC_TEST_EXTFS_LIST_CMD:-unsquashfs}"
88
AWK="@AWK@"
@@ -13,8 +13,6 @@ mcsqfs_list ()
1313
{
1414
$SQUASHFS -d "" -lls "$1" | $AWK '
1515
{
16-
if (NR < 5)
17-
next
1816
split($2, a, "/")
1917
file_type=substr($1,1,1)
2018
file_size=file_type == "c" || file_type == "b" ? 0 : $3

tests/src/vfs/extfs/helpers-list/data/usqfs.output

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
drwxr-xr-x 1 235 2024-09-23 14:34:00
2+
drwxr-xr-x 1 778 2024-09-23 14:34:00 /bin
3+
lrwxrwxrwx 1 7 2024-09-23 14:34:00 /bin/ash -> busybox
4+
-rwxr-xr-x 1 205 2024-09-23 14:34:00 /bin/board_detect
15
-rwxr-xr-x 1 327717 2024-09-23 14:34:00 /bin/busybox
26
lrwxrwxrwx 1 7 2024-09-23 14:34:00 /bin/cat -> busybox
37
lrwxrwxrwx 1 7 2024-09-23 14:34:00 /bin/chgrp -> busybox

0 commit comments

Comments
 (0)