X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdelta%2Fdelta.c;h=aec3dc899505cad7a78c33ca9c26d9e9419f9060;hb=ea8f194f4b402774aafb9bc3c3ea1c0f288f12a7;hp=a65cea51bccc389f2db238662961261f59122012;hpb=377ec8bf1907a1a227d195cc3721c4acbad19213;p=elogind.git diff --git a/src/delta/delta.c b/src/delta/delta.c index a65cea51b..aec3dc899 100644 --- a/src/delta/delta.c +++ b/src/delta/delta.c @@ -312,17 +312,17 @@ static int parse_flags(const char *flag_str, int flags) { size_t l; FOREACH_WORD(w, l, flag_str, state) { - if (strncmp("masked", w, l) == 0) + if (strneq("masked", w, l)) flags |= SHOW_MASKED; - else if (strncmp ("equivalent", w, l) == 0) + else if (strneq ("equivalent", w, l)) flags |= SHOW_EQUIVALENT; - else if (strncmp("redirected", w, l) == 0) + else if (strneq("redirected", w, l)) flags |= SHOW_REDIRECTED; - else if (strncmp("overridden", w, l) == 0) + else if (strneq("overridden", w, l)) flags |= SHOW_OVERRIDDEN; - else if (strncmp("unchanged", w, l) == 0) + else if (strneq("unchanged", w, l)) flags |= SHOW_UNCHANGED; - else if (strncmp("default", w, l) == 0) + else if (strneq("default", w, l)) flags |= SHOW_DEFAULTS; else return -EINVAL; @@ -362,7 +362,6 @@ static int parse_argv(int argc, char *argv[]) { case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; @@ -455,7 +454,7 @@ int main(int argc, char *argv[]) { arg_flags |= SHOW_OVERRIDDEN; if (!arg_no_pager) - pager_open(); + pager_open(false); if (optind < argc) { int i;