When copying two symlinks using "Follow links" the output is all wrong

[gv]

When copying two symlinks (to two directories containing multiple (large) files and directories) using "Follow links" the output is all wrong. See attached files.

The directory structure is something like this:

$ ls -RF
.:
1  2
$ ls -RF
.:
01/  02/

./01:
a/  b/

./01/a:
1  2  3@  e/  s/

./01/a/e:
1  2  3  4  5  6  7  8  9

./01/a/s:
1

./01/b:
1  2  3  4  5@  a/

./01/b/a:

./02:
1  2

$ LC_MESSAGES=C mc -V
GNU Midnight Commander 4.8.24
Built with GLib 2.56.4
Using the S-Lang library with terminfo database
With builtin Editor and Aspell support
With optional subshell support
With support for background operations
With mouse support on xterm and Linux console
With internationalization support
With multiple codepages support
Virtual File Systems: cpiofs, tarfs, sfs, extfs, ftpfs, fish
Data types: char: 8; int: 32; long: 64; void *: 64; size_t: 64; off_t: 64;

$LC_MESSAGES=C mc -F
Home directory: /home/xxx
Profile root directory: /home/xxx

[System data]
    Config directory: /etc/mc/
    Data directory:   /usr/share/mc/
    File extension handlers: /usr/libexec/mc/ext.d/
    VFS plugins and scripts: /usr/libexec/mc/
        extfs.d:        /usr/libexec/mc/extfs.d/
        fish:           /usr/libexec/mc/fish/

[User data]
    Config directory: /home/xxx/.config/mc/
    Data directory:   /home/xxx/.local/share/mc/
        skins:          /home/xxx/.local/share/mc/skins/
        extfs.d:        /home/xxx/.local/share/mc/extfs.d/
        fish:           /home/xxx/.local/share/mc/fish/
        mcedit macros:  /home/xxx/.local/share/mc/mc.macros
        mcedit external macros: /home/xxx/.local/share/mc/mcedit/macros.d/macro.*
    Cache directory:  /home/xxx/.cache/mc/

[gv]

During the copy operation the screen/gui change from mc-1.png to mc-2.png and back.
The symlinks are for the directories 01 and 02.

[andrew_b]

Could you please create a small tar file with such directory contents? Or just show the output of ls -lR.

[gv]

Just replace at least one file in each directory with a large iso file.
Thank you.

[andrew_b]

Branch: 4101_copy_follow_links
Initial changeset:d288528e4ed59217a650318c9cb0c5a66072ae18

Please test.

[gv]

Applied d288528e4ed59217a650318c9cb0c5a66072ae18 and 9e7d34578a8c3f4dd51ead04f7b63ca13bfbc33f.
Your changes does not fix the issue. See mc-3.png

Thank you.

[andrew_b]

Replying to gv:

Applied d288528e4ed59217a650318c9cb0c5a66072ae18 and 9e7d34578a8c3f4dd51ead04f7b63ca13bfbc33f.

Are you sure you're running mc with these patches?

[gv]

Replying to andrew_b:

Replying to gv:

Applied d288528e4ed59217a650318c9cb0c5a66072ae18 and 9e7d34578a8c3f4dd51ead04f7b63ca13bfbc33f.

Are you sure you're running mc with these patches?

Yes, 100%.

[andrew_b]

Replying to gv:

Yes, 100%.

I'm unable to reproduce this.

[gv]

Replying to andrew_b:

I'm unable to reproduce this.

rm -rf dir1 dir2

mkdir -p dir1/01 dir2/{02/a,02/b,03,04}

dd if=/dev/zero of=dir1/01/file.dat bs=1M count=350
dd if=/dev/zero of=dir2/02/a/file.dat bs=1M count=15360
dd if=/dev/zero of=dir2/02/b/file.dat bs=1M count=3072
dd if=/dev/zero of=dir2/03/file.dat bs=1M count=2048
dd if=/dev/zero of=dir2/04/file.dat bs=1M count=8132

ln -s ../dir2/02 dir1/02
ln -s ../dir2/03 dir1/03
ln -s ../dir2/04 dir1/04

sync

Now copy dir1 as dir3 and make sure you check "Follow links".

[andrew_b]

Works fine for me. All progress values are correct.

[gv]

Replying to andrew_b:

Works fine for me. All progress values are correct.

Did you try on 4.8.25 or you are working on a branch? Maybe not all your changes are in 4.8.25.

[gv]

Replying to andrew_b:

Works fine for me. All progress values are correct.

Now is working for me, too. Same binary (build) that has not been working all day.
Strange...

I will test again tomorrow maybe the behavior will change again.

Anyway, thank you.

[gv]

When I try to copy dir1 as dir3, your fix works every time.

If I manually create dir3 directory, select all directories in dir1 using Ins key, hit F5, select dir3 as target directory, check "Follow links" and press Enter the fix is not working.

[andrew_b]

Thanks for testing!

Replying to gv:

If I manually create dir3 directory, select all directories in dir1 using Ins key, hit F5, select dir3 as target directory, check "Follow links" and press Enter the fix is not working.

Confirmed. This test case fails.

I added two commits:

330335d448f9a1243434229119cd25a2f3549a4c
cb22b1263af845a80c003d551eb69a288037f070

Please test.

[gv]

Replying to andrew_b:

Confirmed. This test case fails.

I added two commits:

330335d448f9a1243434229119cd25a2f3549a4c
cb22b1263af845a80c003d551eb69a288037f070

Please test.

The issue seems to be fixed. Thank you!

[andrew_b]

Merged to master: [348011025df7d6af515f82d96735189a407ddb4d].

git log --pretty=oneline 72740285d..348011025

[andrew_b]

Ticket #2286 has been marked as a duplicate of this ticket.