Re-implement "check_file_directory_conflict()"

diff --git a/rsh.c b/rsh.c
index af2f47b174e3895e6c02c4cd8f16a89e3bacbbbb..5615c74e7d5f4e5f9d93c0f90c6f57fe8b41442f 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -8,7 +8,7 @@
 
 #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;
@@ -25,19 +25,22 @@ 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);
        posn = command + strlen(command);
        for (i = 0; i < rmt_argc; i++) {
                *(posn++) = ' ';
@@ -48,7 +51,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()) {