X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rsh.c;h=fe87e581d21d0465da9e3fadef0454c69640caa7;hb=fc6e714c838846aad566528f6ada904651c514f9;hp=4d6a90bf6c1b290975fb2ac22f25979be56cb476;hpb=6eb7ed5403b7d57d5ed7e30d0cd0b312888ee95c;p=git.git

diff --git a/rsh.c b/rsh.c
index 4d6a90bf..fe87e581 100644
--- a/rsh.c
+++ b/rsh.c
@@ -1,13 +1,14 @@
 #include "rsh.h"
 
 #include <string.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include "cache.h"
 
 #define COMMAND_SIZE 4096
 
-int setup_connection(int *fd_in, int *fd_out, char *remote_prog, 
+int setup_connection(int *fd_in, int *fd_out, const char *remote_prog, 
 		     char *url, int rmt_argc, char **rmt_argv)
 {
 	char *host;
@@ -24,19 +25,23 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
 	}
 
 	host = strstr(url, "//");
-	if (!host) {
-		return error("Bad URL: %s", url);
+	if (host) {
+		host += 2;
+		path = strchr(host, '/');
+	} else {
+		host = url;
+		path = strchr(host, ':');
+		if (path)
+			*(path++) = '\0';
 	}
-	host += 2;
-	path = strchr(host, '/');
 	if (!path) {
 		return error("Bad URL: %s", url);
 	}
-	*(path++) = '\0';
-	/* ssh <host> 'cd /<path>; stdio-pull <arg...> <commit-id>' */
+	/* ssh <host> 'cd <path>; stdio-pull <arg...> <commit-id>' */
 	snprintf(command, COMMAND_SIZE, 
-		 "cd /%s; SHA1_FILE_DIRECTORY=objects %s",
-		 path, remote_prog);
+		 "%s='%s' %s",
+		 GIT_DIR_ENVIRONMENT, path, remote_prog);
+	*path = '\0';
 	posn = command + strlen(command);
 	for (i = 0; i < rmt_argc; i++) {
 		*(posn++) = ' ';
@@ -47,7 +52,7 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
 		}
 	}
 	strcpy(posn, " -");
-	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sv)) {
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) {
 		return error("Couldn't create socket");
 	}
 	if (!fork()) {