From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 30 Dec 1997 21:19:30 +0000 (+0000)
Subject: Change definition of DOS/DEFAULT-SHELL-FILE-NAME so that it is
X-Git-Tag: 20090517-FFI~4908
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f5eabd8d6c3a952479514a70af0041742b391932;p=mit-scheme.git

Change definition of DOS/DEFAULT-SHELL-FILE-NAME so that it is
computed at run time rather than at build time.  This is necessary
because a band created on Windows NT can be used on Windows 95, and
must have different values for each of these systems.
---

diff --git a/v7/src/edwin/dos.scm b/v7/src/edwin/dos.scm
index 0ca5806cb..acd0ddb34 100644
--- a/v7/src/edwin/dos.scm
+++ b/v7/src/edwin/dos.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: dos.scm,v 1.45 1997/10/26 01:35:43 cph Exp $
+;;;	$Id: dos.scm,v 1.46 1997/12/30 21:19:30 cph Exp $
 ;;;
 ;;;	Copyright (c) 1992-97 Massachusetts Institute of Technology
 ;;;
@@ -46,7 +46,7 @@
 
 (declare (usual-integrations))
 
-(define dos/windows-type
+(define (dos/windows-type)
   (cond ((string-prefix? "Microsoft Windows NT"
 			 microcode-id/operating-system-variant)
 	 'WINNT)
@@ -58,8 +58,8 @@
 	 'WIN31)
 	(else #f)))
 
-(define dos/default-shell-file-name
-  (if (eq? 'WINNT dos/windows-type)
+(define (dos/default-shell-file-name)
+  (if (eq? 'WINNT (dos/windows-type))
       "cmd.exe"
       "command.com"))
 
diff --git a/v7/src/edwin/dosfile.scm b/v7/src/edwin/dosfile.scm
index 3af280ae4..a0bf91c35 100644
--- a/v7/src/edwin/dosfile.scm
+++ b/v7/src/edwin/dosfile.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: dosfile.scm,v 1.13 1997/11/01 07:33:44 cph Exp $
+;;;	$Id: dosfile.scm,v 1.14 1997/12/30 21:19:24 cph Exp $
 ;;;
 ;;;	Copyright (c) 1994-97 Massachusetts Institute of Technology
 ;;;
@@ -516,7 +516,7 @@ Switches may be concatenated, e.g. `-lt' is equivalent to `-l -t'."
 (define (os/shell-file-name)
   (or (get-environment-variable "SHELL")
       (get-environment-variable "COMSPEC")
-      dos/default-shell-file-name))
+      (dos/default-shell-file-name)))
 
 (define (os/shell-name pathname)
   (if (member (pathname-type pathname) dos/executable-pathname-types)
diff --git a/v7/src/edwin/os2.scm b/v7/src/edwin/os2.scm
index be0f3c1ff..19ad4a78c 100644
--- a/v7/src/edwin/os2.scm
+++ b/v7/src/edwin/os2.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;;	$Id: os2.scm,v 1.41 1997/10/26 01:35:52 cph Exp $
+;;;	$Id: os2.scm,v 1.42 1997/12/30 21:19:19 cph Exp $
 ;;;
 ;;;	Copyright (c) 1994-97 Massachusetts Institute of Technology
 ;;;
@@ -45,7 +45,7 @@
 
 (declare (usual-integrations))
 
-(define dos/default-shell-file-name
+(define (dos/default-shell-file-name)
   "cmd.exe")
 
 (define (os/set-file-modes-writable! pathname)