global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 18:59:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'mingw/master' into devel

Browse Source
This commit is contained in:
Steffen Prohaska
2008-06-14 12:05:26 +02:00
parent e77b5a4f7c 3ec8d36fbf
commit 370dbd0c74
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compat/snprintf.c
View File

@@ -13,14 +13,15 @@
int git_vsnprintf(char *str, size_t maxsize, const char *format, va_list ap)
{
char *s;
int ret;
int ret = -1;
ret = vsnprintf(str, maxsize-SNPRINTF_SIZE_CORR, format, ap);
if (ret != -1) {
/* Windows does not NUL-terminate if result fits exactly */
str[ret] = 0;
return ret;
if (maxsize > 0) {
ret = vsnprintf(str, maxsize-SNPRINTF_SIZE_CORR, format, ap);
/* Windows does not NUL-terminate if result fills buffer */
str[maxsize-1] = 0;
}
if (ret != -1)
return ret;
s = NULL;
if (maxsize < 128)