grep: allow threading even on a single-core machine

diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index d699d28e98c7e76e3c0a4943b58a8c88acede988..e3cd25d580b0f1ee14b4a5037ceae8dc20b31f30 100644 (file)
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "transport.h"
 #include "run-command.h"
+#include "pkt-line.h"
 
 /*
  * URL syntax:
@@ -30,16 +31,14 @@ static char *strip_escapes(const char *str, const char *service,
        size_t rpos = 0;
        int escape = 0;
        char special = 0;
-       size_t psoff = 0;
+       const char *service_noprefix = service;
        struct strbuf ret = STRBUF_INIT;
 
-       /* Calculate prefix length for \s and lengths for \s and \S */
-       if (!strncmp(service, "git-", 4))
-               psoff = 4;
+       skip_prefix(service_noprefix, "git-", &service_noprefix);
 
        /* Pass the service to command. */
        setenv("GIT_EXT_SERVICE", service, 1);
-       setenv("GIT_EXT_SERVICE_NOPREFIX", service + psoff, 1);
+       setenv("GIT_EXT_SERVICE_NOPREFIX", service_noprefix, 1);
 
        /* Scan the length of argument. */
        while (str[rpos] && (escape || str[rpos] != ' ')) {
@@ -85,7 +84,7 @@ static char *strip_escapes(const char *str, const char *service,
                                strbuf_addch(&ret, str[rpos]);
                                break;
                        case 's':
-                               strbuf_addstr(&ret, service + psoff);
+                               strbuf_addstr(&ret, service_noprefix);
                                break;
                        case 'S':
                                strbuf_addstr(&ret, service);
@@ -144,36 +143,11 @@ static const char **parse_argv(const char *arg, const char *service)
 static void send_git_request(int stdin_fd, const char *serv, const char *repo,
        const char *vhost)
 {
-       size_t bufferspace;
-       size_t wpos = 0;
-       char *buffer;
-
-       /*
-        * Request needs 12 bytes extra if there is vhost (xxxx \0host=\0) and
-        * 6 bytes extra (xxxx \0) if there is no vhost.
-        */
-       if (vhost)
-               bufferspace = strlen(serv) + strlen(repo) + strlen(vhost) + 12;
+       if (!vhost)
+               packet_write(stdin_fd, "%s %s%c", serv, repo, 0);
        else
-               bufferspace = strlen(serv) + strlen(repo) + 6;
-
-       if (bufferspace > 0xFFFF)
-               die("Request too large to send");
-       buffer = xmalloc(bufferspace);
-
-       /* Make the packet. */
-       wpos = sprintf(buffer, "%04x%s %s%c", (unsigned)bufferspace,
-               serv, repo, 0);
-
-       /* Add vhost if any. */
-       if (vhost)
-               sprintf(buffer + wpos, "host=%s%c", vhost, 0);
-
-       /* Send the request */
-       if (write_in_full(stdin_fd, buffer, bufferspace) < 0)
-               die_errno("Failed to send request");
-
-       free(buffer);
+               packet_write(stdin_fd, "%s %s%chost=%s%c", serv, repo, 0,
+                            vhost, 0);
 }
 
 static int run_child(const char *arg, const char *service)