From 2727b71f0547f5181653940d279854e7924788fb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Oct 2011 15:19:31 -0700 Subject: bundle: add parse_bundle_header() helper function Move most of the code from read_bundle_header() to parse_bundle_header() that takes a file descriptor that is already opened for reading, and make the former responsible only for opening the file and noticing errors. As a logical consequence of this, is_bundle() helper function can be implemented as a non-complaining variant of read_bundle_header() that does not return an open file descriptor, and can be used to tighten the check used to decide the use of bundle transport in transport_get() function. Signed-off-by: Junio C Hamano --- bundle.c | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) (limited to 'bundle.c') diff --git a/bundle.c b/bundle.c index 3aa715c40a..105b005366 100644 --- a/bundle.c +++ b/bundle.c @@ -40,19 +40,18 @@ static int strbuf_readline_fd(struct strbuf *sb, int fd) return 0; } -int read_bundle_header(const char *path, struct bundle_header *header) +static int parse_bundle_header(int fd, struct bundle_header *header, + const char *report_path) { struct strbuf buf = STRBUF_INIT; - int fd = open(path, O_RDONLY); int status = 0; - if (fd < 0) - return error("could not open '%s'", path); - /* The bundle header begins with the signature */ if (strbuf_readline_fd(&buf, fd) || strcmp(buf.buf, bundle_signature)) { - error("'%s' does not look like a v2 bundle file", path); + if (report_path) + error("'%s' does not look like a v2 bundle file", + report_path); status = -1; goto abort; } @@ -77,8 +76,9 @@ int read_bundle_header(const char *path, struct bundle_header *header) if (get_sha1_hex(buf.buf, sha1) || (40 <= buf.len && !isspace(buf.buf[40])) || (!is_prereq && buf.len <= 40)) { - error("unrecognized header: %s%s (%d)", - (is_prereq ? "-" : ""), buf.buf, (int)buf.len); + if (report_path) + error("unrecognized header: %s%s (%d)", + (is_prereq ? "-" : ""), buf.buf, (int)buf.len); status = -1; break; } else { @@ -98,6 +98,29 @@ int read_bundle_header(const char *path, struct bundle_header *header) return fd; } +int read_bundle_header(const char *path, struct bundle_header *header) +{ + int fd = open(path, O_RDONLY); + + if (fd < 0) + return error("could not open '%s'", path); + return parse_bundle_header(fd, header, path); +} + +int is_bundle(const char *path, int quiet) +{ + struct bundle_header header; + int fd = open(path, O_RDONLY); + + if (fd < 0) + return 0; + memset(&header, 0, sizeof(header)); + fd = parse_bundle_header(fd, &header, quiet ? NULL : path); + if (fd >= 0) + close(fd); + return (fd >= 0); +} + static int list_refs(struct ref_list *r, int argc, const char **argv) { int i; -- cgit v1.2.1