Skip to content

lib/Rex/Config.pm: slurp file content using IO::File. #1511

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

lib/Rex/Config.pm: slurp file content using IO::File. #1511

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
12 changes: 10 additions & 2 deletions lib/Rex/Config.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,7 +1739,11 @@ sub read_config_file {
$config_file ||= _home_dir() . "/.rex/config.yml";

if ( -f $config_file ) {
my $yaml = eval { local ( @ARGV, $/ ) = ($config_file); <>; };
my $yaml = do {
use IO::File;
my $fh = IO::File->new( $config_file, 'r' );
join '', $fh->getlines();
};
eval { $HOME_CONFIG_YAML = Load($yaml); };

if ($@) {
Expand All @@ -1762,7 +1766,11 @@ sub read_ssh_config_file {
$config_file ||= _home_dir() . '/.ssh/config';

if ( -f $config_file ) {
my @lines = eval { local (@ARGV) = ($config_file); <>; };
my @lines = do {
use IO::File;
my $fh = IO::File->new( $config_file, 'r' );
join '', $fh->getlines();
Copy link
Member

@ferki ferki Oct 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can it be that t/config-ssh.t fails because now all lines of the file is concatenated with join while it was treated as an array of lines before?

};
%SSH_CONFIG_FOR = _parse_ssh_config(@lines);
}
}
Expand Down