Made #xspawn:env: on PTerm use â��libttyâ�� if available (added to th…

…e VM in pharo-project/pharo-vm#742).
lxsang · Apr 19, 2024 · 5d9e9c0 · 5d9e9c0
1 parent c139ccf
commit 5d9e9c0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/PTerm-Core/LibPTerm.class.st b/PTerm-Core/LibPTerm.class.st
@@ -166,7 +166,7 @@ LibPTerm >> kill: pid signal: sig [
 
 { #category : #'accessing platform' }
 LibPTerm >> macModuleName [ 
-	^ self moduleName
+	^ 'libtty.dylib'
 ]
 
 { #category : #accessing }
@@ -182,11 +182,6 @@ LibPTerm >> master [
 
 ]
 
-{ #category : #'accessing platform' }
-LibPTerm >> moduleName [
-	^ (FileLocator localDirectory absolutePath / 'libpterm.flib') asFileReference pathString
-]
-
 { #category : #lib }
 LibPTerm >> open: name mode: flag [
 	^ self ffiCall: #(int open(char* name, int flag)) module: LibC
@@ -252,9 +247,15 @@ LibPTerm >> stringArrayOf: anArray [
 	^ xarray 
 ]
 
+{ #category : #lib }
+LibPTerm >> ttySpawn: fdm path: path argv: argv envs: envp [
+
+	^ self ffiCall: #(int tty_spawn(int fdm, const char* path, void* argv, void* envp))
+]
+
 { #category : #'accessing platform' }
 LibPTerm >> unixModuleName [
-	^ self moduleName
+	^ 'libtty.so'
 ]
 
 { #category : #lib }

diff --git a/PTerm-Core/PTerm.class.st b/PTerm-Core/PTerm.class.st
@@ -201,7 +201,9 @@ PTerm >> xspawn: argv env:envs [
 	xarray ifNotNil: [ xarray := xarray getHandle ].
 	earray ifNotNil: [ earray := earray getHandle ] ifNil: [Smalltalk os environment environ getHandle].
 	master := self lib master.
-	self spawn: (argv first) args: xarray   env: earray.
+	[ pid := self lib ttySpawn: master path: argv first argv: xarray envs: earray ]
+		on: Error do: [ :err |
+			self spawn: argv first args: xarray env: earray ].
 	active := true.
 	Transcript show: 'Command run on process: ', pid asString; cr.
 ]