picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

install: use symlink_atomic() instead of unlink()+symlink() when force creating a symlink

Browse source
This commit is contained in:
Lennart Poettering 2014-06-17 00:11:47 +02:00
parent 1dacfd2ad6
commit 1f8c46040e
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/shared/install.c
View file

@ -603,13 +603,9 @@ int unit_file_mask(
continue;
if (force) {
unlink(path);
if (symlink("/dev/null", path) >= 0) {
if (symlink_atomic("/dev/null", path) >= 0) {
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL);
add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, "/dev/null");
continue;
}
}
@ -770,13 +766,9 @@ int unit_file_link(
continue;
if (force) {
unlink(path);
if (symlink(*i, path) >= 0) {
if (symlink_atomic(*i, path) >= 0) {
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, path, NULL);
add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, path, *i);
continue;
}
}
@ -1172,17 +1164,14 @@ static int create_symlink(
if (!force)
return -EEXIST;
r = unlink(new_path);
if (r < 0 && errno != ENOENT)
return -errno;
r = symlink_atomic(old_path, new_path);
if (r < 0)
return r;
if (symlink(old_path, new_path) >= 0) {
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, new_path, NULL);
add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path);
return 0;
}
add_file_change(changes, n_changes, UNIT_FILE_UNLINK, new_path, NULL);
add_file_change(changes, n_changes, UNIT_FILE_SYMLINK, new_path, old_path);
return -errno;
return 0;
}
static int install_info_symlink_alias(