Update for new pathname implementation.

diff --git a/v7/src/rcs/logmer.scm b/v7/src/rcs/logmer.scm
index b92d6ded7f8c2894ca51b4a0d18b1007a47dde8b..72bccfe5c2eab2cd28a5515260b7d98162bbcd95 100644 (file)
--- a/v7/src/rcs/logmer.scm
+++ b/v7/src/rcs/logmer.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/rcs/logmer.scm,v 1.2 1991/01/19 04:21:08 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/rcs/logmer.scm,v 1.3 1991/11/26 08:34:12 cph Exp $
 
 Copyright (c) 1988, 1991 Massachusetts Institute of Technology
 
@@ -126,7 +126,7 @@ MIT in each case. |#
 
 (define (working-file-string pathname prefix)
   (let ((filename
-        (pathname->string
+        (->namestring
          (pathname-new-directory
           pathname
           (let ((directory (list-tail (pathname-directory pathname) prefix)))
@@ -148,7 +148,7 @@ MIT in each case. |#
       (begin
        (newline trace-port)
        (write-string "read-file " trace-port)
-       (write-string (pathname->string pathname) trace-port)))
+       (write-string (->namestring pathname) trace-port)))
   (let ((deltas (rcstext->deltas (rcs/read-file pathname 'LOG-ONLY))))
     (for-each (lambda (delta)
                (set-delta/log! delta
@@ -178,14 +178,12 @@ MIT in each case. |#
                      (cons (car input) output))))))))
 \f
 (define (rcs-directory-read filename)
-  (let ((pathname
-        (pathname->absolute-pathname
-         (pathname-as-directory (->pathname filename)))))
-    (map (let ((directory-path (pathname-directory-path pathname)))
+  (let ((pathname (merge-pathnames (pathname-as-directory filename))))
+    (map (let ((directory-path (directory-pathname pathname)))
           (lambda (filename)
-            (merge-pathnames directory-path (string->pathname filename))))
+            (merge-pathnames directory-path (->pathname filename))))
         (list-transform-positive
-            (generate-filenames (pathname-directory-string pathname))
+            (generate-filenames (directory-namestring pathname))
           (lambda (filename)
             (string-suffix? ",v" filename))))))
 
@@ -230,6 +228,6 @@ MIT in each case. |#
                                            (common-prefix (cdr x)
                                                           (cdr y)))))))))
                  pathnames)
-       (if (equal? prefix '(ROOT))
+       (if (equal? prefix '(ABSOLUTE))
            '()
            prefix))))
\ No newline at end of file

diff --git a/v7/src/rcs/make.scm b/v7/src/rcs/make.scm
index b2f1f10913a67b245dc3fce814061eb9396dc5ae..a0e29d07d3c70117aff274b37ab01da11b357ce1 100644 (file)
--- a/v7/src/rcs/make.scm
+++ b/v7/src/rcs/make.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/rcs/Attic/make.scm,v 1.2 1991/01/19 04:21:14 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/rcs/Attic/make.scm,v 1.3 1991/11/26 08:36:01 cph Exp $
 
 Copyright (c) 1988, 1991 Massachusetts Institute of Technology
 
@@ -38,4 +38,4 @@ MIT in each case. |#
 
 (load-option 'hash-table)
 (package/system-loader "rcs" '() 'QUERY)
-(add-identification! "RCS" 2 0)
\ No newline at end of file
+(add-identification! "RCS" 2 1)
\ No newline at end of file

diff --git a/v7/src/rcs/scheme.scm b/v7/src/rcs/scheme.scm
index 632ee786bc3b19798c71f842860de2ddc81fe098..65f45650b3a643f4f9d6f0e48a1221020adf9f58 100644 (file)
--- a/v7/src/rcs/scheme.scm
+++ b/v7/src/rcs/scheme.scm
@@ -15,7 +15,7 @@
                                    (directory-read pathname)
                                  (lambda (pathname)
                                    (zero? (string-match-backward
-                                           (pathname->string pathname)
+                                           (->namestring pathname)
                                            ",v")))))
                              (map (lambda (directory)
                                     (string-append directory "/RCS/"))