[PATCH] cvs-migration.txt

diff --git a/rsh.c b/rsh.c
index 5d1cb9d578a8e679fc190a9d7d2c842ad811223f..8eea1d0233164a5d0d4977593538289dd93f722d 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,21 @@ 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, ':');
        }
-       host += 2;
-       path = strchr(host, '/');
        if (!path) {
                return error("Bad URL: %s", url);
        }
        *(path++) = '\0';
        /* ssh <host> 'cd /<path>; stdio-pull <arg...> <commit-id>' */
        snprintf(command, COMMAND_SIZE, 
-                "cd /%s; %s=objects %s",
-                path, DB_ENVIRONMENT, remote_prog);
+                "%s='/%s' %s",
+                GIT_DIR_ENVIRONMENT, path, remote_prog);
        posn = command + strlen(command);
        for (i = 0; i < rmt_argc; i++) {
                *(posn++) = ' ';