luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/oholy/gfile-docs' into 'master'

Browse Source 
Symlink-related fixes for `g_file_move()`

Closes #986

See merge request GNOME/glib!900
This commit is contained in:
Philip Withnall
2020-01-31 12:56:15 +00:00
parent bb501bb8be 2b5daec05c
commit c07d9434f4
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gfile.c
View File

@@ -3652,10 +3652,6 @@ g_file_copy_finish (GFile *file,
* If the flag #G_FILE_COPY_OVERWRITE is specified an already
* existing @destination file is overwritten.
*
* If the flag #G_FILE_COPY_NOFOLLOW_SYMLINKS is specified then symlinks
* will be copied as symlinks, otherwise the target of the
* @source symlink will be copied.
*
* If @cancellable is not %NULL, then the operation can be cancelled by
* triggering the cancellable object from another thread. If the operation
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
@@ -3759,7 +3755,7 @@ g_file_move (GFile *source,
return FALSE;
}
flags |= G_FILE_COPY_ALL_METADATA;
flags |= G_FILE_COPY_ALL_METADATA | G_FILE_COPY_NOFOLLOW_SYMLINKS;
if (!g_file_copy (source, destination, flags, cancellable,
progress_callback, progress_callback_data,
error))