mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
![Jeff King](/assets/img/avatar_default.png)
The packet_read_line() function dies if it gets an unexpected EOF. It only returns NULL if we get a flush packet (or technically, a zero-length "0004" packet, but nobody is supposed to send those, and they are indistinguishable from a flush in this interface). Let's correct error messages which claim an unexpected EOF; it's really an unexpected flush packet. While we're here, let's also check "!line" instead of "!len" in the second case. The two events should always coincide, but checking "!line" makes it more obvious that we are not about to dereference NULL. 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_fmt(fd[1], "argument --format=%s\n", format);
|
|
}
|
|
for (i = 1; i < argc; i++)
|
|
packet_write_fmt(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 a flush packet"));
|
|
if (strcmp(buf, "ACK")) {
|
|
if (starts_with(buf, "NACK "))
|
|
die(_("git archive: NACK %s"), buf + 5);
|
|
if (starts_with(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_FILENAME('o', "output", &output,
|
|
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, output, 0);
|
|
}
|