From 1ef51a1595655afc92a69b703e3632f177934e8d Mon Sep 17 00:00:00 2001 From: dtc <dtc> Date: Fri, 23 Feb 2001 18:56:11 +0000 Subject: [PATCH] o Fix some problems in the parsing within extract-name-type-and-version. --- code/filesys.lisp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/filesys.lisp b/code/filesys.lisp index 33834f070..f588557ac 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.59 2001/02/22 19:35:01 dtc Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.60 2001/02/23 18:56:11 dtc Exp $") ;;; ;;; ********************************************************************** ;;; @@ -185,16 +185,16 @@ (values :wild (- end 4))) (t (do ((i (- end 2) (1- i))) - ((< i (+ start 2)) (values :newest nil)) + ((< i (+ start 2)) (values :newest end)) (let ((char (schar namestr i))) (when (eql char #\~) - (return (and (char= (schar namestr (1- i)) #\.) - (values (parse-integer namestr - :start (1+ i) - :end (1- end)) - (1- i))))) + (return (if (char= (schar namestr (1- i)) #\.) + (values (parse-integer namestr :start (1+ i) + :end (1- end)) + (1- i)) + (values :newest end)))) (unless (char<= #\0 char #\9) - (return nil)))))) + (return (values :newest end))))))) (let ((last-dot (position #\. namestr :start (1+ start) :end vstart :from-end t))) (cond (last-dot -- GitLab