freshlybakedca.ke
Git fork
Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
This reverts commit ebec842773932e6f853acac70c80f84209b5f83e, which
somehow mistakenly thought that any non-zero return from write(2) is
an error.
+6
-11
+6
-11
run-command.c
+6
-11
run-command.c
···
67
67
68
68
static void notify_parent(void)
69
69
{
70
-
/*
71
-
* execvp failed. If possible, we'd like to let start_command
72
-
* know, so failures like ENOENT can be handled right away; but
73
-
* otherwise, finish_command will still report the error.
74
-
*/
75
-
if (write(child_notifier, "", 1))
76
-
; /* yes, dear gcc -D_FORTIFY_SOURCE, there was an error. */
70
+
ssize_t unused;
71
+
unused = write(child_notifier, "", 1);
77
72
}
78
73
79
74
static NORETURN void die_child(const char *err, va_list params)
80
75
{
81
76
char msg[4096];
77
+
ssize_t unused;
82
78
int len = vsnprintf(msg, sizeof(msg), err, params);
83
79
if (len > sizeof(msg))
84
80
len = sizeof(msg);
85
81
86
-
if (write(child_err, "fatal: ", 7) ||
87
-
write(child_err, msg, len) ||
88
-
write(child_err, "\n", 1))
89
-
; /* yes, gcc -D_FORTIFY_SOURCE, we know there was an error. */
82
+
unused = write(child_err, "fatal: ", 7);
83
+
unused = write(child_err, msg, len);
84
+
unused = write(child_err, "\n", 1);
90
85
exit(128);
91
86
}
92
87
#endif