diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-17 01:17:17 +0300 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-11-17 13:44:02 +0100 |
| commit | 13a9d141b5933f81f4074dd4dc2ab98509df6518 (patch) | |
| tree | bb231d8ecdf2dfcb24c286d98007729e6312c2bb | |
| parent | 41b679f73e2001cd2840dd1256911e0b79bacaf8 (diff) | |
tdf#145711: filename may be 1-character, and must not contain path separator
Surfaced after 6ea7ca45782a7e1b46e18e994534ec0a7c71951b
Change-Id: I4975f51a7a0ca73eccfd17338abc122254b57113
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125338
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit f007f32958a7c875db6cb2e79c09ab0965477a2a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125347
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | solenv/bin/modules/installer/pathanalyzer.pm | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/pre2par/pathanalyzer.pm | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm index 7f3f68a4edb2..312042acb1a0 100644 --- a/solenv/bin/modules/installer/pathanalyzer.pm +++ b/solenv/bin/modules/installer/pathanalyzer.pm @@ -47,7 +47,7 @@ sub make_absolute_filename_to_relative_filename if ( $installer::globals::isunix ) { - if ( $$longfilenameref =~ /^.*\/(\S.+\S?)/ ) + if ( $$longfilenameref =~ /^.*\/(?=\S)([^\/]+)(?<=\S)/ ) { $$longfilenameref = $1; } @@ -56,7 +56,7 @@ sub make_absolute_filename_to_relative_filename if ( $installer::globals::iswin ) { # Either '/' or '\'. It would be possible to use $installer::globals::separator. - if ( $$longfilenameref =~ /^.*[\/\\](\S.+\S?)/ ) + if ( $$longfilenameref =~ /^.*[\/\\](?=\S)([^\/\\]+)(?<=\S)/ ) { $$longfilenameref = $1; } diff --git a/solenv/bin/modules/pre2par/pathanalyzer.pm b/solenv/bin/modules/pre2par/pathanalyzer.pm index 0aefcd1b43c8..4d2eb31ae073 100644 --- a/solenv/bin/modules/pre2par/pathanalyzer.pm +++ b/solenv/bin/modules/pre2par/pathanalyzer.pm @@ -48,7 +48,7 @@ sub make_absolute_filename_to_relative_filename if ( $pre2par::globals::isunix ) { - if ( $$longfilenameref =~ /^.*\/(\S.+\S?)/ ) + if ( $$longfilenameref =~ /^.*\/(?=\S)([^\/]+)(?<=\S)/ ) { $$longfilenameref = $1; } @@ -56,7 +56,8 @@ sub make_absolute_filename_to_relative_filename if ( $pre2par::globals::iswin ) { - if ( $$longfilenameref =~ /^.*\\(\S.+\S?)/ ) + # Either '/' or '\'. + if ( $$longfilenameref =~ /^.*[\/\\](?=\S)([^\/\\]+)(?<=\S)/ ) { $$longfilenameref = $1; } |