Commit fd871b94 authored by Florian Achleitner's avatar Florian Achleitner Committed by Junio C Hamano

Add svndump_init_fd to allow reading dumps from arbitrary FDs

The existing function only allows reading from a filename or from
stdin. Allow passing of a FD and an additional FD for the back report
pipe. This allows us to retrieve the name of the pipe in the caller.
Signed-off-by: default avatarFlorian Achleitner <florian.achleitner.2.6.31@gmail.com>
Acked-by: David Michael Barr's avatarDavid Michael Barr <b@rr-dav.id.au>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 48ea9f95
......@@ -468,11 +468,9 @@ void svndump_read(const char *url)
end_revision();
}
int svndump_init(const char *filename)
static void init(int report_fd)
{
if (buffer_init(&input, filename))
return error("cannot open %s: %s", filename, strerror(errno));
fast_export_init(REPORT_FILENO);
fast_export_init(report_fd);
strbuf_init(&dump_ctx.uuid, 4096);
strbuf_init(&dump_ctx.url, 4096);
strbuf_init(&rev_ctx.log, 4096);
......@@ -482,6 +480,22 @@ int svndump_init(const char *filename)
reset_dump_ctx(NULL);
reset_rev_ctx(0);
reset_node_ctx(NULL);
return;
}
int svndump_init(const char *filename)
{
if (buffer_init(&input, filename))
return error("cannot open %s: %s", filename ? filename : "NULL", strerror(errno));
init(REPORT_FILENO);
return 0;
}
int svndump_init_fd(int in_fd, int back_fd)
{
if(buffer_fdinit(&input, xdup(in_fd)))
return error("cannot open fd %d: %s", in_fd, strerror(errno));
init(xdup(back_fd));
return 0;
}
......
......@@ -2,6 +2,7 @@
#define SVNDUMP_H_
int svndump_init(const char *filename);
int svndump_init_fd(int in_fd, int back_fd);
void svndump_read(const char *url);
void svndump_deinit(void);
void svndump_reset(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment