Merge pull request #590 from arrbee/new-error-handling

Migrating diff to new error handling

1 files changed, 9 insertions, 0 deletions

diff --git a/src/errors.c b/src/errors.c
index 548e44a3..c25fa751 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -123,6 +123,8 @@ void giterr_set(int error_class, const char *string, ...)
 	char error_str[1024];
 	va_list arglist;
 	git_error *error;
+	const char *oserr =
+		(error_class == GITERR_OS && errno != 0) ? strerror(errno) : NULL;
 
 	error = &GIT_GLOBAL->error_t;
 	free(error->message);
@@ -131,6 +133,13 @@ void giterr_set(int error_class, const char *string, ...)
 	p_vsnprintf(error_str, sizeof(error_str), string, arglist);
 	va_end(arglist);
 
+	/* automatically suffix strerror(errno) for GITERR_OS errors */
+	if (oserr != NULL) {
+		strncat(error_str, ": ", sizeof(error_str));
+		strncat(error_str, oserr, sizeof(error_str));
+		errno = 0;
+	}
+
 	error->message = git__strdup(error_str);
 	error->klass = error_class;