dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

systemctl: minor modernizations/simplifications

Browse Source
This commit is contained in:
Lennart Poettering
2022-11-22 17:13:36 +01:00
parent 8eda5560b0
commit 2865507008
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/systemctl/systemctl-edit.c
View File

@@ -110,7 +110,12 @@ int verb_cat(int argc, char *argv[], void *userdata) {
return rc;
}
static int create_edit_temp_file(const char *new_path, const char *original_path, char ** const original_unit_paths, char **ret_tmp_fn) {
static int create_edit_temp_file(
const char *new_path,
const char *original_path,
char ** const original_unit_paths,
char **ret_tmp_fn) {
_cleanup_free_ char *t = NULL;
int r;
@@ -154,8 +159,7 @@ static int create_edit_temp_file(const char *new_path, const char *original_path
if (!f)
return log_error_errno(errno, "Failed to open \"%s\": %m", t);
r = fchmod(fileno(f), 0644);
if (r < 0)
if (fchmod(fileno(f), 0644) < 0)
return log_error_errno(errno, "Failed to change mode of \"%s\": %m", t);
r = read_full_file(new_path, &new_contents, NULL);
@@ -200,7 +204,6 @@ static int create_edit_temp_file(const char *new_path, const char *original_path
}
*ret_tmp_fn = TAKE_PTR(t);
return 0;
}
@@ -222,9 +225,7 @@ static int get_file_to_edit(
run = path_join(paths->runtime_config, name);
if (!run)
return log_oom();
}
if (arg_runtime) {
if (access(path, F_OK) >= 0)
return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
"Refusing to create \"%s\" because it would be overridden by \"%s\" anyway.",