diff options
Diffstat (limited to '')
| -rw-r--r-- | git2d/bare.c | 162 | ||||
| -rw-r--r-- | git2d/cmd1.c | 18 | ||||
| -rw-r--r-- | git2d/cmd2.c | 28 | ||||
| -rw-r--r-- | git2d/main.c | 7 | ||||
| -rw-r--r-- | git2d/rw.c | 6 | ||||
| -rw-r--r-- | git2d/session.c | 16 |
6 files changed, 109 insertions, 128 deletions
diff --git a/git2d/bare.c b/git2d/bare.c index a349e91..b580980 100644 --- a/git2d/bare.c +++ b/git2d/bare.c @@ -18,33 +18,31 @@ enum { MAXVARINTSZ = 10, }; -bare_error -bare_put_uint(struct bare_writer *ctx, uint64_t x) +bare_error bare_put_uint(struct bare_writer *ctx, uint64_t x) { uint64_t i = 0; uint8_t b[MAXVARINTSZ]; while (x >= 0x80) { - b[i] = (uint8_t)x | 0x80; + b[i] = (uint8_t) x | 0x80; x >>= 7; i++; } - b[i] = (uint8_t)x; + b[i] = (uint8_t) x; i++; return ctx->write(ctx->buffer, b, i); } -bare_error -bare_get_uint(struct bare_reader *ctx, uint64_t *x) +bare_error bare_get_uint(struct bare_reader *ctx, uint64_t *x) { bare_error err = BARE_ERROR_NONE; uint8_t shift = 0; uint64_t result = 0; - for (uint8_t i = 0;i < 10;i++) { + for (uint8_t i = 0; i < 10; i++) { uint8_t b; err = ctx->read(ctx->buffer, &b, U8SZ); @@ -53,10 +51,10 @@ bare_get_uint(struct bare_reader *ctx, uint64_t *x) } if (b < 0x80) { - result |= (uint64_t)b << shift; + result |= (uint64_t) b << shift; break; } else { - result |= ((uint64_t)b & 0x7f) << shift; + result |= ((uint64_t) b & 0x7f) << shift; shift += 7; } } @@ -66,10 +64,9 @@ bare_get_uint(struct bare_reader *ctx, uint64_t *x) return err; } -bare_error -bare_put_int(struct bare_writer *ctx, int64_t x) +bare_error bare_put_int(struct bare_writer *ctx, int64_t x) { - uint64_t ux = (uint64_t)x << 1; + uint64_t ux = (uint64_t) x << 1; if (x < 0) { ux = ~ux; @@ -78,15 +75,14 @@ bare_put_int(struct bare_writer *ctx, int64_t x) return bare_put_uint(ctx, ux); } -bare_error -bare_get_int(struct bare_reader *ctx, int64_t *x) +bare_error bare_get_int(struct bare_reader *ctx, int64_t *x) { uint64_t ux; bare_error err = bare_get_uint(ctx, &ux); if (err == BARE_ERROR_NONE) { - *x = (int64_t)(ux >> 1); + *x = (int64_t) (ux >> 1); if ((ux & 1) != 0) { *x = ~(*x); @@ -96,67 +92,62 @@ bare_get_int(struct bare_reader *ctx, int64_t *x) return err; } -bare_error -bare_put_u8(struct bare_writer *ctx, uint8_t x) +bare_error bare_put_u8(struct bare_writer *ctx, uint8_t x) { return ctx->write(ctx->buffer, &x, U8SZ); } -bare_error -bare_get_u8(struct bare_reader *ctx, uint8_t *x) +bare_error bare_get_u8(struct bare_reader *ctx, uint8_t *x) { return ctx->read(ctx->buffer, x, U8SZ); } -bare_error -bare_put_u16(struct bare_writer *ctx, uint16_t x) +bare_error bare_put_u16(struct bare_writer *ctx, uint16_t x) { - return ctx->write(ctx->buffer, (uint8_t[U16SZ]){x, x >> 8}, U16SZ); + return ctx->write(ctx->buffer, (uint8_t[U16SZ]) { + x, x >> 8} + , U16SZ); } -bare_error -bare_get_u16(struct bare_reader *ctx, uint16_t *x) +bare_error bare_get_u16(struct bare_reader *ctx, uint16_t *x) { bare_error err = ctx->read(ctx->buffer, x, U16SZ); if (err == BARE_ERROR_NONE) { - *x = (uint16_t)((uint8_t *)x)[0] - | (uint16_t)((uint8_t *)x)[1] << 8; + *x = (uint16_t) ((uint8_t *) x)[0] + | (uint16_t) ((uint8_t *) x)[1] << 8; } return err; } -bare_error -bare_put_u32(struct bare_writer *ctx, uint32_t x) +bare_error bare_put_u32(struct bare_writer *ctx, uint32_t x) { uint8_t buf[U32SZ]; - buf[0] = (uint8_t)(x); - buf[1] = (uint8_t)(x >> 8); - buf[2] = (uint8_t)(x >> 16); - buf[3] = (uint8_t)(x >> 24); + buf[0] = (uint8_t) (x); + buf[1] = (uint8_t) (x >> 8); + buf[2] = (uint8_t) (x >> 16); + buf[3] = (uint8_t) (x >> 24); return ctx->write(ctx->buffer, buf, U32SZ); } -bare_error -bare_get_u32(struct bare_reader *ctx, uint32_t *x) +bare_error bare_get_u32(struct bare_reader *ctx, uint32_t *x) { bare_error err = ctx->read(ctx->buffer, x, U32SZ); if (err == BARE_ERROR_NONE) { - *x = (uint32_t)(((uint8_t *)x)[0]) - | (uint32_t)(((uint8_t *)x)[1] << 8) - | (uint32_t)(((uint8_t *)x)[2] << 16) - | (uint32_t)(((uint8_t *)x)[3] << 24); + *x = (uint32_t) (((uint8_t *) x)[0]) + | (uint32_t) (((uint8_t *) x)[1] << 8) + | (uint32_t) (((uint8_t *) x)[2] << 16) + | (uint32_t) (((uint8_t *) x)[3] << 24); } return err; } -bare_error -bare_put_u64(struct bare_writer *ctx, uint64_t x) +bare_error bare_put_u64(struct bare_writer *ctx, uint64_t x) { uint8_t buf[U64SZ]; @@ -172,75 +163,65 @@ bare_put_u64(struct bare_writer *ctx, uint64_t x) return ctx->write(ctx->buffer, buf, U64SZ); } -bare_error -bare_get_u64(struct bare_reader *ctx, uint64_t *x) +bare_error bare_get_u64(struct bare_reader *ctx, uint64_t *x) { bare_error err = ctx->read(ctx->buffer, x, U64SZ); if (err == BARE_ERROR_NONE) { - *x = (uint64_t)((uint8_t *)x)[0] - | (uint64_t)((uint8_t *)x)[1] << 8 - | (uint64_t)((uint8_t *)x)[2] << 16 - | (uint64_t)((uint8_t *)x)[3] << 24 - | (uint64_t)((uint8_t *)x)[4] << 32 - | (uint64_t)((uint8_t *)x)[5] << 40 - | (uint64_t)((uint8_t *)x)[6] << 48 - | (uint64_t)((uint8_t *)x)[7] << 56; + *x = (uint64_t) ((uint8_t *) x)[0] + | (uint64_t) ((uint8_t *) x)[1] << 8 + | (uint64_t) ((uint8_t *) x)[2] << 16 + | (uint64_t) ((uint8_t *) x)[3] << 24 + | (uint64_t) ((uint8_t *) x)[4] << 32 + | (uint64_t) ((uint8_t *) x)[5] << 40 + | (uint64_t) ((uint8_t *) x)[6] << 48 + | (uint64_t) ((uint8_t *) x)[7] << 56; } return err; } -bare_error -bare_put_i8(struct bare_writer *ctx, int8_t x) +bare_error bare_put_i8(struct bare_writer *ctx, int8_t x) { return bare_put_u8(ctx, x); } -bare_error -bare_get_i8(struct bare_reader *ctx, int8_t *x) +bare_error bare_get_i8(struct bare_reader *ctx, int8_t *x) { - return bare_get_u8(ctx, (uint8_t *)x); + return bare_get_u8(ctx, (uint8_t *) x); } -bare_error -bare_put_i16(struct bare_writer *ctx, int16_t x) +bare_error bare_put_i16(struct bare_writer *ctx, int16_t x) { return bare_put_u16(ctx, x); } -bare_error -bare_get_i16(struct bare_reader *ctx, int16_t *x) +bare_error bare_get_i16(struct bare_reader *ctx, int16_t *x) { - return bare_get_u16(ctx, (uint16_t *)x); + return bare_get_u16(ctx, (uint16_t *) x); } -bare_error -bare_put_i32(struct bare_writer *ctx, int32_t x) +bare_error bare_put_i32(struct bare_writer *ctx, int32_t x) { return bare_put_u32(ctx, x); } -bare_error -bare_get_i32(struct bare_reader *ctx, int32_t *x) +bare_error bare_get_i32(struct bare_reader *ctx, int32_t *x) { - return bare_get_u32(ctx, (uint32_t *)x); + return bare_get_u32(ctx, (uint32_t *) x); } -bare_error -bare_put_i64(struct bare_writer *ctx, int64_t x) +bare_error bare_put_i64(struct bare_writer *ctx, int64_t x) { return bare_put_u64(ctx, x); } -bare_error -bare_get_i64(struct bare_reader *ctx, int64_t *x) +bare_error bare_get_i64(struct bare_reader *ctx, int64_t *x) { - return bare_get_u64(ctx, (uint64_t *)x); + return bare_get_u64(ctx, (uint64_t *) x); } -bare_error -bare_put_f32(struct bare_writer *ctx, float x) +bare_error bare_put_f32(struct bare_writer *ctx, float x) { uint32_t b; memcpy(&b, &x, U32SZ); @@ -248,14 +229,12 @@ bare_put_f32(struct bare_writer *ctx, float x) return bare_put_u32(ctx, b); } -bare_error -bare_get_f32(struct bare_reader *ctx, float *x) +bare_error bare_get_f32(struct bare_reader *ctx, float *x) { return ctx->read(ctx->buffer, x, U32SZ); } -bare_error -bare_put_f64(struct bare_writer *ctx, double x) +bare_error bare_put_f64(struct bare_writer *ctx, double x) { uint64_t b; memcpy(&b, &x, U64SZ); @@ -263,22 +242,19 @@ bare_put_f64(struct bare_writer *ctx, double x) return bare_put_u64(ctx, b); } -bare_error -bare_get_f64(struct bare_reader *ctx, double *x) +bare_error bare_get_f64(struct bare_reader *ctx, double *x) { return ctx->read(ctx->buffer, x, U64SZ); } -bare_error -bare_put_bool(struct bare_writer *ctx, bool x) +bare_error bare_put_bool(struct bare_writer *ctx, bool x) { - return bare_put_u8(ctx, (uint8_t)x); + return bare_put_u8(ctx, (uint8_t) x); } -bare_error -bare_get_bool(struct bare_reader *ctx, bool *x) +bare_error bare_get_bool(struct bare_reader *ctx, bool *x) { - return bare_get_u8(ctx, (uint8_t *)x); + return bare_get_u8(ctx, (uint8_t *) x); } bare_error @@ -307,8 +283,7 @@ bare_put_data(struct bare_writer *ctx, const uint8_t *src, uint64_t sz) return err; } -bare_error -bare_get_data(struct bare_reader *ctx, uint8_t *dst, uint64_t sz) +bare_error bare_get_data(struct bare_reader *ctx, uint8_t *dst, uint64_t sz) { bare_error err = BARE_ERROR_NONE; uint64_t ssz = 0; @@ -316,22 +291,19 @@ bare_get_data(struct bare_reader *ctx, uint8_t *dst, uint64_t sz) err = bare_get_uint(ctx, &ssz); if (err == BARE_ERROR_NONE) { - err = ssz <= sz \ - ? bare_get_fixed_data(ctx, dst, ssz) \ - : BARE_ERROR_BUFFER_TOO_SMALL; + err = ssz <= sz ? bare_get_fixed_data(ctx, dst, ssz) + : BARE_ERROR_BUFFER_TOO_SMALL; } return err; } -bare_error -bare_put_str(struct bare_writer *ctx, const char *src, uint64_t sz) +bare_error bare_put_str(struct bare_writer *ctx, const char *src, uint64_t sz) { - return bare_put_data(ctx, (uint8_t *)src, sz); + return bare_put_data(ctx, (uint8_t *) src, sz); } -bare_error -bare_get_str(struct bare_reader *ctx, char *dst, uint64_t sz) +bare_error bare_get_str(struct bare_reader *ctx, char *dst, uint64_t sz) { - return bare_get_data(ctx, (uint8_t *)dst, sz); + return bare_get_data(ctx, (uint8_t *) dst, sz); } diff --git a/git2d/cmd1.c b/git2d/cmd1.c index d30fc04..a7d8b07 100644 --- a/git2d/cmd1.c +++ b/git2d/cmd1.c @@ -5,8 +5,7 @@ #include "x.h" -int -cmd_index(git_repository *repo, struct bare_writer *writer) +int cmd_index(git_repository *repo, struct bare_writer *writer) { /* HEAD tree */ @@ -91,15 +90,18 @@ cmd_index(git_repository *repo, struct bare_writer *writer) /* Title */ size_t msg_len = msg ? strlen(msg) : 0; - bare_put_data(writer, (const uint8_t *)(msg ? msg : ""), msg_len); + bare_put_data(writer, (const uint8_t *)(msg ? msg : ""), + msg_len); /* Author's name */ const char *author_name = author ? author->name : ""; - bare_put_data(writer, (const uint8_t *)author_name, strlen(author_name)); + bare_put_data(writer, (const uint8_t *)author_name, + strlen(author_name)); /* Author's email */ const char *author_email = author ? author->email : ""; - bare_put_data(writer, (const uint8_t *)author_email, strlen(author_email)); + bare_put_data(writer, (const uint8_t *)author_email, + strlen(author_email)); /* Author's date */ /* TODO: Pass the integer instead of a string */ @@ -107,10 +109,12 @@ cmd_index(git_repository *repo, struct bare_writer *writer) char timebuf[64]; struct tm *tm = localtime(&time); if (tm) - strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm); + strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", + tm); else strcpy(timebuf, "unknown"); - bare_put_data(writer, (const uint8_t *)timebuf, strlen(timebuf)); + bare_put_data(writer, (const uint8_t *)timebuf, + strlen(timebuf)); git_commit_free(commit); count++; diff --git a/git2d/cmd2.c b/git2d/cmd2.c index eb8983d..dd72ddb 100644 --- a/git2d/cmd2.c +++ b/git2d/cmd2.c @@ -6,11 +6,12 @@ #include "x.h" int -cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer *writer) +cmd_treeraw(git_repository *repo, struct bare_reader *reader, + struct bare_writer *writer) { /* Path */ - char path[4096] = {0}; - int err = bare_get_data(reader, (uint8_t *)path, sizeof(path) - 1); + char path[4096] = { 0 }; + int err = bare_get_data(reader, (uint8_t *) path, sizeof(path) - 1); if (err != BARE_ERROR_NONE) { bare_put_uint(writer, 11); return -1; @@ -24,7 +25,7 @@ cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer bare_put_uint(writer, 4); return -1; } - git_tree *tree = (git_tree *)head_obj; + git_tree *tree = (git_tree *) head_obj; /* Path in tree */ git_tree_entry *entry = NULL; @@ -46,7 +47,7 @@ cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer /* Tree */ git_object *tree_obj = NULL; if (entry == NULL) { - tree_obj = (git_object *)tree; + tree_obj = (git_object *) tree; } else { err = git_tree_entry_to_object(&tree_obj, repo, entry); if (err != 0) { @@ -54,14 +55,15 @@ cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer goto cleanup; } } - git_tree *subtree = (git_tree *)tree_obj; + git_tree *subtree = (git_tree *) tree_obj; size_t count = git_tree_entrycount(subtree); bare_put_uint(writer, 0); bare_put_uint(writer, 1); bare_put_uint(writer, count); for (size_t i = 0; i < count; i++) { - const git_tree_entry *subentry = git_tree_entry_byindex(subtree, i); + const git_tree_entry *subentry = + git_tree_entry_byindex(subtree, i); const char *name = git_tree_entry_name(subentry); git_otype type = git_tree_entry_type(subentry); uint32_t mode = git_tree_entry_filemode(subentry); @@ -75,8 +77,9 @@ cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer entry_type = 2; git_object *subobj = NULL; - if (git_tree_entry_to_object(&subobj, repo, subentry) == 0) { - git_blob *b = (git_blob *)subobj; + if (git_tree_entry_to_object + (&subobj, repo, subentry) == 0) { + git_blob *b = (git_blob *) subobj; size = git_blob_rawsize(b); git_blob_free(b); } @@ -85,7 +88,8 @@ cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer bare_put_uint(writer, entry_type); bare_put_uint(writer, mode); bare_put_uint(writer, size); - bare_put_data(writer, (const uint8_t *)name, strlen(name)); + bare_put_data(writer, (const uint8_t *)name, + strlen(name)); } if (entry != NULL) { git_tree_free(subtree); @@ -98,7 +102,7 @@ cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer bare_put_uint(writer, 7); goto cleanup; } - git_blob *blob = (git_blob *)blob_obj; + git_blob *blob = (git_blob *) blob_obj; const void *content = git_blob_rawcontent(blob); if (content == NULL) { bare_put_uint(writer, 8); @@ -114,7 +118,7 @@ cmd_treeraw(git_repository *repo, struct bare_reader *reader, struct bare_writer bare_put_uint(writer, -1); } -cleanup: + cleanup: if (entry != NULL) git_tree_entry_free(entry); git_tree_free(tree); diff --git a/git2d/main.c b/git2d/main.c index 14b9f90..b4e8e61 100644 --- a/git2d/main.c +++ b/git2d/main.c @@ -10,8 +10,7 @@ #include "x.h" -int -main(int argc, char **argv) +int main(int argc, char **argv) { if (argc != 2) { errx(1, "provide one argument: the socket path"); @@ -35,7 +34,9 @@ main(int argc, char **argv) if (bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_un))) { if (errno == EADDRINUSE) { unlink(argv[1]); - if (bind(sock, (struct sockaddr *)&addr, sizeof(struct sockaddr_un))) + if (bind + (sock, (struct sockaddr *)&addr, + sizeof(struct sockaddr_un))) err(1, "bind"); } else { err(1, "bind"); @@ -5,16 +5,14 @@ #include "x.h" -bare_error -conn_read(void *buffer, void *dst, uint64_t sz) +bare_error conn_read(void *buffer, void *dst, uint64_t sz) { conn_io_t *io = buffer; ssize_t rsz = read(io->fd, dst, sz); return (rsz == (ssize_t) sz) ? BARE_ERROR_NONE : BARE_ERROR_READ_FAILED; } -bare_error -conn_write(void *buffer, const void *src, uint64_t sz) +bare_error conn_write(void *buffer, const void *src, uint64_t sz) { conn_io_t *io = buffer; const uint8_t *data = src; diff --git a/git2d/session.c b/git2d/session.c index 23131ea..0a945ee 100644 --- a/git2d/session.c +++ b/git2d/session.c @@ -5,8 +5,7 @@ #include "x.h" -void * -session(void *_conn) +void *session(void *_conn) { int conn = *(int *)_conn; free((int *)_conn); @@ -24,7 +23,7 @@ session(void *_conn) }; /* Repo path */ - char path[4096] = {0}; + char path[4096] = { 0 }; err = bare_get_data(&reader, (uint8_t *) path, sizeof(path) - 1); if (err != BARE_ERROR_NONE) { goto close; @@ -33,7 +32,11 @@ session(void *_conn) /* Open repo */ git_repository *repo = NULL; - err = git_repository_open_ext(&repo, path, GIT_REPOSITORY_OPEN_NO_SEARCH | GIT_REPOSITORY_OPEN_BARE | GIT_REPOSITORY_OPEN_NO_DOTGIT, NULL); + err = + git_repository_open_ext(&repo, path, + GIT_REPOSITORY_OPEN_NO_SEARCH | + GIT_REPOSITORY_OPEN_BARE | + GIT_REPOSITORY_OPEN_NO_DOTGIT, NULL); if (err != 0) { bare_put_uint(&writer, 1); goto close; @@ -65,12 +68,11 @@ session(void *_conn) goto free_repo; } -free_repo: + free_repo: git_repository_free(repo); -close: + close: close(conn); return NULL; } - |