(mandriva) concat_dir_and_file() + NULL parameter fix

[mc-butler]

Important

This issue was migrated from Trac:

Origin	https://midnight-commander.org/ticket/180
Reporter	metux (@metux)
Keywords	committed-mc-4.6, committed-master

http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/mc/current/SOURCES/mc-concat.patch?view=markup

branch:180_concat_dir_and_file (base mc-4.6)
[54d6ec8]

committed mc-4.6
committed master

Note

Original attachments:

• patch-vfs.patch (raw) by styx (@styx) on Jan 25, 2009 at 21:17 UTC
• 180_concat_dir_and_null.patch (raw) by styx (@styx) on Jan 25, 2009 at 21:21 UTC

[mc-butler]

Changed by styx (@styx) on Jan 25, 2009 at 21:17 UTC

• Attachment patch-vfs.patch (raw) added

[mc-butler]

Changed by styx (@styx) on Jan 25, 2009 at 21:21 UTC

• Attachment 180_concat_dir_and_null.patch (raw) added

sorry, I'm messed up! this one should be

[mc-butler]

Changed by styx (@styx) on Jan 25, 2009 at 21:25 UTC (comment 1)

• Keywords changed from review, mandriva to review, mandriva, vote-styx

just move patch here and make a review

[mc-butler]

Changed by winnie (@winnieXY) on Jan 30, 2009 at 13:18 UTC (comment 2)

• Milestone changed from 4.7 to 4.6.3

[mc-butler]

Changed by guanx (guanx.bac@….com) on Jan 30, 2009 at 22:10 UTC

Replying to metux (#180):

http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/mc/current/SOURCES/mc-concat.patch?view=markup

Here: const char *file = filename;
Why a separate variable for the filename pointer?

And, in the patch, there is this comment:
/* Is this one: *file == PATH_SEP seems to be not fully portable? */
It's also confusing.

[mc-butler]

Changed by metux (@metux) on Jan 31, 2009 at 15:54 UTC (comment 4)

• Description edited
• Status changed from new to accepted
• Owner set to metux

I've reworked the whole function and replaced it by mhl_str_dir_plus_file() in mhl/string.h

[mc-butler]

Changed by slyfox (@trofi) on Jan 31, 2009 at 16:08 UTC (comment 5)

• Keywords changed from review, mandriva, vote-styx to mandriva, vote-styx, vote-slyfox, approved

[mc-butler]

Changed by metux (@metux) on Jan 31, 2009 at 17:21 UTC (comment 6)

• Keywords changed from mandriva, vote-styx, vote-slyfox, approved to committed-mc-4.6, committed-master
• Status changed from accepted to testing
• Resolution set to fixed
• Description edited

[mc-butler]

Changed by winnie (@winnieXY) on Feb 1, 2009 at 10:38 UTC (comment 7)

• Milestone changed from 4.6.3 to 4.6.2
• Status changed from testing to closed

Moving this to 4.6.2 as this is already fixed in 4.6 branch. We need to update NEWS file.

[mc-butler]

Changed by andrew_b (@aborodin) on Feb 1, 2009 at 14:03 UTC (comment 4.8)

• Resolution fixed deleted
• Status changed from closed to reopened

Replying to metux:

I've reworked the whole function and replaced it by mhl_str_dir_plus_file() in mhl/string.h

First:

charsets.o: In function `load_codepages_list':
/home/andrew/work.c/mc/mc.master/src/charsets.c:51: undefined reference to `mhl_str_dir_plus_file'
../vfs/libvfs-mc.a(smbfs.o): In function `smbfs_get_path':
/home/andrew/work.c/mc/mc.master/vfs/smbfs.c:1214: undefined reference to `mhl_str_dir_plus_file'
collect2: ld returned 1 exit status

#include <mhl/string.h> is forgotten in those files.

Second: in mhl_str_dir_plus_file() there are incorrect type of strlen() results: int instead of size_t.

[mc-butler]

Changed by metux (@metux) on Feb 1, 2009 at 19:34 UTC (comment 9)

• Status changed from reopened to accepted

[mc-butler]

Changed by metux (@metux) on Feb 1, 2009 at 19:34 UTC (comment 10)

• Status changed from accepted to testing
• Resolution set to fixed

[mc-butler]

Changed by slyfox (@trofi) on Feb 1, 2009 at 21:12 UTC (comment 11)

charsets.o: In function `load_codepages_list':
/home/andrew/work.c/mc/mc.master/src/charsets.c:51: undefined reference to `mhl_str_dir_plus_file'
../vfs/libvfs-mc.a(smbfs.o): In function `smbfs_get_path':
/home/andrew/work.c/mc/mc.master/vfs/smbfs.c:1214: undefined reference to `mhl_str_dir_plus_file'
collect2: ld returned 1 exit status

Those are fixed and will be available in mc-4.6.2.
Thanks!

Second: in mhl_str_dir_plus_file() there are incorrect type of strlen() results: int instead of size_t.

It is sane cleanup. Will be applied in next (after mc-4.6.2) bugfix.
Thanks again! :]

[mc-butler]

Changed by winnie (@winnieXY) on Feb 1, 2009 at 21:20 UTC (comment 12)

• Status changed from testing to closed

Okay.. I'll close this report.. the type cleanup will be available in the next version of mc (4.6.3 or 4.6.2.1, not sure up to now).

[mc-butler]

Changed by zaytsev (@zyv) on Feb 20, 2025 at 15:47 UTC (comment 13)

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