Don't use nqp::execname on OpenBSD

Fixess one of two parts to #2824
rakudo · Apr 16, 2019 · 194e377 · 194e377
1 parent afc9f84
commit 194e377
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/src/core/Process.pm6 b/src/core/Process.pm6
@@ -16,8 +16,10 @@ Rakudo::Internals.REGISTER-DYNAMIC: '$*EXECUTABLE', {
       // $*VM.properties<perl6.prefix> ~ '/bin/perl6-j'
 #?endif
 #?if moar
-      nqp::execname()
-      || ($*VM.config<prefix> ~ '/bin/'
+      # OpenBSD's security features prevent us from getting the path to our
+      # executable just given our PID by default.
+      (nqp::execname() unless $*VM.osname eq 'openbsd')
+      // ($*VM.config<prefix> ~ '/bin/'
         ~ ($*VM.config<osname> eq 'MSWin32' ?? 'perl6-m.bat' !! 'perl6-m'))
 #?endif
 #?if js

diff --git a/src/main.nqp b/src/main.nqp
@@ -2,14 +2,22 @@ use Perl6::Grammar;
 use Perl6::Actions;
 use Perl6::Compiler;
 
+my $config := nqp::backendconfig();
 # Determine Perl6 and NQP dirs.
-my $sep := nqp::backendconfig()<osname> eq 'MSWin32' ?? '\\' !! '/';
+my $sep := $config<osname> eq 'MSWin32' ?? '\\' !! '/';
 #?if jvm
 my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
 my $exec-dir := nqp::substr($execname, 0, nqp::rindex($execname, $sep));
 #?endif
-#?if !jvm
-my $exec-dir := nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
+#?if moar
+my $exec-dir := $config<osname> eq 'openbsd'
+    ?? $config<prefix> ~ '/bin/perl6-m'
+    !! nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
+#?endif
+#?if js
+my $exec-dir := $config<osname> eq 'openbsd'
+    ?? $config<prefix> ~ '/bin/perl6-js'
+    !! nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep))
 #?endif
 
 

diff --git a/src/perl6-debug.nqp b/src/perl6-debug.nqp
@@ -457,13 +457,21 @@ sub MAIN(*@ARGS) {
     my $comp := Perl6::Debugger.new();
 
     # Determine Perl6 and NQP dirs.
-    my $sep := nqp::backendconfig()<osname> eq 'MSWin32' ?? '\\' !! '/';
+    my $config := nqp::backendconfig();
+    my $sep    := $config<osname> eq 'MSWin32' ?? '\\' !! '/';
 #?if jvm
     my $execname := nqp::atkey(nqp::jvmgetproperties,'perl6.execname');
     my $exec-dir := nqp::substr($execname, 0, nqp::rindex($execname, $sep));
 #?endif
-#?if !jvm
-    my $exec-dir := nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
+#?if moar
+    my $exec-dir := $config<osname> eq 'openbsd'
+        ?? $config<prefix> ~ '/bin/perl6-m'
+        !! nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
+#?endif
+#?if js
+    my $exec-dir := $config<osname> eq 'openbsd'
+        ?? $config<prefix> ~ '/bin/perl6-js'
+        !! nqp::substr(nqp::execname(), 0, nqp::rindex(nqp::execname(), $sep));
 #?endif
     my $perl6-home := $comp.config<static_perl6_home>
         // nqp::getenvhash()<PERL6_HOME>