X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-install%2Finstaller.lisp;h=3acb93a1c77736c1534232f2c7fa3f8e5fd49224;hb=bc19622c8c9b6af2635da30ed9c88665012d3361;hp=c85e947e6e1e4fb87db6405dc6b22d0ac46b951a;hpb=531b03cfcbc4071c5283309f05d9186e051e5513;p=sbcl.git diff --git a/contrib/asdf-install/installer.lisp b/contrib/asdf-install/installer.lisp index c85e947..3acb93a 100644 --- a/contrib/asdf-install/installer.lisp +++ b/contrib/asdf-install/installer.lisp @@ -109,7 +109,7 @@ (socket-connect s (car (host-ent-addresses (get-host-by-name (url-host (or *proxy* url))))) (url-port (or *proxy* url))) - (let ((stream (socket-make-stream s :input t :output t :buffering :full))) + (let ((stream (socket-make-stream s :input t :output t :buffering :full :external-format :iso-8859-1))) ;; we are exceedingly unportable about proper line-endings here. ;; Anyone wishing to run this under non-SBCL should take especial care (format stream "GET ~A HTTP/1.0~%Host: ~A~%Cookie: CCLAN-SITE=~A~%~%" @@ -150,11 +150,11 @@ (format t "Downloading ~A bytes from ~A ..." (if length length "some unknown number of") url) (force-output) - (with-open-file (o file-name :direction :output) + (with-open-file (o file-name :direction :output :external-format :iso-8859-1) (if length (let ((buf (make-array length :element-type - (stream-element-type stream) ))) + (stream-element-type stream)))) (read-sequence buf stream) (write-sequence buf o)) (sb-executable:copy-stream stream o)))) @@ -249,7 +249,8 @@ (let* ((tar (with-output-to-string (o) (or - (sb-ext:run-program "tar" + (sb-ext:run-program #-darwin "tar" + #+darwin "gnutar" (list "-C" (namestring source) "-xzvf" (namestring packagename)) :output o