Fix think-o in INIT-FILE-SPECIFIER->PATHNAME for OS/2 and Windows.
authorChris Hanson <org/chris-hanson/cph>
Fri, 3 May 1996 07:41:10 +0000 (07:41 +0000)
committerChris Hanson <org/chris-hanson/cph>
Fri, 3 May 1996 07:41:10 +0000 (07:41 +0000)
v7/src/runtime/ntprm.scm
v7/src/runtime/os2prm.scm

index 685caf852f44735691163fed324c33df4d11a7e6..94ead104a6e33fc287f98107dc943864e6c1ccfe 100644 (file)
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: ntprm.scm,v 1.6 1996/04/24 03:39:38 cph Exp $
+$Id: ntprm.scm,v 1.7 1996/05/03 07:41:10 cph Exp $
 
 Copyright (c) 1992-96 Massachusetts Institute of Technology
 
@@ -382,10 +382,14 @@ MIT in each case. |#
   (guarantee-init-file-specifier specifier 'INIT-FILE-SPECIFIER->PATHNAME)
   (let ((long-base (merge-pathnames ".mit-scheme/" (user-homedir-pathname))))
     (if (dos/fs-long-filenames? long-base)
-       (merge-pathnames (apply string-append
-                               (append-map (lambda (string) (list "/" string))
-                                           specifier))
-                        long-base)
+       (if (null? specifier)
+           (directory-pathname-as-file long-base)
+           (merge-pathnames
+            (apply string-append
+                   (cons (car specifier)
+                         (append-map (lambda (string) (list "/" string))
+                                     (cdr specifier))))
+            long-base))
        (let ((short-base
               (merge-pathnames "mitschem.ini/" (user-homedir-pathname))))
          (let ((file-map-pathname (merge-pathnames "filemap.dat" short-base)))
index 0384379f7889bef2e6aa7796a27f2aacb15e9912..321ea5821624bd962d614554c8f6a5d2a34566ed 100644 (file)
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: os2prm.scm,v 1.28 1996/04/24 18:44:26 cph Exp $
+$Id: os2prm.scm,v 1.29 1996/05/03 07:40:33 cph Exp $
 
 Copyright (c) 1994-96 Massachusetts Institute of Technology
 
@@ -287,10 +287,14 @@ MIT in each case. |#
   (guarantee-init-file-specifier specifier 'INIT-FILE-SPECIFIER->PATHNAME)
   (let ((long-base (merge-pathnames ".mit-scheme/" (user-homedir-pathname))))
     (if (dos/fs-long-filenames? long-base)
-       (merge-pathnames (apply string-append
-                               (append-map (lambda (string) (list "/" string))
-                                           specifier))
-                        long-base)
+       (if (null? specifier)
+           (directory-pathname-as-file long-base)
+           (merge-pathnames
+            (apply string-append
+                   (cons (car specifier)
+                         (append-map (lambda (string) (list "/" string))
+                                     (cdr specifier))))
+            long-base))
        (let ((short-base
               (merge-pathnames "mitschem.ini/" (user-homedir-pathname))))
          (let ((file-map-pathname (merge-pathnames "filemap.dat" short-base)))