mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
74543a0423
Most of the callers of packet_read_line just read into a
static 1000-byte buffer (callers which handle arbitrary
binary data already use LARGE_PACKET_MAX). This works fine
in practice, because:
1. The only variable-sized data in these lines is a ref
name, and refs tend to be a lot shorter than 1000
characters.
2. When sending ref lines, git-core always limits itself
to 1000 byte packets.
However, the only limit given in the protocol specification
in Documentation/technical/protocol-common.txt is
LARGE_PACKET_MAX; the 1000 byte limit is mentioned only in
pack-protocol.txt, and then only describing what we write,
not as a specific limit for readers.
This patch lets us bump the 1000-byte limit to
LARGE_PACKET_MAX. Even though git-core will never write a
packet where this makes a difference, there are two good
reasons to do this:
1. Other git implementations may have followed
protocol-common.txt and used a larger maximum size. We
don't bump into it in practice because it would involve
very long ref names.
2. We may want to increase the 1000-byte limit one day.
Since packets are transferred before any capabilities,
it's difficult to do this in a backwards-compatible
way. But if we bump the size of buffer the readers can
handle, eventually older versions of git will be
obsolete enough that we can justify bumping the
writers, as well. We don't have plans to do this
anytime soon, but there is no reason not to start the
clock ticking now.
Just bumping all of the reading bufs to LARGE_PACKET_MAX
would waste memory. Instead, since most readers just read
into a temporary buffer anyway, let's provide a single
static buffer that all callers can use. We can further wrap
this detail away by having the packet_read_line wrapper just
use the buffer transparently and return a pointer to the
static storage. That covers most of the cases, and the
remaining ones already read into their own LARGE_PACKET_MAX
buffers.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
110 lines
3 KiB
C
110 lines
3 KiB
C
/*
|
|
* Copyright (c) 2006 Franck Bui-Huu
|
|
* Copyright (c) 2006 Rene Scharfe
|
|
*/
|
|
#include "cache.h"
|
|
#include "builtin.h"
|
|
#include "archive.h"
|
|
#include "transport.h"
|
|
#include "parse-options.h"
|
|
#include "pkt-line.h"
|
|
#include "sideband.h"
|
|
|
|
static void create_output_file(const char *output_file)
|
|
{
|
|
int output_fd = open(output_file, O_CREAT | O_WRONLY | O_TRUNC, 0666);
|
|
if (output_fd < 0)
|
|
die_errno(_("could not create archive file '%s'"), output_file);
|
|
if (output_fd != 1) {
|
|
if (dup2(output_fd, 1) < 0)
|
|
die_errno(_("could not redirect output"));
|
|
else
|
|
close(output_fd);
|
|
}
|
|
}
|
|
|
|
static int run_remote_archiver(int argc, const char **argv,
|
|
const char *remote, const char *exec,
|
|
const char *name_hint)
|
|
{
|
|
char *buf;
|
|
int fd[2], i, rv;
|
|
struct transport *transport;
|
|
struct remote *_remote;
|
|
|
|
_remote = remote_get(remote);
|
|
if (!_remote->url[0])
|
|
die(_("git archive: Remote with no URL"));
|
|
transport = transport_get(_remote, _remote->url[0]);
|
|
transport_connect(transport, "git-upload-archive", exec, fd);
|
|
|
|
/*
|
|
* Inject a fake --format field at the beginning of the
|
|
* arguments, with the format inferred from our output
|
|
* filename. This way explicit --format options can override
|
|
* it.
|
|
*/
|
|
if (name_hint) {
|
|
const char *format = archive_format_from_filename(name_hint);
|
|
if (format)
|
|
packet_write(fd[1], "argument --format=%s\n", format);
|
|
}
|
|
for (i = 1; i < argc; i++)
|
|
packet_write(fd[1], "argument %s\n", argv[i]);
|
|
packet_flush(fd[1]);
|
|
|
|
buf = packet_read_line(fd[0], NULL);
|
|
if (!buf)
|
|
die(_("git archive: expected ACK/NAK, got EOF"));
|
|
if (strcmp(buf, "ACK")) {
|
|
if (!prefixcmp(buf, "NACK "))
|
|
die(_("git archive: NACK %s"), buf + 5);
|
|
if (!prefixcmp(buf, "ERR "))
|
|
die(_("remote error: %s"), buf + 4);
|
|
die(_("git archive: protocol error"));
|
|
}
|
|
|
|
if (packet_read_line(fd[0], NULL))
|
|
die(_("git archive: expected a flush"));
|
|
|
|
/* Now, start reading from fd[0] and spit it out to stdout */
|
|
rv = recv_sideband("archive", fd[0], 1);
|
|
rv |= transport_disconnect(transport);
|
|
|
|
return !!rv;
|
|
}
|
|
|
|
#define PARSE_OPT_KEEP_ALL ( PARSE_OPT_KEEP_DASHDASH | \
|
|
PARSE_OPT_KEEP_ARGV0 | \
|
|
PARSE_OPT_KEEP_UNKNOWN | \
|
|
PARSE_OPT_NO_INTERNAL_HELP )
|
|
|
|
int cmd_archive(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *exec = "git-upload-archive";
|
|
const char *output = NULL;
|
|
const char *remote = NULL;
|
|
struct option local_opts[] = {
|
|
OPT_STRING('o', "output", &output, N_("file"),
|
|
N_("write the archive to this file")),
|
|
OPT_STRING(0, "remote", &remote, N_("repo"),
|
|
N_("retrieve the archive from remote repository <repo>")),
|
|
OPT_STRING(0, "exec", &exec, N_("command"),
|
|
N_("path to the remote git-upload-archive command")),
|
|
OPT_END()
|
|
};
|
|
|
|
argc = parse_options(argc, argv, prefix, local_opts, NULL,
|
|
PARSE_OPT_KEEP_ALL);
|
|
|
|
if (output)
|
|
create_output_file(output);
|
|
|
|
if (remote)
|
|
return run_remote_archiver(argc, argv, remote, exec, output);
|
|
|
|
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
|
|
|
|
return write_archive(argc, argv, prefix, 1, output, 0);
|
|
}
|