diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | include/git2/signature.h | 13 | ||||
| -rw-r--r-- | src/openssl_stream.c | 2 | ||||
| -rw-r--r-- | src/signature.c | 27 | ||||
| -rw-r--r-- | tests/commit/signature.c | 13 |
5 files changed, 55 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba3a5184a..337a26bd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,6 +161,8 @@ FUNCTION(TARGET_OS_LIBRARIES target) IF(THREADSAFE) TARGET_LINK_LIBRARIES(${target} ${CMAKE_THREAD_LIBS_INIT}) + LIST(APPEND LIBGIT2_PC_LIBS ${CMAKE_THREAD_LIBS_INIT}) + SET(LIBGIT2_PC_LIBS ${LIBGIT2_PC_LIBS} PARENT_SCOPE) ENDIF() ENDFUNCTION() diff --git a/include/git2/signature.h b/include/git2/signature.h index feb1b4073..7a2a0238a 100644 --- a/include/git2/signature.h +++ b/include/git2/signature.h @@ -63,6 +63,19 @@ GIT_EXTERN(int) git_signature_now(git_signature **out, const char *name, const c GIT_EXTERN(int) git_signature_default(git_signature **out, git_repository *repo); /** + * Create a new signature by parsing the given buffer, which is + * expected to be in the format "Real Name <email> timestamp tzoffset", + * where `timestamp` is the number of seconds since the Unix epoch and + * `tzoffset` is the timezone offset in `hhmm` format (note the lack + * of a colon separator). + * + * @param out new signature + * @param buf signature string + * @return 0 on success, or an error code + */ +GIT_EXTERN(int) git_signature_from_buffer(git_signature **out, const char *buf); + +/** * Create a copy of an existing signature. All internal strings are also * duplicated. * diff --git a/src/openssl_stream.c b/src/openssl_stream.c index edea8fef7..b8ab21fef 100644 --- a/src/openssl_stream.c +++ b/src/openssl_stream.c @@ -523,7 +523,7 @@ ssize_t openssl_read(git_stream *stream, void *data, size_t len) int ret; if ((ret = SSL_read(st->ssl, data, len)) <= 0) - ssl_set_error(st->ssl, ret); + return ssl_set_error(st->ssl, ret); return ret; } diff --git a/src/signature.c b/src/signature.c index d07c93323..dcc379717 100644 --- a/src/signature.c +++ b/src/signature.c @@ -200,7 +200,8 @@ int git_signature__parse(git_signature *sig, const char **buffer_out, memset(sig, 0, sizeof(git_signature)); - if ((buffer_end = memchr(buffer, ender, buffer_end - buffer)) == NULL) + if (ender && + (buffer_end = memchr(buffer, ender, buffer_end - buffer)) == NULL) return signature_error("no newline given"); if (header) { @@ -262,6 +263,30 @@ int git_signature__parse(git_signature *sig, const char **buffer_out, return 0; } +int git_signature_from_buffer(git_signature **out, const char *buf) +{ + git_signature *sig; + const char *buf_end; + int error; + + assert(out && buf); + + *out = NULL; + + sig = git__calloc(1, sizeof(git_signature)); + GITERR_CHECK_ALLOC(sig); + + buf_end = buf + strlen(buf); + error = git_signature__parse(sig, &buf, buf_end, NULL, '\0'); + + if (error) + git__free(sig); + else + *out = sig; + + return error; +} + void git_signature__writebuf(git_buf *buf, const char *header, const git_signature *sig) { int offset, hours, mins; diff --git a/tests/commit/signature.c b/tests/commit/signature.c index 0070320ae..30bc92967 100644 --- a/tests/commit/signature.c +++ b/tests/commit/signature.c @@ -86,3 +86,16 @@ void test_commit_signature__create_zero_char(void) cl_git_fail(git_signature_new(&sign, "", "x@y.z", 1234567890, 60)); cl_assert(sign == NULL); } + +void test_commit_signature__from_buf(void) +{ + git_signature *sign; + + cl_git_pass(git_signature_from_buffer(&sign, "Test User <test@test.tt> 1461698487 +0200")); + cl_assert_equal_s("Test User", sign->name); + cl_assert_equal_s("test@test.tt", sign->email); + cl_assert_equal_i(1461698487, sign->when.time); + cl_assert_equal_i(120, sign->when.offset); + git_signature_free(sign); +} + |