Make read_patch_file work on a strbuf.

diff --git a/rsh.c b/rsh.c
index d66526941fbe45f99e51babc2c55a63b4baa027c..016d72ead71f34196b374a088bdf6e4534326003 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -1,53 +1,18 @@
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
+#include "cache.h"
 #include "rsh.h"
 #include "quote.h"
-#include "cache.h"
 
 #define COMMAND_SIZE 4096
 
-/*
- * Append a string to a string buffer, with or without shell quoting.
- * Return true if the buffer overflowed.
- */
-static int add_to_string(char **ptrp, int *sizep, const char *str, int quote)
-{
-       char *p = *ptrp;
-       int size = *sizep;
-       int oc;
-       int err = 0;
-
-       if ( quote ) {
-               oc = sq_quote_buf(p, size, str);
-       } else {
-               oc = strlen(str);
-               memcpy(p, str, (oc >= size) ? size-1 : oc);
-       }
-
-       if ( oc >= size ) {
-               err = 1;
-               oc = size-1;
-       }
-
-       *ptrp  += oc;
-       **ptrp  = '\0';
-       *sizep -= oc;
-       return err;
-}
-
-int setup_connection(int *fd_in, int *fd_out, const 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;
        char *path;
        int sv[2];
-       char command[COMMAND_SIZE];
-       char *posn;
-       int sizen;
-       int of;
        int i;
+       pid_t pid;
+       struct strbuf cmd;
 
        if (!strcmp(url, "-")) {
                *fd_in = 0;
@@ -68,30 +33,32 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
        if (!path) {
                return error("Bad URL: %s", url);
        }
+
        /* $GIT_RSH <host> "env GIT_DIR=<path> <remote_prog> <args...>" */
-       sizen = COMMAND_SIZE;
-       posn = command;
-       of = 0;
-       of |= add_to_string(&posn, &sizen, "env ", 0);
-       of |= add_to_string(&posn, &sizen, GIT_DIR_ENVIRONMENT "=", 0);
-       of |= add_to_string(&posn, &sizen, path, 1);
-       of |= add_to_string(&posn, &sizen, " ", 0);
-       of |= add_to_string(&posn, &sizen, remote_prog, 1);
+       strbuf_init(&cmd, COMMAND_SIZE);
+       strbuf_addstr(&cmd, "env ");
+       strbuf_addstr(&cmd, GIT_DIR_ENVIRONMENT "=");
+       sq_quote_buf(&cmd, path);
+       strbuf_addch(&cmd, ' ');
+       sq_quote_buf(&cmd, remote_prog);
 
-       for ( i = 0 ; i < rmt_argc ; i++ ) {
-               of |= add_to_string(&posn, &sizen, " ", 0);
-               of |= add_to_string(&posn, &sizen, rmt_argv[i], 1);
+       for (i = 0 ; i < rmt_argc ; i++) {
+               strbuf_addch(&cmd, ' ');
+               sq_quote_buf(&cmd, rmt_argv[i]);
        }
 
-       of |= add_to_string(&posn, &sizen, " -", 0);
+       strbuf_addstr(&cmd, " -");
 
-       if ( of )
+       if (cmd.len >= COMMAND_SIZE)
                return error("Command line too long");
 
        if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv))
                return error("Couldn't create socket");
 
-       if (!fork()) {
+       pid = fork();
+       if (pid < 0)
+               return error("Couldn't fork");
+       if (!pid) {
                const char *ssh, *ssh_basename;
                ssh = getenv("GIT_SSH");
                if (!ssh) ssh = "ssh";
@@ -103,7 +70,7 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
                close(sv[1]);
                dup2(sv[0], 0);
                dup2(sv[0], 1);
-               execlp(ssh, ssh_basename, host, command, NULL);
+               execlp(ssh, ssh_basename, host, cmd.buf, NULL);
        }
        close(sv[0]);
        *fd_in = sv[1];