Skip to content

Commit

Permalink
Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
Browse files Browse the repository at this point in the history
This reverts commit ebec842, which
somehow mistakenly thought that any non-zero return from write(2) is
an error.
  • Loading branch information
Junio C Hamano committed Apr 18, 2011
1 parent 4d8b32a commit 60e199c
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions run-command.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,21 @@ static int child_notifier = -1;

static void notify_parent(void)
{
/*
* execvp failed. If possible, we'd like to let start_command
* 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. */
ssize_t unused;
unused = write(child_notifier, "", 1);
}

static NORETURN void die_child(const char *err, va_list params)
{
char msg[4096];
ssize_t unused;
int len = vsnprintf(msg, sizeof(msg), err, params);
if (len > sizeof(msg))
len = sizeof(msg);

if (write(child_err, "fatal: ", 7) ||
write(child_err, msg, len) ||
write(child_err, "\n", 1))
; /* yes, gcc -D_FORTIFY_SOURCE, we know there was an error. */
unused = write(child_err, "fatal: ", 7);
unused = write(child_err, msg, len);
unused = write(child_err, "\n", 1);
exit(128);
}
#endif
Expand Down

0 comments on commit 60e199c

Please sign in to comment.