chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
delta
/
delta.c
diff --git
a/src/delta/delta.c
b/src/delta/delta.c
index 438091c72746748eb5e22ad307e4441cf6566040..9f1f8f333b545d798382ebcf034424445e33c2bf 100644
(file)
--- a/
src/delta/delta.c
+++ b/
src/delta/delta.c
@@
-21,7
+21,6
@@
***/
#include <errno.h>
***/
#include <errno.h>
-#include <assert.h>
#include <string.h>
#include <unistd.h>
#include <getopt.h>
#include <string.h>
#include <unistd.h>
#include <getopt.h>
@@
-123,7
+122,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;
@@
-193,7
+192,7
@@
static int found_override(const char *top, const char *bottom) {
_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;
@@
-484,7
+483,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))