Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
83174de4
Commit
83174de4
authored
Apr 04, 2012
by
Anton Khirnov
Committed by
Max Kellermann
Apr 04, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: properly skip symlinks in path that is to be updated.
parent
8ff0197a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
NEWS
NEWS
+1
-0
update_walk.c
src/update_walk.c
+5
-1
No files found.
NEWS
View file @
83174de4
...
@@ -6,6 +6,7 @@ ver 0.16.8 (2012/??/??)
...
@@ -6,6 +6,7 @@ ver 0.16.8 (2012/??/??)
* output:
* output:
- osx: fix stuttering due to buffering bug
- osx: fix stuttering due to buffering bug
* fix endless loop in text file reader
* fix endless loop in text file reader
* update: skip symlinks in path that is to be updated
ver 0.16.7 (2012/02/04)
ver 0.16.7 (2012/02/04)
...
...
src/update_walk.c
View file @
83174de4
...
@@ -848,6 +848,9 @@ directory_make_child_checked(struct directory *parent, const char *path)
...
@@ -848,6 +848,9 @@ directory_make_child_checked(struct directory *parent, const char *path)
return
NULL
;
return
NULL
;
}
}
if
(
skip_symlink
(
parent
,
path
))
return
NULL
;
/* if we're adding directory paths, make sure to delete filenames
/* if we're adding directory paths, make sure to delete filenames
with potentially the same name */
with potentially the same name */
conflicting
=
songvec_find
(
&
parent
->
songs
,
base
);
conflicting
=
songvec_find
(
&
parent
->
songs
,
base
);
...
@@ -896,7 +899,8 @@ updatePath(const char *path)
...
@@ -896,7 +899,8 @@ updatePath(const char *path)
name
=
g_path_get_basename
(
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
);
updateInDirectory
(
parent
,
name
,
&
st
);
else
else
delete_name_in
(
parent
,
name
);
delete_name_in
(
parent
,
name
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment