From: Chris Hanson <org/chris-hanson/cph>
Date: Mon, 1 Feb 1999 03:47:55 +0000 (+0000)
Subject: Change calls to OS/FIND-PROGRAM so that they explicitly pass the
X-Git-Tag: 20090517-FFI~4647
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7d22a698b73822d099c68038d083aedd3fb5cc94;p=mit-scheme.git

Change calls to OS/FIND-PROGRAM so that they explicitly pass the
exec-path, which may be different from the default path.
---

diff --git a/v7/src/edwin/diros2.scm b/v7/src/edwin/diros2.scm
index 540384acf..fef4f01a1 100644
--- a/v7/src/edwin/diros2.scm
+++ b/v7/src/edwin/diros2.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: diros2.scm,v 1.3 1999/01/02 06:11:34 cph Exp $
+;;; $Id: diros2.scm,v 1.4 1999/02/01 03:47:30 cph Exp $
 ;;;
 ;;; Copyright (c) 1992-1999 Massachusetts Institute of Technology
 ;;;
@@ -34,7 +34,7 @@ The files are compressed or uncompressed using gzip."
   (lambda (argument)
     (let ((n
 	   (dired-change-files "compress" argument
-	     (let ((gzip (os/find-program "gzip" #f))
+	     (let ((gzip (os/find-program "gzip" #f (ref-variable exec-path)))
 		   (directory (buffer-default-directory (current-buffer))))
 	       (lambda (pathname lstart)
 		 (let ((type (pathname-type pathname))
diff --git a/v7/src/edwin/dirunx.scm b/v7/src/edwin/dirunx.scm
index 11cf3c758..7110c1746 100644
--- a/v7/src/edwin/dirunx.scm
+++ b/v7/src/edwin/dirunx.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: dirunx.scm,v 1.11 1999/01/02 06:11:34 cph Exp $
+;;; $Id: dirunx.scm,v 1.12 1999/02/01 03:47:22 cph Exp $
 ;;;
 ;;; Copyright (c) 1992-1999 Massachusetts Institute of Technology
 ;;;
@@ -26,7 +26,7 @@
 (define (dired-change-inode program)
   (lambda (attribute argument)
     (dired-change-files (string-append "change" attribute "of") argument
-      (let ((program (os/find-program program #f))
+      (let ((program (os/find-program program #f (ref-variable exec-path)))
 	    (directory (buffer-default-directory (current-buffer))))
 	(lambda (pathname lstart)
 	  (run-synchronous-process #f #f directory #f
@@ -59,7 +59,7 @@ The files are compressed or uncompressed using gzip."
   (lambda (argument)
     (let ((n
 	   (dired-change-files "compress" argument
-	     (let ((gzip (os/find-program "gzip" #f))
+	     (let ((gzip (os/find-program "gzip" #f (ref-variable exec-path)))
 		   (directory (buffer-default-directory (current-buffer))))
 	       (lambda (pathname lstart)
 		 (let ((type (pathname-type pathname))
diff --git a/v7/src/edwin/dirw32.scm b/v7/src/edwin/dirw32.scm
index 457beab6d..b74e3350d 100644
--- a/v7/src/edwin/dirw32.scm
+++ b/v7/src/edwin/dirw32.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: dirw32.scm,v 1.3 1999/01/02 06:11:34 cph Exp $
+;;; $Id: dirw32.scm,v 1.4 1999/02/01 03:47:13 cph Exp $
 ;;;
 ;;; Copyright (c) 1996, 1999 Massachusetts Institute of Technology
 ;;;
@@ -34,7 +34,7 @@ The files are compressed or uncompressed using gzip."
   (lambda (argument)
     (let ((n
 	   (dired-change-files "compress" argument
-	     (let ((gzip (os/find-program "gzip" #f))
+	     (let ((gzip (os/find-program "gzip" #f (ref-variable exec-path)))
 		   (directory (buffer-default-directory (current-buffer))))
 	       (lambda (pathname lstart)
 		 (let ((type (pathname-type pathname))
diff --git a/v7/src/edwin/os2.scm b/v7/src/edwin/os2.scm
index 82ed6ac77..296a51d5c 100644
--- a/v7/src/edwin/os2.scm
+++ b/v7/src/edwin/os2.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: os2.scm,v 1.44 1999/02/01 03:34:09 cph Exp $
+;;; $Id: os2.scm,v 1.45 1999/02/01 03:47:55 cph Exp $
 ;;;
 ;;; Copyright (c) 1994-1999 Massachusetts Institute of Technology
 ;;;
@@ -143,7 +143,7 @@
   system-mailboxes)
 
 (define (os/rmail-pop-procedure)
-  (and (dos/find-program "popclient" (ref-variable exec-path) #f)
+  (and (os/find-program "popclient" #f (ref-variable exec-path))
        (lambda (server user-name password directory)
 	 (os2-pop-client server user-name password directory))))
 
diff --git a/v7/src/edwin/rmail.scm b/v7/src/edwin/rmail.scm
index 538d5289c..ef70f78e1 100644
--- a/v7/src/edwin/rmail.scm
+++ b/v7/src/edwin/rmail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: rmail.scm,v 1.60 1999/01/28 03:59:59 cph Exp $
+;;; $Id: rmail.scm,v 1.61 1999/02/01 03:47:02 cph Exp $
 ;;;
 ;;; Copyright (c) 1991-1999 Massachusetts Institute of Technology
 ;;;
@@ -503,11 +503,13 @@ and use that file as the inbox."
 	  (let ((error-buffer (temporary-buffer " movemail errors")))
 	    (let ((start (buffer-start error-buffer))
 		  (end (buffer-end error-buffer)))
-	      (run-synchronous-process false start false false
-				       (os/find-program "movemail"
-							(edwin-etc-directory))
-				       (->namestring source)
-				       (->namestring target))
+	      (run-synchronous-process
+	       false start false false
+	       (os/find-program "movemail"
+				(edwin-etc-directory)
+				(ref-variable exec-path))
+	       (->namestring source)
+	       (->namestring target))
 	      (if (mark< start end)
 		  (error
 		   (let ((m
diff --git a/v7/src/edwin/sendmail.scm b/v7/src/edwin/sendmail.scm
index a90fc3347..b6554d950 100644
--- a/v7/src/edwin/sendmail.scm
+++ b/v7/src/edwin/sendmail.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: sendmail.scm,v 1.43 1999/01/02 06:11:34 cph Exp $
+;;; $Id: sendmail.scm,v 1.44 1999/02/01 03:46:56 cph Exp $
 ;;;
 ;;; Copyright (c) 1991-1999 Massachusetts Institute of Technology
 ;;;
@@ -694,7 +694,7 @@ the user from the mailer."
 	  ;; user as soon as possible.
 	  (let ((process
 		 (start-pipe-subprocess
-		  (os/find-program program #f)
+		  (os/find-program program #f (ref-variable exec-path))
 		  (vector (file-namestring program) "-oi" "-t"
 			  (string-append "-f" (current-user-name))
 			  ;; These mean "report errors by mail" and
diff --git a/v7/src/edwin/unix.scm b/v7/src/edwin/unix.scm
index 001ecf95b..f66f2f475 100644
--- a/v7/src/edwin/unix.scm
+++ b/v7/src/edwin/unix.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: unix.scm,v 1.92 1999/02/01 03:31:01 cph Exp $
+;;; $Id: unix.scm,v 1.93 1999/02/01 03:46:43 cph Exp $
 ;;;
 ;;; Copyright (c) 1989-1999 Massachusetts Institute of Technology
 ;;;
@@ -560,7 +560,7 @@ CANNOT contain the 'F' option."
 				      (file-namestring file)))
 	(apply run-synchronous-process
 	       #f mark directory #f
-	       (os/find-program program #f)
+	       (os/find-program program #f (ref-variable exec-path))
 	       (append
 		(split-unix-switch-string switches)
 		(list
@@ -638,7 +638,7 @@ option, instead taking -P <filename>."
   boolean?)
 
 (define (os/rmail-pop-procedure)
-  (and (unix/find-program "popclient" (ref-variable exec-path) #f)
+  (and (os/find-program "popclient" #f (ref-variable exec-path))
        (lambda (server user-name password directory)
 	 (unix/pop-client server user-name password directory))))
 
diff --git a/v7/src/edwin/vc.scm b/v7/src/edwin/vc.scm
index d17f54032..217301bc4 100644
--- a/v7/src/edwin/vc.scm
+++ b/v7/src/edwin/vc.scm
@@ -1,6 +1,6 @@
 ;;; -*-Scheme-*-
 ;;;
-;;; $Id: vc.scm,v 1.30 1999/01/02 06:11:34 cph Exp $
+;;; $Id: vc.scm,v 1.31 1999/02/01 03:46:35 cph Exp $
 ;;;
 ;;; Copyright (c) 1994-1999 Massachusetts Institute of Technology
 ;;;
@@ -1202,7 +1202,8 @@ the value of vc-log-mode-hook."
 		  #f
 		  #f
 		  (os/find-program command
-				   (buffer-default-directory command-buffer))
+				   (buffer-default-directory command-buffer)
+				   (ref-variable exec-path))
 		  (vc-command-arguments arguments))))
       (if (and (eq? 'EXITED (car result))
 	       (<= 0 (cdr result) status-limit))