ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts: container: Fix 'exec' command line parsing.

Browse source 
* guix/scripts/container/exec.scm (partition-args): Reimplement such
  that all args up to and including the PID are returned as the first of
  the two values.
This commit is contained in:
David Thompson 2015-11-03 18:05:43 -05:00
parent bab020d7ca
commit d431b23240
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
guix/scripts/container/exec.scm
View file

@ -50,10 +50,18 @@ (define (show-help)
(define (partition-args args)
"Split ARGS into two lists; one containing the arguments for this program,
and the other containing arguments for the command to be executed."
(break (lambda (arg)
;; Split after the pid argument.
(not (false-if-exception (string->number arg))))
args))
(define (number-string? str)
(false-if-exception (string->number str)))
(let loop ((a '())
(b args))
(match b
(()
(values (reverse a) '()))
(((? number-string? head) . tail)
(values (reverse (cons head a)) tail))
((head . tail)
(loop (cons head a) tail)))))
(define (guix-container-exec . args)
(define (handle-argument arg result)