mirrors/aports
3
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-05-08 18:24:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mc/main: add patch to fix failure exposed on s390x

Browse source
This commit is contained in:
Yury V. Zaytsev 2025-01-28 19:21:41 +01:00 • committed by Natanael Copa
parent d5bcd2ec58
commit 0907fdde44
2 changed files with 27 additions and 1 deletions

4
main/mc/APKBUILD
View file

@ -11,7 +11,8 @@ subpackages="$pkgname-doc $pkgname-lang"
makedepends="e2fsprogs-dev glib-dev libssh2-dev slang-dev perl gpm-dev"
checkdepends="check-dev"
source="https://www.midnight-commander.org/downloads/mc-$pkgver.tar.xz
alpine_syntax.patch"
alpine_syntax.patch
ticket_4642_parse_ls_vga_fix.patch"
build() {
./configure \
@ -64,4 +65,5 @@ lang() {
sha512sums="
3eb857af2fa689e9458aeef6d3b236fb92684e05c0e3e78e7e5a5fa5dba6431cae39bec51bc84598b0bb60579cb0a0679dcdc6e9f7d88ca85dc37ace251c8632 mc-4.8.33.tar.xz
47aa001e8c20a24631617d665fd0d81b269ebad96696c4bd70c7040bbca713868e02fe53dfaee9a775a57f35a0e7c9e44ce299037379e249ad27354a78d905c3 alpine_syntax.patch
d4099edf2815546eae35fd971d8b20039e47185622c85701397a62126220e773dd6ec01d24caf40743b180bfa86133d513dcd48591b25eba881519ff71bf5a49 ticket_4642_parse_ls_vga_fix.patch
"

24
main/mc/ticket_4642_parse_ls_vga_fix.patch Normal file
View file

@ -0,0 +1,24 @@
diff --git a/lib/vfs/parse_ls_vga.c b/lib/vfs/parse_ls_vga.c
index dd91b881b..a1666e0ae 100644
--- a/lib/vfs/parse_ls_vga.c
+++ b/lib/vfs/parse_ls_vga.c
@@ -855,13 +855,12 @@ vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linknam
if (t != NULL)
{
- size_t p2;
+ size_t p2 = strlen (t);
- p2 = strlen (t);
- if (--p2 > 0 && (t[p2] == '\r' || t[p2] == '\n'))
- t[p2] = '\0';
- if (--p2 > 0 && (t[p2] == '\r' || t[p2] == '\n'))
- t[p2] = '\0';
+ if (p2 > 0 && (t[p2 - 1] == '\r' || t[p2 - 1] == '\n'))
+ t[--p2] = '\0';
+ if (p2 > 0 && (t[p2 - 1] == '\r' || t[p2 - 1] == '\n'))
+ t[--p2] = '\0';
}
g_free (p_copy);