mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/vreportf-wo-buffering'

Browse Source 
Messages from die() etc. can be mixed up from multiple processes
without even line buffering on Windows, which has been worked
around.

* js/vreportf-wo-buffering:
  vreportf(): avoid relying on stdio buffering
This commit is contained in:
Junio C Hamano
2019-12-01 09:04:31 -08:00
parent 05fc6471e3 116d1fa6c6
commit 5444d52866
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
usage.c
View File

@ -9,14 +9,26 @@
void vreportf(const char *prefix, const char *err, va_list params) void vreportf(const char *prefix, const char *err, va_list params)
{ {
char msg[4096]; char msg[4096];
char *p; char *p, *pend = msg + sizeof(msg);
size_t prefix_len = strlen(prefix);
vsnprintf(msg, sizeof(msg), err, params); if (sizeof(msg) <= prefix_len) {
for (p = msg; *p; p++) { fprintf(stderr, "BUG!!! too long a prefix '%s'\n", prefix);
abort();
}
memcpy(msg, prefix, prefix_len);
p = msg + prefix_len;
if (vsnprintf(p, pend - p, err, params) < 0)
*p = '\0'; /* vsnprintf() failed, clip at prefix */
for (; p != pend - 1 && *p; p++) {
if (iscntrl(*p) && *p != '\t' && *p != '\n') if (iscntrl(*p) && *p != '\t' && *p != '\n')
*p = '?'; *p = '?';
} }
fprintf(stderr, "%s%s\n", prefix, msg);
*(p++) = '\n'; /* we no longer need a NUL */
fflush(stderr);
write_in_full(2, msg, p - msg);
} }
static NORETURN void usage_builtin(const char *err, va_list params) static NORETURN void usage_builtin(const char *err, va_list params)