Skip to content
Snippets Groups Projects
Commit c36a6e94 authored by rtoy's avatar rtoy
Browse files

Remove commented-out DEFAULT-DIRECTORY written by fmg.

Don't need this anymore since the issue appears to be fixed.
parent af6f3254
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.113 2010/11/08 22:28:59 rtoy Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.114 2011/03/01 04:32:58 rtoy Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -1392,39 +1392,6 @@ optionally keeping some of the most recent old versions." ...@@ -1392,39 +1392,6 @@ optionally keeping some of the most recent old versions."
(parse-namestring (concatenate 'simple-string dir-or-error "/") (parse-namestring (concatenate 'simple-string dir-or-error "/")
*unix-host*))) *unix-host*)))
(error dir-or-error)))) (error dir-or-error))))
;;;
;;; XXXX This code was modified by me (fmg) to avoid calling
;;; concatenate. The reason for this is that there have been
;;; intermittent instabilities (segv on startup) when the function
;;; environment-init (in save.lisp) is called. Apparently the type
;;; system is not completely sorted out at the time this function is
;;; first called. As a result, strange, not completely reproducable
;;; things happen, related to something in the state of the
;;; environment (e.g. the paths or the user environment variables or
;;; something). These errors occur in the course of calling
;;; default-directory and the backtrace indicates they occur in the
;;; context of the type system. Since I haven't been able to figure
;;; out why they happen, I decided to punt.
;;;
;;; Hopefully someone will really fix the problem someday.
;;;
;;; Seems like maybe it's fixed by changes made by Ray Toy to avoid heap corruption.
#- (and)
(defun default-directory ()
"Returns the pathname for the default directory. This is the place where
a file will be written if no directory is specified. This may be changed
with setf."
(multiple-value-bind (gr dir-or-error)
(unix:unix-current-directory)
(if gr
(let ((*ignore-wildcards* t)
(string (make-string (1+ (length dir-or-error)) :initial-element #\/)))
(values
(parse-namestring (replace string dir-or-error) *unix-host*)))
(error dir-or-error))))
;;; %Set-Default-Directory -- Internal ;;; %Set-Default-Directory -- Internal
;;; ;;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment