Added support for Toybox to remote process picker (#11175)

* Added separate remote process command for ToyBox
microsoft · Jul 26, 2023 · a7870fc · rahiakil · Aug 16, 2023 · bobbrow
1 parent d48fd43
commit a7870fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Extension/src/Debugger/attachToProcess.ts b/Extension/src/Debugger/attachToProcess.ts
@@ -132,8 +132,9 @@ export class RemoteAttachPicker {
  shPrefix = `/bin/`;
  }
 
- return `${outerQuote}${shPrefix}sh -c ${innerQuote}uname && if [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Linux${escapedQuote} ] ; ` +
- `then ${PsProcessParser.psLinuxCommand} ; elif [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Darwin${escapedQuote} ] ; ` +
+ return `${outerQuote}${shPrefix}sh -c ${innerQuote}uname && if [ ${parameterBegin}uname -o${parameterEnd} = ${escapedQuote}Toybox${escapedQuote} ] ; ` +
+ `then ${PsProcessParser.psToyboxCommand} ; elif [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Darwin${escapedQuote} ] ; ` +
+ `then ${PsProcessParser.psLinuxCommand} ; elif [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Linux${escapedQuote} ] ; ` +
  `then ${PsProcessParser.psDarwinCommand}; fi${innerQuote}${outerQuote}`;
  }
 

diff --git a/Extension/src/Debugger/nativeAttach.ts b/Extension/src/Debugger/nativeAttach.ts
@@ -119,6 +119,7 @@ export class PsProcessParser {
  // Since 'args' contains the full path to the executable, even if truncated, searching will work as desired.
  public static get psLinuxCommand(): string { return `ps axww -o pid=,comm=${PsProcessParser.commColumnTitle},args=`; }
  public static get psDarwinCommand(): string { return `ps axww -o pid=,comm=${PsProcessParser.commColumnTitle},args= -c`; }
+ public static get psToyboxCommand(): string { return `ps -A -o pid=,comm=${PsProcessParser.commColumnTitle},args=`; }
 
  // Only public for tests.
  public static ParseProcessFromPs(processes: string): Process[] {