SHOW_MASKED = 1 << 0,
SHOW_EQUIVALENT = 1 << 1,
SHOW_REDIRECTED = 1 << 2,
SHOW_MASKED = 1 << 0,
SHOW_EQUIVALENT = 1 << 1,
SHOW_REDIRECTED = 1 << 2,
-static int notify_override_overriden(const char *top, const char *bottom) {
- if (!(arg_flags & SHOW_OVERRIDEN))
+static int notify_override_overridden(const char *top, const char *bottom) {
+ if (!(arg_flags & SHOW_OVERRIDDEN))
if (null_or_empty_path(top) > 0) {
notify_override_masked(top, bottom);
if (null_or_empty_path(top) > 0) {
notify_override_masked(top, bottom);
- p = join(path, "/", de->d_name, NULL);
- if (!p) {
- r = -ENOMEM;
- goto finish;
- }
+ p = strjoin(path, "/", de->d_name, NULL);
+ if (!p)
+ return -ENOMEM;
}
free(hashmap_remove(bottom, path_get_file_name(p)));
k = hashmap_put(bottom, path_get_file_name(p), p);
if (k < 0) {
free(p);
}
free(hashmap_remove(bottom, path_get_file_name(p)));
k = hashmap_put(bottom, path_get_file_name(p), p);
if (k < 0) {
free(p);
- t = join(p, "/", suffix, NULL);
+ t = strjoin(p, "/", suffix, NULL);
/* Strip prefix from the suffix */
NULSTR_FOREACH(p, prefixes) {
if (startswith(suffix, p)) {
/* Strip prefix from the suffix */
NULSTR_FOREACH(p, prefixes) {
if (startswith(suffix, p)) {
suffix += strspn(suffix, "/");
return process_suffix(prefixes, suffix);
}
suffix += strspn(suffix, "/");
return process_suffix(prefixes, suffix);
}
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" -t --type=LIST... Only display a selected set of override types\n",
program_invocation_short_name);
}
" -t --type=LIST... Only display a selected set of override types\n",
program_invocation_short_name);
}
flags |= SHOW_EQUIVALENT;
else if (strncmp("redirected", w, l) == 0)
flags |= SHOW_REDIRECTED;
flags |= SHOW_EQUIVALENT;
else if (strncmp("redirected", w, l) == 0)
flags |= SHOW_REDIRECTED;
- else if (strncmp("overriden", w, l) == 0)
- flags |= SHOW_OVERRIDEN;
+ else if (strncmp("overridden", w, l) == 0)
+ flags |= SHOW_OVERRIDDEN;
else if (strncmp("unchanged", w, l) == 0)
flags |= SHOW_UNCHANGED;
else if (strncmp("default", w, l) == 0)
else if (strncmp("unchanged", w, l) == 0)
flags |= SHOW_UNCHANGED;
else if (strncmp("default", w, l) == 0)