Formerly remote-cstms.c.~4~

diff --git a/remote-cstms.c b/remote-cstms.c
index b9404390df3cde516c0ab5e86b86377de1d86031..a8465adbd9ad7c1766a4ea491cc91c78883c6222 100644 (file)
--- a/remote-cstms.c
+++ b/remote-cstms.c
@@ -4,7 +4,7 @@
    Please do not send bug reports or questions about it to
    the Make maintainers.
 
-Copyright (C) 1988, 1989 Free Software Foundation, Inc.
+Copyright (C) 1988, 1989, 1992 Free Software Foundation, Inc.
 This file is part of GNU Make.
 
 GNU Make is free software; you can redistribute it and/or modify
@@ -44,23 +44,21 @@ start_remote_job_p ()
   return !CUSTOMS_FAIL (&permit.addr);
 }
 \f
-/* Start a remote job running the command in ARGV.
-   It gets standard input from STDIN_FD.  On failure,
-   return nonzero.  On success, return zero, and set
-   *USED_STDIN to nonzero if it will actually use STDIN_FD,
-   zero if not, set *ID_PTR to a unique identification, and
-   set *IS_REMOTE to zero if the job is local, nonzero if it
-   is remote (meaning *ID_PTR is a process ID).  */
+/* Start a remote job running the command in ARGV,
+   with environment from ENVP.  It gets standard input from STDIN_FD.  On
+   failure, return nonzero.  On success, return zero, and set *USED_STDIN
+   to nonzero if it will actually use STDIN_FD, zero if not, set *ID_PTR to
+   a unique identification, and set *IS_REMOTE to zero if the job is local,
+   nonzero if it is remote (meaning *ID_PTR is a process ID).  */
 
 int
-start_remote_job (argv, stdin_fd, is_remote, id_ptr, used_stdin)
-     char **argv;
+start_remote_job (argv, envp, stdin_fd, is_remote, id_ptr, used_stdin)
+     char **argv, **envp;
      int stdin_fd;
      int *is_remote;
      int *id_ptr;
      int *used_stdin;
 {
-  extern char **environ;
   extern int vfork (), execve ();
   PATH_VAR (cwd);
   char waybill[MAX_DATA_SIZE], msg[128];
@@ -101,7 +99,7 @@ start_remote_job (argv, stdin_fd, is_remote, id_ptr, used_stdin)
 
   /* Create a WayBill to give to the server.  */
   len = Customs_MakeWayBill (&permit, cwd, argv[0], argv,
-                            environ, retport, waybill);
+                            envp, retport, waybill);
 
   /* Send the request to the server, timing out in 20 seconds.  */
   timeout.tv_usec = 0;