Changeset 15398

Timestamp:

May 29, 2012, 12:01:58 PM (12 years ago)

Author:

Gary Byers

Message:

Sequences of one or more backslashes that precede a double-quote
character or whitespace need to be escaped (doubled).

Fixes ticket:858 in the trunk.

Changes made to the trunk are often incorporated in the next release.
We generally assume that people can call REBUILD-CCL for themselves
when there aren't any bootstrapping issues involved (and there aren't
here); we do often provide kernel binaries for Windows since (a) it
can be tricky to install the necessary toolchain and support and (b)
the available Windows toolchains are often broken.

File:

• trunk/source/level-1/linux-files.lisp (modified) (1 diff)

trunk/source/level-1/linux-files.lisp

@@ -1818 +1818 @@
            ((atom strings)     
             (if strings (write-string strings out)))
-        (let* ((string (car strings)))
-          (dotimes (i (length string))
+        (let* ((string (car strings))
+               (n (length string))
+               (quote-backslash 0)
+               (literal-backslash 0))
+          (declare (fixnum n quote-backslash literal-backslash))
+          (dotimes (i n)
             (let* ((c (schar string i)))
               (case c
+                (#\\
+                 (unless (or (> quote-backslash 0)
+                             (> literal-backslash 0))
+                   (do* ((j i (1+ j))
+                         (k 0))
+                        ((= j n) (setq literal-backslash k))
+                     (case (schar string j)
+                       (#\\ (incf k))
+                       ((#\space #\tab #\")
+                        (setq quote-backslash k)
+                        (return))
+                       (t (setq literal-backslash k)
+                          (return)))))
+                 (if (> quote-backslash 0)
+                   (progn
+                     (write-char #\\ out)
+                     (write-char #\\ out)
+                     (decf quote-backslash))
+                   (progn
+                     (write-char #\\ out)
+                     (decf literal-backslash))))
                 ((#\space #\tab)
                  (write-char #\" out)