Skip to content

Ticket #4678: usqfs parser ignored first 4 lines of the file listing #4679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zyv merged 1 commit into from
Mar 29, 2025
Merged

Ticket #4678: usqfs parser ignored first 4 lines of the file listing #4679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/vfs/extfs/helpers/usqfs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Squash file system
#
# tested to comply with unsquashfs version 4.2 (2011/02/28)'s output
# tested to comply with the output of unsquashfs version 4.6.1 (2023/03/25)

SQUASHFS="${MC_TEST_EXTFS_LIST_CMD:-unsquashfs}"
AWK="@AWK@"
Expand All @@ -13,8 +13,6 @@ mcsqfs_list ()
{
$SQUASHFS -d "" -lls "$1" | $AWK '
{
if (NR < 5)
next
split($2, a, "/")
file_type=substr($1,1,1)
file_size=file_type == "c" || file_type == "b" ? 0 : $3
Expand Down
4 changes: 4 additions & 0 deletions tests/src/vfs/extfs/helpers-list/data/usqfs.output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
drwxr-xr-x 1 235 2024-09-23 14:34:00
drwxr-xr-x 1 778 2024-09-23 14:34:00 /bin
lrwxrwxrwx 1 7 2024-09-23 14:34:00 /bin/ash -> busybox
-rwxr-xr-x 1 205 2024-09-23 14:34:00 /bin/board_detect
-rwxr-xr-x 1 327717 2024-09-23 14:34:00 /bin/busybox
lrwxrwxrwx 1 7 2024-09-23 14:34:00 /bin/cat -> busybox
lrwxrwxrwx 1 7 2024-09-23 14:34:00 /bin/chgrp -> busybox
Expand Down
Loading