7851b1e60f
When compiling with pthread support, transport-helper.c needs to include necessary header files. Also fix a few error messages in remote-ext and remote-fd programs, and a potential buffer underrun in remote-fd. In the documentation, clarify how %G and %V are used; the old description looked as if they take repository/vhost parameters, which was wrong. Also fix AsciiDoc markup for the page title of remote-fd/remote-ext manpages, and tweak the way how section headers are shown. Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
80 lines
1.8 KiB
C
80 lines
1.8 KiB
C
#include "git-compat-util.h"
|
|
#include "transport.h"
|
|
|
|
/*
|
|
* URL syntax:
|
|
* 'fd::<inoutfd>[/<anything>]' Read/write socket pair
|
|
* <inoutfd>.
|
|
* 'fd::<infd>,<outfd>[/<anything>]' Read pipe <infd> and write
|
|
* pipe <outfd>.
|
|
* [foo] indicates 'foo' is optional. <anything> is any string.
|
|
*
|
|
* The data output to <outfd>/<inoutfd> should be passed unmolested to
|
|
* git-receive-pack/git-upload-pack/git-upload-archive and output of
|
|
* git-receive-pack/git-upload-pack/git-upload-archive should be passed
|
|
* unmolested to <infd>/<inoutfd>.
|
|
*
|
|
*/
|
|
|
|
#define MAXCOMMAND 4096
|
|
|
|
static void command_loop(int input_fd, int output_fd)
|
|
{
|
|
char buffer[MAXCOMMAND];
|
|
|
|
while (1) {
|
|
size_t i;
|
|
if (!fgets(buffer, MAXCOMMAND - 1, stdin)) {
|
|
if (ferror(stdin))
|
|
die("Input error");
|
|
return;
|
|
}
|
|
/* Strip end of line characters. */
|
|
i = strlen(buffer);
|
|
while (i > 0 && isspace(buffer[i - 1]))
|
|
buffer[--i] = 0;
|
|
|
|
if (!strcmp(buffer, "capabilities")) {
|
|
printf("*connect\n\n");
|
|
fflush(stdout);
|
|
} else if (!strncmp(buffer, "connect ", 8)) {
|
|
printf("\n");
|
|
fflush(stdout);
|
|
if (bidirectional_transfer_loop(input_fd,
|
|
output_fd))
|
|
die("Copying data between file descriptors failed");
|
|
return;
|
|
} else {
|
|
die("Bad command: %s", buffer);
|
|
}
|
|
}
|
|
}
|
|
|
|
int cmd_remote_fd(int argc, const char **argv, const char *prefix)
|
|
{
|
|
int input_fd = -1;
|
|
int output_fd = -1;
|
|
char *end;
|
|
|
|
if (argc != 3)
|
|
die("Expected two arguments");
|
|
|
|
input_fd = (int)strtoul(argv[2], &end, 10);
|
|
|
|
if ((end == argv[2]) || (*end != ',' && *end != '/' && *end))
|
|
die("Bad URL syntax");
|
|
|
|
if (*end == '/' || !*end) {
|
|
output_fd = input_fd;
|
|
} else {
|
|
char *end2;
|
|
output_fd = (int)strtoul(end + 1, &end2, 10);
|
|
|
|
if ((end2 == end + 1) || (*end2 != '/' && *end2))
|
|
die("Bad URL syntax");
|
|
}
|
|
|
|
command_loop(input_fd, output_fd);
|
|
return 0;
|
|
}
|