From 856b48ee1d10fd967bc7fbd0a0bcc6ce330b3905 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Fri, 3 May 1996 07:41:10 +0000 Subject: [PATCH] Fix think-o in INIT-FILE-SPECIFIER->PATHNAME for OS/2 and Windows. --- v7/src/runtime/ntprm.scm | 14 +++++++++----- v7/src/runtime/os2prm.scm | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/v7/src/runtime/ntprm.scm b/v7/src/runtime/ntprm.scm index 685caf852..94ead104a 100644 --- a/v7/src/runtime/ntprm.scm +++ b/v7/src/runtime/ntprm.scm @@ -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))) diff --git a/v7/src/runtime/os2prm.scm b/v7/src/runtime/os2prm.scm index 0384379f7..321ea5821 100644 --- a/v7/src/runtime/os2prm.scm +++ b/v7/src/runtime/os2prm.scm @@ -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))) -- 2.25.1