Fix bug: code to determine when the user begins typing a new file name

at the end of a file prompt must match the inserted file name in its
entirety; previously it could mistakenly match against a substring of
the inserted file name.

diff --git a/v7/src/edwin/dosfile.scm b/v7/src/edwin/dosfile.scm
index dcc0e7c52658af16dd2823d563eb3c4094331a27..0002801314ad3826f7d43ccfeecfd2d370886e88 100644 (file)
--- a/v7/src/edwin/dosfile.scm
+++ b/v7/src/edwin/dosfile.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: dosfile.scm,v 1.4 1995/10/25 03:49:29 cph Exp $
+;;;    $Id: dosfile.scm,v 1.5 1996/02/27 21:06:03 cph Exp $
 ;;;
-;;;    Copyright (c) 1994-95 Massachusetts Institute of Technology
+;;;    Copyright (c) 1994-96 Massachusetts Institute of Technology
 ;;;
 ;;;    This material was developed by the Scheme project at the
 ;;;    Massachusetts Institute of Technology, Department of
@@ -90,6 +90,7 @@ Includes the new backup.  Must be > 0."
 (define (os/trim-pathname-string string prefix)
   (let ((index (string-match-forward prefix string)))
     (if (and index
+            (fix:= index (string-length prefix))
             (re-match-substring-forward
              (re-compile-pattern "[\\/$~]\\|[a-zA-Z]:" #t)
              #t #f string index (string-length string)))

diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index 7b812079d0ab4361ca7f0a72f2c21d522e4d3182..ac72d8359285feea7c542207ff7a7b5ffca93d65 100644 (file)
--- a/v7/src/edwin/unix.scm
+++ b/v7/src/edwin/unix.scm
@@ -1,8 +1,8 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;    $Id: unix.scm,v 1.61 1995/10/25 02:18:34 cph Exp $
+;;;    $Id: unix.scm,v 1.62 1996/02/27 21:05:56 cph Exp $
 ;;;
-;;;    Copyright (c) 1989-95 Massachusetts Institute of Technology
+;;;    Copyright (c) 1989-96 Massachusetts Institute of Technology
 ;;;
 ;;;    This material was developed by the Scheme project at the
 ;;;    Massachusetts Institute of Technology, Department of
@@ -91,6 +91,7 @@ Includes the new backup.  Must be > 0."
 (define (os/trim-pathname-string string prefix)
   (let ((index (string-match-forward prefix string)))
     (if (and index
+            (fix:= index (string-length prefix))
             (re-match-substring-forward (re-compile-pattern "[/$~]" #t)
                                         #t #f string index
                                         (string-length string)))