summaryrefslogtreecommitdiff
path: root/builtin-bundle.c
diff options
context:
space:
mode:
authorMark Levedahl <mdl123@verizon.net>2007-08-11 00:39:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-11 05:33:44 (GMT)
commit21a02980f9025c3a338fb897796542ddef8707d1 (patch)
treed27f3e72dca0076d0901c4a05ebfbbfb721c00ce /builtin-bundle.c
parent442b67a55972e69a054eb1206bbbdf044532130a (diff)
downloadgit-21a02980f9025c3a338fb897796542ddef8707d1.zip
git-21a02980f9025c3a338fb897796542ddef8707d1.tar.gz
git-21a02980f9025c3a338fb897796542ddef8707d1.tar.bz2
builtin-bundle - use buffered reads for bundle header
This eliminates all use of byte-at-a-time reading of data in this function: as Junio noted, a bundle file is seekable so we can reset the file position to the first part of the pack-file using lseek after reading the header. Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-bundle.c')
-rw-r--r--builtin-bundle.c37
1 files changed, 13 insertions, 24 deletions
diff --git a/builtin-bundle.c b/builtin-bundle.c
index b954213..f4b4f03 100644
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -44,38 +44,21 @@ struct bundle_header {
struct ref_list references;
};
-/* this function returns the length of the string */
-static int read_string(int fd, char *buffer, int size)
-{
- int i;
- for (i = 0; i < size - 1; i++) {
- ssize_t count = xread(fd, buffer + i, 1);
- if (count < 0)
- return error("Read error: %s", strerror(errno));
- if (count == 0) {
- i--;
- break;
- }
- if (buffer[i] == '\n')
- break;
- }
- buffer[i + 1] = '\0';
- return i + 1;
-}
-
/* returns an fd */
static int read_header(const char *path, struct bundle_header *header) {
char buffer[1024];
- int fd = open(path, O_RDONLY);
+ int fd;
+ long fpos;
+ FILE *ffd = fopen(path, "rb");
- if (fd < 0)
+ if (!ffd)
return error("could not open '%s'", path);
- if (read_string(fd, buffer, sizeof(buffer)) < 0 ||
+ if (!fgets(buffer, sizeof(buffer), ffd) ||
strcmp(buffer, bundle_signature)) {
- close(fd);
+ fclose(ffd);
return error("'%s' does not look like a v2 bundle file", path);
}
- while (read_string(fd, buffer, sizeof(buffer)) > 0
+ while (fgets(buffer, sizeof(buffer), ffd)
&& buffer[0] != '\n') {
int is_prereq = buffer[0] == '-';
int offset = is_prereq ? 1 : 0;
@@ -97,6 +80,12 @@ static int read_header(const char *path, struct bundle_header *header) {
add_to_ref_list(sha1, isspace(delim) ?
buffer + 41 + offset : "", list);
}
+ fpos = ftell(ffd);
+ fclose(ffd);
+ fd = open(path, O_RDONLY);
+ if (fd < 0)
+ return error("could not open '%s'", path);
+ lseek(fd, fpos, SEEK_SET);
return fd;
}