X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=99305716ed7a30998a255238ce44a23ea4e4e4ae;hb=820d3acfe924e58965d14b4711d5df31c5db199a;hp=4753fb38c406e5f69f7f009014a2f5d21f316e1e;hpb=23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41;p=elogind.git diff --git a/src/delta/delta.c b/src/delta/delta.c index 4753fb38c..99305716e 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -185,16 +185,15 @@ static int found_override(const char *top, const char *bottom) { fflush(stdout); pid = fork(); - if (pid < 0) { - log_error("Failed to fork off diff: %m"); - return -errno; - } else if (pid == 0) { + if (pid < 0) + return log_error_errno(errno, "Failed to fork off diff: %m"); + else if (pid == 0) { execlp("diff", "diff", "-us", "--", bottom, top, NULL); - log_error("Failed to execute diff: %m"); + log_error_errno(errno, "Failed to execute diff: %m"); _exit(1); } - wait_for_terminate_and_warn("diff", pid); + wait_for_terminate_and_warn("diff", pid, false); putchar('\n'); return k; @@ -305,7 +304,7 @@ static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch if (errno == ENOENT) return 0; - log_error("Failed to open %s: %m", path); + log_error_errno(errno, "Failed to open %s: %m", path); return -errno; }