ray/ordo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Shell quote zero-length strings.

Browse source
This commit is contained in:
Ray Miller 2025-01-04 12:13:40 +00:00
parent 61524f3e79
commit 428c6ed4a5
Signed by: ray
GPG key ID: 043F786C4CD681B8
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/ordo/util/shell-quote.scm
View file

@ -27,15 +27,16 @@
(define (needs-escape? s) (define (needs-escape? s)
(irregex-search unsafe-characters s)) (irregex-search unsafe-characters s))
(define (squash-quotes m)
(let ((n (/ (- (irregex-match-end-index m)
(irregex-match-start-index m))
4)))
(list->string (append
'(#\' #\")
(make-list n #\')
'(#\" #\')))))
(define (escape s) (define (escape s)
(define (squash-quotes m)
(let ((n (/ (- (irregex-match-end-index m)
(irregex-match-start-index m))
4)))
(list->string (append
'(#\' #\")
(make-list n #\')
'(#\" #\')))))
(chain s (chain s
;; ' -> '\'' ;; ' -> '\''
(irregex-replace/all (irregex "'") _ "'\\''") (irregex-replace/all (irregex "'") _ "'\\''")
@ -50,4 +51,7 @@
(define (shell-quote-string s) (define (shell-quote-string s)
"Quote strings for passing through the shell" "Quote strings for passing through the shell"
(if (needs-escape? s) (escape s) s)) (cond
((zero? (string-length s)) "''")
((needs-escape? s) (escape s))
(else s)))