chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: Always use recvmsg with MSG_CMSG_CLOEXEC
[elogind.git]
/
src
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 1dc81175b5671d1682184a4bfeca39cecfab8edb..de963f70099a104fa8b972e47ad7f72f48079d46 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-123,7
+123,7
@@
static int notify_override_redirected(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_REDIRECTED))
return 0;
if (!(arg_flags & SHOW_REDIRECTED))
return 0;
- printf("%s%s%s
%s %s %s\n",
+ printf("%s%s%s %s %s %s\n",
ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(),
top, draw_special_char(DRAW_ARROW), bottom);
return 1;
ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(),
top, draw_special_char(DRAW_ARROW), bottom);
return 1;
@@
-185,16
+185,15
@@
static int found_override(const char *top, const char *bottom) {
fflush(stdout);
pid = fork();
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);
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);
}
_exit(1);
}
- wait_for_terminate_and_warn("diff", pid);
+ wait_for_terminate_and_warn("diff", pid
, false
);
putchar('\n');
return k;
putchar('\n');
return k;
@@
-226,10
+225,8
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
*c = 0;
r = get_files_in_directory(path, &list);
*c = 0;
r = get_files_in_directory(path, &list);
- if (r < 0){
- log_error_errno(r, "Failed to enumerate %s: %m", path);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to enumerate %s: %m", path);
STRV_FOREACH(file, list) {
Hashmap *h;
STRV_FOREACH(file, list) {
Hashmap *h;
@@
-307,7
+304,7
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
if (errno == ENOENT)
return 0;
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;
}
return -errno;
}
@@
-487,7
+484,7
@@
static int parse_flags(const char *flag_str, int flags) {
const char *word, *state;
size_t l;
const char *word, *state;
size_t l;
- FOREACH_WORD
(word, l, flag_str
, state) {
+ FOREACH_WORD
_SEPARATOR(word, l, flag_str, ","
, state) {
if (strneq("masked", word, l))
flags |= SHOW_MASKED;
else if (strneq ("equivalent", word, l))
if (strneq("masked", word, l))
flags |= SHOW_MASKED;
else if (strneq ("equivalent", word, l))