--- ray/src/util/netproc.c	1996/02/07 16:42:45	2.2
+++ ray/src/util/netproc.c	2003/02/22 02:07:30	2.9
@@ -1,60 +1,32 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: netproc.c,v 2.9 2003/02/22 02:07:30 greg Exp $";
 #endif
-
 /*
  * Parallel network process handling routines
  */
 
 #include <stdio.h>
-#include <sys/types.h>
 #include <signal.h>
 #include <fcntl.h>
+#include "selcall.h"
 #include "netproc.h"
+#include "paths.h"
 #include "vfork.h"
-					/* Remote shell location */
-#ifdef sgi
-#define RSH		"/usr/bsd/rsh"
-#endif
-#ifdef _AUX_SOURCE
-#define RSH		"/usr/bin/remsh"
-#endif
-#ifndef RSH
-#define RSH		"/usr/ucb/rsh"
-#endif
-					/* select call compatibility stuff */
-#ifndef FD_SETSIZE
-#include <sys/param.h>
-#define FD_SETSIZE	NOFILE		/* maximum # select file descriptors */
-#endif
-#ifndef FD_SET
-#ifndef NFDBITS
-#define NFDBITS		(8*sizeof(int))	/* number of bits per fd_mask */
-#endif
-#define	FD_SET(n, p)	((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
-#define	FD_CLR(n, p)	((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
-#define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#ifndef BSD
-#define	bzero(d,n)	(void)memset(d,0,n)
-#endif
-#define FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
-#endif
 
 PSERVER	*pslist = NULL;		/* global process server list */
 
 static PROC	*pindex[FD_SETSIZE];	/* process index table */
 
 static char	ourhost[64];	/* this host name */
-static char	ourdir[128];	/* our working directory */
+static char	ourdir[MAXPATH];	/* our working directory */
 static char	ouruser[32];	/* our user name */
 static char	*ourshell;	/* our user's shell */
 
 static fd_set	errdesc;	/* error file descriptors */
 static int	maxfd;		/* maximum assigned descriptor */
 
-extern char	*malloc(), *realloc();
+extern char	*remsh;		/* externally defined remote shell program */
+
 extern char	*getenv();
 
 
@@ -71,12 +43,12 @@ int	np;
 	if (ps == NULL)
 		return(NULL);
 	if (!ourhost[0]) {		/* initialize */
-		char	dirtmp[128];
+		char	dirtmp[MAXPATH];
 		register char	*cp;
 		register int	len;
 
 		strcpy(ourhost, myhostname());
-		getcwd(dirtmp, sizeof(dirtmp));
+		getwd(dirtmp);
 		if ((cp = getenv("HOME")) != NULL) {
 			if (!strcmp(cp, dirtmp))
 				ourdir[0] = '\0';
@@ -150,7 +122,7 @@ PSERVER	*ps;
 					/* remove server from list */
 	psp->next = ps->next;
 	pslist = pstart.next;
-	free((char *)ps);		/* free associated memory */
+	free((void *)ps);		/* free associated memory */
 }
 
 
@@ -177,7 +149,8 @@ register PSERVER	*ps;
 char	*command;
 int	(*compf)();
 {
-	char	*av[12];
+	char	udirt[MAXPATH];
+	char	*av[16];
 	int	pfd[2], pid;
 	register int	i;
 
@@ -205,14 +178,19 @@ int	(*compf)();
 			close(pfd[1]);
 		}
 		if (ps->hostname[0]) {		/* rsh command */
-			av[i=0] = RSH;
+			av[i=0] = remsh;
 			av[++i] = ps->hostname;
-			av[++i] = "-n";		/* no stdin */
-			if (ps->username[0]) {
+			av[++i] = "-n";			/* no stdin */
+			if (ps->username[0]) {		/* different user */
 				av[++i] = "-l";
 				av[++i] = ps->username;
+				av[++i] = "cd";
+				udirt[0] = '~';
+				strcpy(udirt+1, ouruser);
+				av[++i] = udirt;
+				av[++i] = ";";
 			}
-			if (ps->directory[0]) {
+			if (ps->directory[0]) {		/* change directory */
 				av[++i] = "cd";
 				av[++i] = ps->directory;
 				av[++i] = ";";
@@ -314,7 +292,7 @@ int	status;
 	close(pp->efd);				/* close error stream */
 	pindex[pp->efd] = NULL;
 	FD_CLR(pp->efd, &errdesc);
-	free((char *)pp->errs);
+	free((void *)pp->errs);
 	pp->com = NULL;				/* clear settings */
 	pp->pid = -1;
 	pp->efd = -1;