michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix to merge proc-lib.pl with master

Browse Source
This commit is contained in:
iliajie
2022-11-12 23:01:13 +02:00
parent 05475f051c
commit 37453226da
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proc/proc-lib.pl
View File

@@ -295,12 +295,15 @@ if (!$@) {
open(STDERR, ">&".fileno($ttyfh));
close($ttyfh); # Already dup'd
if ($binary) {
exec $cmd $binary;
my @args = &split_quoted_string($cmd);
my $args0 = $args[0];
$args[0] = $binary;
exec { $args0 } @args;
}
else {
exec($cmd);
}
print "Exec failed : $!\n";
print STDERR "Exec failed : $!\n";
exit 1;
}
$ptyfh->close_slave();
@@ -350,12 +353,15 @@ else {
open(STDERR, ">&STDOUT");
close($ptyfh);
if ($binary) {
exec $cmd $binary;
my @args = &split_quoted_string($cmd);
my $args0 = $args[0];
$args[0] = $binary;
exec { $args0 } @args;
}
else {
exec($cmd);
}
print "Exec failed : $!\n";
print STDERR "Exec failed : $!\n";
exit 1;
}
close($ttyfh);