chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
architecture: add string table entries for mips-le archs which were missing
[elogind.git]
/
src
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 19eaed36316c6fe9a0dabf2a051ff8d674c01866..96a9fa5ee14e0378ab643c8b29790f29cfddeaf7 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-103,8
+103,9
@@
static int notify_override_masked(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_MASKED))
return 0;
if (!(arg_flags & SHOW_MASKED))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight_red(), "[MASKED]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight_red(), "[MASKED]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-112,8
+113,9
@@
static int notify_override_equivalent(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_EQUIVALENT))
return 0;
if (!(arg_flags & SHOW_EQUIVALENT))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight_green(), "[EQUIVALENT]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-121,8
+123,9
@@
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\n",
- ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight(), "[REDIRECTED]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-130,8
+133,9
@@
static int notify_override_overridden(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_OVERRIDDEN))
return 0;
if (!(arg_flags & SHOW_OVERRIDDEN))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight(), "[OVERRIDDEN]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-139,8
+143,9
@@
static int notify_override_extended(const char *top, const char *bottom) {
if (!(arg_flags & SHOW_EXTENDED))
return 0;
if (!(arg_flags & SHOW_EXTENDED))
return 0;
- printf("%s%s%s %s → %s\n",
- ansi_highlight(), "[EXTENDED]", ansi_highlight_off(), top, bottom);
+ printf("%s%s%s %s %s %s\n",
+ ansi_highlight(), "[EXTENDED]", ansi_highlight_off(),
+ top, draw_special_char(DRAW_ARROW), bottom);
return 1;
}
return 1;
}
@@
-241,7
+246,7
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
return -ENOMEM;
d = p + strlen(toppath) + 1;
return -ENOMEM;
d = p + strlen(toppath) + 1;
- log_debug("Adding at top: %s
→ %s", d
, p);
+ log_debug("Adding at top: %s
%s %s", d, draw_special_char(DRAW_ARROW)
, p);
k = hashmap_put(top, d, p);
if (k >= 0) {
p = strdup(p);
k = hashmap_put(top, d, p);
if (k >= 0) {
p = strdup(p);
@@
-253,7
+258,7
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
return k;
}
return k;
}
- log_debug("Adding at bottom: %s
→ %s", d
, p);
+ log_debug("Adding at bottom: %s
%s %s", d, draw_special_char(DRAW_ARROW)
, p);
free(hashmap_remove(bottom, d));
k = hashmap_put(bottom, d, p);
if (k < 0) {
free(hashmap_remove(bottom, d));
k = hashmap_put(bottom, d, p);
if (k < 0) {
@@
-276,7
+281,8
@@
static int enumerate_dir_d(Hashmap *top, Hashmap *bottom, Hashmap *drops, const
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- log_debug("Adding to drops: %s → %s → %s", unit, basename(p), p);
+ log_debug("Adding to drops: %s %s %s %s %s",
+ unit, draw_special_char(DRAW_ARROW), basename(p), draw_special_char(DRAW_ARROW), p);
k = hashmap_put(h, basename(p), p);
if (k < 0) {
free(p);
k = hashmap_put(h, basename(p), p);
if (k < 0) {
free(p);
@@
-316,6
+322,8
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
if (!de)
return -errno;
if (!de)
return -errno;
+ dirent_ensure_type(d, de);
+
if (dropins && de->d_type == DT_DIR && endswith(de->d_name, ".d"))
enumerate_dir_d(top, bottom, drops, path, de->d_name);
if (dropins && de->d_type == DT_DIR && endswith(de->d_name, ".d"))
enumerate_dir_d(top, bottom, drops, path, de->d_name);
@@
-326,7
+334,7
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
if (!p)
return -ENOMEM;
if (!p)
return -ENOMEM;
- log_debug("Adding at top: %s
→ %s", basename(p
), p);
+ log_debug("Adding at top: %s
%s %s", basename(p), draw_special_char(DRAW_ARROW
), p);
k = hashmap_put(top, basename(p), p);
if (k >= 0) {
p = strdup(p);
k = hashmap_put(top, basename(p), p);
if (k >= 0) {
p = strdup(p);
@@
-337,7
+345,7
@@
static int enumerate_dir(Hashmap *top, Hashmap *bottom, Hashmap *drops, const ch
return k;
}
return k;
}
- log_debug("Adding at bottom: %s
→ %s", basename(p
), p);
+ log_debug("Adding at bottom: %s
%s %s", basename(p), draw_special_char(DRAW_ARROW
), p);
free(hashmap_remove(bottom, basename(p)));
k = hashmap_put(bottom, basename(p), p);
if (k < 0) {
free(hashmap_remove(bottom, basename(p)));
k = hashmap_put(bottom, basename(p), p);
if (k < 0) {