Changeset 11813

Timestamp:

05/02/09 19:36:44 (14 years ago)

Author:

ehuelsmann

Message:

Fix building in a path with spaces.

Found by: Mark Tarver
Fixes: ​https://sourceforge.net/tracker/?func=detail&atid=475785&aid=2784411&group_id=55057

Location:

trunk/abcl

Files:

• build-abcl.lisp (modified) (3 diffs)
• src/org/armedbear/lisp/Site.java (modified) (2 diffs)

trunk/abcl/build-abcl.lisp

@@ -14 +14 @@
 (in-package #:build-abcl)
 
+(defun comp (string char)
+  "Chops off the character at the end of `string' if it matches char"
+  (let ((len (length string)))
+    (if (eql char (char string (1- len)))
+        (subseq string 0 (1- len))
+        string)))
+
 (defun safe-namestring (pathname)
-  (let ((string (namestring pathname)))
+  (let* ((string (namestring pathname))
+         (len (length string)))
     (when (position #\space string)
-      (setf string (concatenate 'string "\"" string "\"")))
+      (setf string (concatenate 'string "\""
+                                (comp string #\\)
+                                "\"")))
     string))
 
@@ -310 +320 @@
                                     (princ *java-compiler-command-line-prefix* s)
                                     (princ " -d " s)
-                                    (princ *build-root* s)
+                                    (princ (safe-namestring *build-root*) s)
                                     (princ #\Space s)
                                     (dolist (source-file source-files)
                                       (princ
-                                       (if (equal (pathname-directory source-file) dir)
-                                           (file-namestring source-file)
-                                           (namestring source-file))
+                                       (safe-namestring
+                                        (if (equal (pathname-directory source-file) dir)
+                                            (file-namestring source-file)
+                                            (namestring source-file)))
                                        s)
                                       (princ #\space s))))
@@ -324 +335 @@
                   (ensure-directories-exist *build-root*)
                   (dolist (source-file source-files t)
-                    (unless (java-compile-file source-file)
+                    (unless (java-compile-file (safe-namestring source-file))
                       (format t "Build failed.~%")
                       (return nil)))))))))

trunk/abcl/src/org/armedbear/lisp/Site.java

@@ -36 +36 @@
 import java.io.File;
 import java.net.URL;
+import java.net.URLDecoder;
 
 public final class Site extends Lisp
@@ -48 +49 @@
             if (protocol != null && protocol.equals("file")) {
                 String path = url.getPath();
+                try {
+                    path = URLDecoder.decode(path, "UTF-8");
+                }
+                catch (java.io.UnsupportedEncodingException uee) {
+                    // can't happen: Java implementations are required to
+                    // support UTF-8
+                }
                 int index = path.lastIndexOf('/');
                 if (index >= 0) {