1.0.42.21: grab-bag of Solaris related fixes

 Patch by Jim Wise, lp#627581.

 * make make-doc.sh work on SunOS (due to old /bin/sh)

 * avoid the struct dirent distrust-length build issue in sb-posix

 * fix an issue in the run-program.ed test

 * add .html to .cvsignore

diff --git a/NEWS b/NEWS
index 4aabc59..0758334 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,8 +15,8 @@ changes relative to sbcl-1.0.42
     correctly. (lp#598374, thanks to Stas Boukarev)
   * bug fix: better availability of names of foreign functions in backtraces
     on Linux. (lp#626962, thanks to Stas Boukarev)
-  * bug fix: scripting fixes for Solaris and FreeBSD. (lp#615497, thanks to
-    Josh Elsasser)
+  * bug fix: scripting and build for Solaris and FreeBSD. (lp#615497,
+    lp#627581, thanks to Josh Elsasser and Jim Wise)
   * bug fix: build fixes for OpenBSD -current and 4.8 (lp#615489, lp#615492,
     thanks to Josh Elsasser)
   * bug fix: using aliases for builtin classes as defmethod specializers

diff --git a/contrib/sb-posix/constants.lisp b/contrib/sb-posix/constants.lisp
index c00a7bf..c35bde0 100644 (file)
--- a/contrib/sb-posix/constants.lisp
+++ b/contrib/sb-posix/constants.lisp
@@ -272,7 +272,9 @@
               #-(and linux largefile) "struct dirent"
               #-win32 (:ino-t ino "ino_t" "d_ino")
               (:c-string name "char *" "d_name"
-                         :distrust-length #+sunos t #-sunos nil)) t)
+                         ;; FIXME: sunos should really have :distrust-length
+                         ;; t, but this is currently broken. -- Jim Wise 2010-08-31
+                         :distrust-length nil)) t)
 
  ;; password database
  #-win32

diff --git a/doc/manual/.cvsignore b/doc/manual/.cvsignore
index 627b9c0..464761b 100644 (file)
--- a/doc/manual/.cvsignore
+++ b/doc/manual/.cvsignore
@@ -10,6 +10,7 @@ sbcl
 *.dvi
 *.fn
 *.fns
+*.html
 *.info
 *.info-1
 *.info-2

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 0bce9a5..ea63f38 100644 (file)
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -97,7 +97,7 @@ info: $(INFOFILES)
 CONTRIB_FASLS=$(shell find $(shell echo $(MODULES) | sed "s|:|$(CONTRIBDIR)|g") -name '*.fasl')
 docstrings: $(CONTRIB_FASLS) tempfiles-stamp
        for module in $(shell echo $(MODULES)); do \
-               test -e $(CONTRIBDIR)/$${module#:}/test-passed \
+               test -f $(CONTRIBDIR)/`echo $$module | tr -d :`/test-passed \
                || { echo "The documented contrib $$module seems \
                            to have failed its tests." && exit 1; } \
        done

diff --git a/doc/manual/make-tempfiles.sh b/doc/manual/make-tempfiles.sh
index be2abf0..c212d74 100644 (file)
--- a/doc/manual/make-tempfiles.sh
+++ b/doc/manual/make-tempfiles.sh
@@ -21,7 +21,7 @@ then
 
     sbclsystem=$SBCL_PWD/../../src/runtime/sbcl
     sbclcore=$SBCL_PWD/../../output/sbcl.core
-    if [ -e $sbclsystem ] && [ -e $sbclcore ]
+    if [ -f $sbclsystem ] && [ -f $sbclcore ]
     then
         SBCLRUNTIME="$sbclsystem --core $sbclcore"
         SBCL_HOME=$SBCL_PWD/../../contrib/; export SBCL_HOME

diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp
index f02cfa0..b6b38cf 100644 (file)
--- a/tests/run-program.impure.lisp
+++ b/tests/run-program.impure.lisp
@@ -91,9 +91,10 @@
   (when command
     (write-line command *ed-in*)
     (force-output *ed-in*))
-  (let ((got (read-linish *ed-out*)))
-    (unless (equal response got)
-      (error "wanted ~S from ed, got ~S" response got)))
+  (when response
+    (let ((got (read-linish *ed-out*)))
+      (unless (equal response got)
+        (error "wanted '~A' from ed, got '~A'" response got))))
   *ed*)
 
 (unwind-protect
@@ -101,7 +102,7 @@
        (assert-ed nil "4")
        (assert-ed ".s/bar/baz/g" "")
        (assert-ed "w" "4")
-       (assert-ed "q" "")
+       (assert-ed "q" nil)
        (process-wait *ed*)
        (with-open-file (f *tmpfile*)
          (assert (equal "baz" (read-line f)))))

diff --git a/version.lisp-expr b/version.lisp-expr
index 0dfe4aa..9c49959 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.42.20"
+"1.0.42.21"