Commit 83174de4 authored by Anton Khirnov's avatar Anton Khirnov Committed by Max Kellermann

update: properly skip symlinks in path that is to be updated.

parent 8ff0197a
......@@ -6,6 +6,7 @@ ver 0.16.8 (2012/??/??)
* output:
- osx: fix stuttering due to buffering bug
* fix endless loop in text file reader
* update: skip symlinks in path that is to be updated
ver 0.16.7 (2012/02/04)
......
......@@ -848,6 +848,9 @@ directory_make_child_checked(struct directory *parent, const char *path)
return NULL;
}
if (skip_symlink(parent, path))
return NULL;
/* if we're adding directory paths, make sure to delete filenames
with potentially the same name */
conflicting = songvec_find(&parent->songs, base);
......@@ -896,7 +899,8 @@ updatePath(const char *path)
name = g_path_get_basename(path);
if (stat_directory_child(parent, name, &st) == 0)
if (!skip_symlink(parent, name) &&
stat_directory_child(parent, name, &st) == 0)
updateInDirectory(parent, name, &st);
else
delete_name_in(parent, name);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment