diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/compat/snprintf.c | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/compat/snprintf.c')
-rw-r--r-- | third_party/git/compat/snprintf.c | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/third_party/git/compat/snprintf.c b/third_party/git/compat/snprintf.c deleted file mode 100644 index 0b1168853778..000000000000 --- a/third_party/git/compat/snprintf.c +++ /dev/null @@ -1,69 +0,0 @@ -#include "../git-compat-util.h" - -/* - * The size parameter specifies the available space, i.e. includes - * the trailing NUL byte; but Windows's vsnprintf uses the entire - * buffer and avoids the trailing NUL, should the buffer be exactly - * big enough for the result. Defining SNPRINTF_SIZE_CORR to 1 will - * therefore remove 1 byte from the reported buffer size, so we - * always have room for a trailing NUL byte. - */ -#ifndef SNPRINTF_SIZE_CORR -#if defined(WIN32) && (!defined(__GNUC__) || __GNUC__ < 4) && (!defined(_MSC_VER) || _MSC_VER < 1900) -#define SNPRINTF_SIZE_CORR 1 -#else -#define SNPRINTF_SIZE_CORR 0 -#endif -#endif - -#undef vsnprintf -int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap) -{ - va_list cp; - char *s; - int ret = -1; - - if (maxsize > 0) { - va_copy(cp, ap); - ret = vsnprintf(str, maxsize-SNPRINTF_SIZE_CORR, format, cp); - va_end(cp); - if (ret == maxsize-1) - ret = -1; - /* Windows does not NUL-terminate if result fills buffer */ - str[maxsize-1] = 0; - } - if (ret != -1) - return ret; - - s = NULL; - if (maxsize < 128) - maxsize = 128; - - while (ret == -1) { - maxsize *= 4; - str = realloc(s, maxsize); - if (! str) - break; - s = str; - va_copy(cp, ap); - ret = vsnprintf(str, maxsize-SNPRINTF_SIZE_CORR, format, cp); - va_end(cp); - if (ret == maxsize-1) - ret = -1; - } - free(s); - return ret; -} - -int git_snprintf(char *str, size_t maxsize, const char *format, ...) -{ - va_list ap; - int ret; - - va_start(ap, format); - ret = git_vsnprintf(str, maxsize, format, ap); - va_end(ap); - - return ret; -} - |