Commit 2277216613d974b5a9cd00be9120be194706ff11
2012-05-03T00:04:04
errors: Use a git_buf for building error strings
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
diff --git a/src/errors.c b/src/errors.c
index f708519..d43d7d9 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -7,6 +7,7 @@
#include "common.h"
#include "global.h"
#include "posix.h"
+#include "buffer.h"
#include <stdarg.h>
/********************************************
@@ -18,6 +19,18 @@ static git_error g_git_oom_error = {
GITERR_NOMEMORY
};
+static void set_error(int error_class, char *string)
+{
+ git_error *error = &GIT_GLOBAL->error_t;
+
+ git__free(error->message);
+
+ error->message = string;
+ error->klass = error_class;
+
+ GIT_GLOBAL->last_error = error;
+}
+
void giterr_set_oom(void)
{
GIT_GLOBAL->last_error = &g_git_oom_error;
@@ -25,66 +38,66 @@ void giterr_set_oom(void)
void giterr_set(int error_class, const char *string, ...)
{
- char error_str[1024];
+ git_buf buf = GIT_BUF_INIT;
va_list arglist;
- /* Grab errno before calling vsnprintf() so it won't be overwritten */
- const char *os_error_msg =
- (error_class == GITERR_OS && errno != 0) ? strerror(errno) : NULL;
+ int unix_error_code = 0;
+
+#ifdef GIT_WIN32
+ DWORD win32_error_code = 0;
+#endif
+
+ if (error_class == GITERR_OS) {
+ unix_error_code = errno;
+ errno = 0;
+
#ifdef GIT_WIN32
- DWORD dwLastError = GetLastError();
+ win32_error_code = GetLastError();
+ SetLastError(0);
#endif
+ }
va_start(arglist, string);
- p_vsnprintf(error_str, sizeof(error_str), string, arglist);
+ git_buf_vprintf(&buf, string, arglist);
va_end(arglist);
/* automatically suffix strerror(errno) for GITERR_OS errors */
if (error_class == GITERR_OS) {
- if (os_error_msg != NULL) {
- strncat(error_str, ": ", sizeof(error_str));
- strncat(error_str, os_error_msg, sizeof(error_str));
- errno = 0; /* reset so same error won't be reported twice */
+
+ if (unix_error_code != 0) {
+ git_buf_PUTS(&buf, ": ");
+ git_buf_puts(&buf, strerror(unix_error_code));
}
+
#ifdef GIT_WIN32
- else if (dwLastError != 0) {
+ else if (win32_error_code != 0) {
LPVOID lpMsgBuf = NULL;
FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, dwLastError, 0, (LPTSTR) &lpMsgBuf, 0, NULL);
+ NULL, win32_error_code, 0, (LPTSTR) &lpMsgBuf, 0, NULL);
if (lpMsgBuf) {
- strncat(error_str, ": ", sizeof(error_str));
- strncat(error_str, (const char *)lpMsgBuf, sizeof(error_str));
+ git_buf_PUTS(&buf, ": ");
+ git_buf_puts(&buf, lpMsgBuf);
LocalFree(lpMsgBuf);
}
-
- SetLastError(0);
}
#endif
}
- giterr_set_str(error_class, error_str);
+ if (!git_buf_oom(&buf))
+ set_error(error_class, git_buf_detach(&buf));
}
void giterr_set_str(int error_class, const char *string)
{
- git_error *error = &GIT_GLOBAL->error_t;
+ char *message = git__strdup(string);
- git__free(error->message);
-
- error->message = git__strdup(string);
- error->klass = error_class;
-
- if (error->message == NULL) {
- giterr_set_oom();
- return;
- }
-
- GIT_GLOBAL->last_error = error;
+ if (message)
+ set_error(error_class, message);
}
void giterr_set_regex(const regex_t *regex, int error_code)