(address . guix-patches@gnu.org)
20200224160132.21037-1-mbakke@fastmail.com
* gnu/packages/ld-wrapper.in (expand-arguments): Add TOKENIZE procedure, and
use that to parse the response file.
---
gnu/packages/ld-wrapper.in | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
Guix,
Currently the ld-wrapper will fail inscrutably if a response file
contains double quotes. This patch fixes that, and also preserves
whitespaces between quotes.
Toggle diff (55 lines)
diff --git a/gnu/packages/ld-wrapper.in b/gnu/packages/ld-wrapper.in
index 16780c58f6..5d5756f6a3 100644
--- a/gnu/packages/ld-wrapper.in
+++ b/gnu/packages/ld-wrapper.in
@@ -16,6 +16,7 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line))
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,7 +36,7 @@ exec @GUILE@ -c "(load-compiled \"@SELF@.go\") (apply $main (cdr (command-line))
(define-module (gnu build-support ld-wrapper)
#:use-module (srfi srfi-1)
#:use-module (ice-9 match)
- #:autoload (ice-9 rdelim) (read-string)
+ #:autoload (ice-9 rdelim) (read-delimited)
#:export (ld-wrapper))
;;; Commentary:
@@ -239,13 +240,28 @@ library outside of ~a: ~s~%"
;; Expand ARGS such that "response file" arguments, such as "@args.txt", are
;; expanded (info "(gcc) Overall Options").
(define (response-file-arguments file)
+ (define (tokenize port)
+ ;; Return a list of all strings found in PORT. Quote characters are removed,
+ ;; but whitespaces within quoted strings are preserved.
+ (let loop ((words '()))
+ (let* ((word (read-delimited " '\"" port 'split))
+ (token (car word))
+ (delim (cdr word)))
+ (if (eof-object? delim)
+ (reverse words)
+ (case delim
+ ((#\") (loop (cons (read-delimited "\"" port) words)))
+ ((#\') (loop (cons (read-delimited "'" port) words)))
+ ((#\ ) (if (> 0 (string-length token))
+ (loop (cons token words))
+ (loop words)))
+ (else (loop words)))))))
+
(when %debug?
(format (current-error-port)
"ld-wrapper: attempting to read arguments from '~a'~%" file))
- ;; FIXME: Options can contain whitespace if they are protected by single
- ;; or double quotes; this is not implemented here.
- (string-tokenize (call-with-input-file file read-string)))
+ (call-with-input-file file tokenize))
(define result
(fold-right (lambda (arg result)
--
2.25.0