undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"

Browse Source 
This reverts commit ebec842773, which
somehow mistakenly thought that any non-zero return from write(2) is
an error.
This commit is contained in:
Junio C Hamano 2011-04-18 14:14:53 -07:00
parent 4d8b32a2e1
commit 60e199c4d5
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
run-command.c
View File

@ -67,26 +67,21 @@ static int child_notifier = -1;
static void notify_parent(void) static void notify_parent(void)
{ {
/* ssize_t unused;
* execvp failed. If possible, we'd like to let start_command unused = write(child_notifier, "", 1);
* know, so failures like ENOENT can be handled right away; but
* otherwise, finish_command will still report the error.
*/
if (write(child_notifier, "", 1))
; /* yes, dear gcc -D_FORTIFY_SOURCE, there was an error. */
} }
static NORETURN void die_child(const char *err, va_list params) static NORETURN void die_child(const char *err, va_list params)
{ {
char msg[4096]; char msg[4096];
ssize_t unused;
int len = vsnprintf(msg, sizeof(msg), err, params); int len = vsnprintf(msg, sizeof(msg), err, params);
if (len > sizeof(msg)) if (len > sizeof(msg))
len = sizeof(msg); len = sizeof(msg);
if (write(child_err, "fatal: ", 7) || unused = write(child_err, "fatal: ", 7);
write(child_err, msg, len) || unused = write(child_err, msg, len);
write(child_err, "\n", 1)) unused = write(child_err, "\n", 1);
; /* yes, gcc -D_FORTIFY_SOURCE, we know there was an error. */
exit(128); exit(128);
} }
#endif #endif