From 3d9148cf2a7c0564164aca2a19d8441ab2cbcf30 Mon Sep 17 00:00:00 2001
From: Brian Becker <brian@dyalog.com>
Date: Mon, 29 Nov 2021 12:30:13 -0500
Subject: [PATCH] AIX fixes

---
 Source/isolate/APLProcess.dyalog | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/Source/isolate/APLProcess.dyalog b/Source/isolate/APLProcess.dyalog
index 56af3ae..18fdd45 100644
--- a/Source/isolate/APLProcess.dyalog
+++ b/Source/isolate/APLProcess.dyalog
@@ -6,7 +6,7 @@
 
     ∇ r←Version
       :Access Public Shared
-      r←'APLProcess' '2.2' '15 June 2021'
+      r←'APLProcess' '2.2.1' '29 November 2021'
     ∇
 
     :Field Public Args←''
@@ -34,6 +34,11 @@
       r←'Mac'≡Platform
     ∇
 
+    ∇ r←IsAIX
+      :Access public shared
+      r←'AIX'≡Platform
+    ∇
+
     ∇ r←Platform
       :Access public shared
       r←3↑⊃#.⎕WG'APLVersion'
@@ -127,7 +132,7 @@
               Proc←SshProc host port keyfile cmd
           :Else
               z←⍕GetCurrentProcessId
-              output←(1+×≢OUT_FILE)⊃'/dev/null'OUT_FILE
+              output←(1+×≢OutFile)⊃'/dev/null'OutFile
               cmd,←'{ ',args,' ',Exe,' +s -q ',ws,' -c APLppid=',z,' </dev/null >',output,' 2>&1 & } ; echo $!'
               pid←_SH cmd
               Proc.Id←pid
@@ -447,18 +452,27 @@
 
     ∇ r←UNIXGetShortCmd pid;cmd
       ⍝ Retrieve sort form of cmd used to start process <pid>
-      cmd←(1+IsMac)⊃'cmd' 'command'
-      cmd←'ps -o ',cmd,' -p ',(⍕pid),' 2>/dev/null ; exit 0'
+      cmd←⊃(IsMac,IsAIX,1)/'comm' 'command' 'cmd'
+      cmd←'-o ',cmd,' -p ',⍕pid
       :If {2::0 ⋄ IsSsh}'' ⍝ instance?
           ∘∘∘
       :Else
-          r←⊃1↓⎕SH cmd
+          :Trap 11
+              r←⊃_PS cmd
+          :Else
+              r←''
+          :EndTrap
       :EndIf
     ∇
 
     ∇ r←_PS cmd;ps
-      ps←'ps ',⍨('AIX'≡3↑⊃'.'⎕WG'APLVersion')/'/usr/sysv/bin/'    ⍝ Must use this ps on AIX
-      r←1↓⎕SH ps,cmd,' 2>/dev/null; exit 0'                  ⍝ Remove header line
+      ps←'ps ',⍨IsAIX/'/usr/sysv/bin/'    ⍝ Must use this ps on AIX
+      :Trap 0
+          r←1↓⎕SH ps,cmd,' 2>ps.log; exit 0'                  ⍝ Remove header line
+      :Else
+          (⊂⎕JSON⍠'Compact' 0⊢⎕DMX)⎕NPUT'ps.log' 2
+          ⎕DMX.Message ⎕SIGNAL ⎕DMX.EN
+      :EndTrap
     ∇
 
     ∇ r←{quietly}_SH cmd