-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Thanks, applied as 1.0.11.1, with some tweaks.
On 25.10.2007, at 21:14, Michael Weber wrote:
> (defvar *proxy* (posix-getenv "http_proxy"))
> (defvar *cclan-mirror*
> - (or (posix-getenv "CCLAN_MIRROR")
> - "http://ftp.linux.org.uk/pub/lisp/cclan/"))
> + (let ((mirror (posix-getenv "CCLAN_MIRROR")))
> + (or (and mirror
> + (not (equal mirror "")))
> + "http://ftp.linux.org.uk/pub/lisp/cclan/")))
We don't want the value of mirror to be T; fixed in commit.
> diff --git a/contrib/sb-grovel/def-to-lisp.lisp b/contrib/sb-grovel/=20=
> def-to-lisp.lisp
> index 30265a0..b4176ca 100644
> --- a/contrib/sb-grovel/def-to-lisp.lisp
> +++ b/contrib/sb-grovel/def-to-lisp.lisp
> @@ -187,11 +187,13 @@ code:
> (funcall (intern "C-CONSTANTS-EXTRACT" (find-package "SB-=20
> GROVEL"))
> filename tmp-c-source (constants-package component))
> (unless (do-not-grovel component)
> - (let* ((cc (or (sb-ext:posix-getenv "CC")
> - ;; It might be nice to include a CONTINUE or
> - ;; USE-VALUE restart here, but ASDF seems to =20
> insist
> - ;; on handling the errors itself.
> - (error "The CC environment variable has not =20
> been set in SB-GROVEL. Since this variable should always be set =20
> during the SBCL build process, this might indicate an SBCL with a =20
> broken contrib installation.")))
> + (let* ((cc (let ((cc (sb-ext:posix-getenv "CC")))
> + (if (and cc (not (equal cc "")))
> + cc
> + ;; It might be nice to include a CONTINUE or
> + ;; USE-VALUE restart here, but ASDF seems =20
> to insist
> + ;; on handling the errors itself.
> + (error "The CC environment variable has not =20=
> been set in SB-GROVEL. Since this variable should always be set =20
> during the SBCL build process, this might indicate an SBCL with a =20
> broken contrib installation."))))
I decided it was slightly less fugly to call posix-getenv twice here, =20=
once for the comparison and once for the value.
> diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp
> index 53ff874..74d53ec 100644
> --- a/src/code/filesys.lisp
> +++ b/src/code/filesys.lisp
> @@ -562,6 +562,8 @@ otherwise. An error of type FILE-ERROR is =20
> signaled if pathname is wild."
> t)
> =0C
> (defun ensure-trailing-slash (string)
> + (when (equal string "")
> + (setq string "."))
> (let ((last-char (char string (1- (length string)))))
> (if (or (eql last-char #\/)
> #!+win32
ensure-trailing-slash is only called from two places, both of them =20
already check for string emptiness. Please holler if I overlooked a =20
reason for this hunk...
> diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
> index 5db1453..4847b78 100644
> --- a/src/runtime/runtime.c
> +++ b/src/runtime/runtime.c
[...]
> @@ -362,7 +362,9 @@ main(int argc, char *argv[], char *envp[])
> }
>
> /* Make sure that SBCL_HOME is set, unless loading an embedded =20=
> core. */
> - if (!getenv("SBCL_HOME") && embedded_core_offset =3D=3D 0) {
> + const char *sbcl_home =3D getenv("SBCL_HOME");
> + if (!(sbcl_home && *sbcl_home)
> + && embedded_core_offset =3D=3D 0) {
> char *envstring, *copied_core, *dir;
> char *stem =3D "SBCL_HOME=3D";
> copied_core =3D copied_string(core);
Moved the variable definition upwards to the start of the function; =20
you can call me old-fashioned now. :-)
Cheers,
Rudi
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
iD8DBQFHIW6S765FppppCGcRAsUgAKDAzJ25J6/a+zgIgjZmt4uuhpO3+gCfVaLo
7QUMZk/p5Hx44gLzzEonY0U=3D
=3Dr4Yi
-----END PGP SIGNATURE-----
|