chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run: add a new "-t" mode for invoking a binary on an allocated TTY
[elogind.git]
/
src
/
shared
/
install.c
diff --git
a/src/shared/install.c
b/src/shared/install.c
index 1e90bdf725129bb45888dbca66752f718ec517f1..3b065445b071c6c42017ae863ca462246b3f0458 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-240,7
+240,7
@@
static int remove_marked_symlinks_fd(
if (!de)
break;
if (!de)
break;
- if (
ignore
_file(de->d_name))
+ if (
hidden
_file(de->d_name))
continue;
dirent_ensure_type(d, de);
continue;
dirent_ensure_type(d, de);
@@
-415,7
+415,7
@@
static int find_symlinks_fd(
if (!de)
return r;
if (!de)
return r;
- if (
ignore
_file(de->d_name))
+ if (
hidden
_file(de->d_name))
continue;
dirent_ensure_type(d, de);
continue;
dirent_ensure_type(d, de);
@@
-538,7
+538,6
@@
static int find_symlinks_in_scope(
assert(scope < _UNIT_FILE_SCOPE_MAX);
assert(name);
assert(scope < _UNIT_FILE_SCOPE_MAX);
assert(name);
-
/* First look in runtime config path */
r = get_config_path(scope, true, root_dir, &path);
if (r < 0)
/* First look in runtime config path */
r = get_config_path(scope, true, root_dir, &path);
if (r < 0)
@@
-662,7
+661,7
@@
int unit_file_unmask(
goto finish;
STRV_FOREACH(i, files) {
goto finish;
STRV_FOREACH(i, files) {
-
char *path
;
+
_cleanup_free_ char *path = NULL
;
if (!unit_name_is_valid(*i, TEMPLATE_VALID)) {
if (r == 0)
if (!unit_name_is_valid(*i, TEMPLATE_VALID)) {
if (r == 0)
@@
-678,21
+677,16
@@
int unit_file_unmask(
q = null_or_empty_path(path);
if (q > 0) {
q = null_or_empty_path(path);
if (q > 0) {
- if (unlink(path) >= 0) {
- mark_symlink_for_removal(&remove_symlinks_to, path);
+ if (unlink(path) < 0)
+ q = -errno;
+ else {
+ q = mark_symlink_for_removal(&remove_symlinks_to, path);
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL);
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL);
-
- free(path);
- continue;
}
}
-
- q = -errno;
}
if (q != -ENOENT && r == 0)
r = q;
}
if (q != -ENOENT && r == 0)
r = q;
-
- free(path);
}
}
@@
-1553,10
+1547,8
@@
int unit_file_add_dependency(
UnitFileState state;
state = unit_file_get_state(scope, root_dir, *i);
UnitFileState state;
state = unit_file_get_state(scope, root_dir, *i);
- if (state < 0) {
- log_error_errno(-state, "Failed to get unit file state for %s: %m", *i);
- return state;
- }
+ if (state < 0)
+ return log_error_errno(state, "Failed to get unit file state for %s: %m", *i);
if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) {
log_error("Failed to enable unit: Unit %s is masked", *i);
if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) {
log_error("Failed to enable unit: Unit %s is masked", *i);
@@
-2102,7
+2094,7
@@
int unit_file_preset_all(
if (!de)
break;
if (!de)
break;
- if (
ignore
_file(de->d_name))
+ if (
hidden
_file(de->d_name))
continue;
if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
continue;
if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
@@
-2214,7
+2206,7
@@
int unit_file_get_list(
if (!de)
break;
if (!de)
break;
- if (
ignore
_file(de->d_name))
+ if (
hidden
_file(de->d_name))
continue;
if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
continue;
if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))