github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-19 18:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(macos): clean warnings and harden gateway/talk config parsing

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-25 00:27:31 +00:00
parent 9cd50c51b0
commit ce1dbeb986
15 changed files with 331 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/macos/Sources/OpenClaw/ExecSystemRunCommandValidator.swift
View File

@@ -77,11 +77,10 @@ enum ExecSystemRunCommandValidator {
let shellWrapperPositionalArgv = self.hasTrailingPositionalArgvAfterInlineCommand(command)
let mustBindDisplayToFullArgv = envManipulationBeforeShellWrapper || shellWrapperPositionalArgv
let inferred: String
if let shellCommand, !mustBindDisplayToFullArgv {
inferred = shellCommand
let inferred: String = if let shellCommand, !mustBindDisplayToFullArgv {
shellCommand
} else {
inferred = ExecCommandFormatter.displayString(for: command)
ExecCommandFormatter.displayString(for: command)
}
if let raw = normalizedRaw, raw != inferred {
@@ -189,7 +188,7 @@ enum ExecSystemRunCommandValidator {
}
var appletIndex = 1
if appletIndex < argv.count && argv[appletIndex].trimmingCharacters(in: .whitespacesAndNewlines) == "--" {
if appletIndex < argv.count, argv[appletIndex].trimmingCharacters(in: .whitespacesAndNewlines) == "--" {
appletIndex += 1
}
guard appletIndex < argv.count else {
@@ -255,14 +254,13 @@ enum ExecSystemRunCommandValidator {
return false
}
let inlineCommandIndex: Int?
if wrapper == "powershell" || wrapper == "pwsh" {
inlineCommandIndex = self.resolveInlineCommandTokenIndex(
let inlineCommandIndex: Int? = if wrapper == "powershell" || wrapper == "pwsh" {
self.resolveInlineCommandTokenIndex(
wrapperArgv,
flags: self.powershellInlineCommandFlags,
allowCombinedC: false)
} else {
inlineCommandIndex = self.resolveInlineCommandTokenIndex(
self.resolveInlineCommandTokenIndex(
wrapperArgv,
flags: self.posixInlineCommandFlags,
allowCombinedC: true)