colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sane-sandboxed: better handle "--"

Browse Source
This commit is contained in:
Colin
2024-01-24 04:59:24 +00:00
parent bfaf098c31
commit 3758044e7b
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/programs/sane-sandboxed
View File

@@ -47,10 +47,19 @@ parseArgs() {
shift shift
case "$_arg" in case "$_arg" in
(--) (--)
# rest of args are for the CLI # rest of args are for the CLI, and not for us.
# XXX: this interacts weird with other CLIs that use `--` to signal. # consider two cases:
# e.g. `mpv -- my_file.mp3` gets transformed into `.mpv-sandboxed my_file.mp3` (no `--`) # - sane-sandboxed --sane-sandbox-flag1 -- /nix/store/.../mpv --arg0 arg1
# possibly turning a file-name into an option that the wrapped program may parse # - sane-sandboxed /nix/store/.../mpv --arg0 -- arg1
# in the first case, we swallow the -- and treat the rest as CLI args.
# in the second case, the -- is *probably* intended for the application.
# but it could be meant for us. do the most conservative thing here
# and stop our own parsing, and also forward the -- to the wrapped binary.
#
# this mode of argument parsing is clearly ambiguous, it's probably worth reducing our own API in the future
if [ -n "$parseArgsExtra" ]; then
parseArgsExtra+=("--")
fi
parseArgsExtra+=("$@") parseArgsExtra+=("$@")
break break
;; ;;