From c36a6e94aa0d24db0866d5167b089e54ba15315a Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Tue, 1 Mar 2011 04:32:58 +0000 Subject: [PATCH] Remove commented-out DEFAULT-DIRECTORY written by fmg. Don't need this anymore since the issue appears to be fixed. --- code/filesys.lisp | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/code/filesys.lisp b/code/filesys.lisp index b3a8ff471..5a3752cbe 100644 --- a/code/filesys.lisp +++ b/code/filesys.lisp @@ -6,7 +6,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (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." (parse-namestring (concatenate 'simple-string dir-or-error "/") *unix-host*))) (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 ;;; -- GitLab