luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-15 14:57:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gfile: Don’t copy files as private if using default permissions

Browse Source 
If a copy operation is started with `G_FILE_COPY_TARGET_DEFAULT_PERMS`,
don’t create the destination file as private. Instead, create it with
the process’ current umask (i.e. ‘default permissions’).

This is a partial re-work of commit d8f8f4d637ce43f8699ba94c9b, with
input from Ondrej Holy.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Fixes: #174
This commit is contained in:
Philip Withnall 2019-09-27 15:02:32 +01:00
parent 1b6d8e58b2
commit 56e244ecdf
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gio/gfile.c
View File

@ -3278,8 +3278,22 @@ file_copy_fallback (GFile *source,
* *
* If a future API like g_file_replace_with_info() is added, switch * If a future API like g_file_replace_with_info() is added, switch
* this code to use that. * this code to use that.
*
* Use %G_FILE_CREATE_PRIVATE unless
* - we were told to create the file with default permissions (i.e. the
* process’ umask),
* - or if the source file is on a file system which doesn’t support
* `unix::mode` (in which case it probably also makes sense to create the
* destination with default permissions because the source cannot be
* private),
* - or if the destination file is a `GLocalFile`, in which case we can
* directly open() it with the permissions from the source file.
*/ */
create_flags = G_FILE_CREATE_PRIVATE; create_flags = G_FILE_CREATE_NONE;
if (!(flags & G_FILE_COPY_TARGET_DEFAULT_PERMS) &&
g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE) &&
!G_IS_LOCAL_FILE (destination))
create_flags |= G_FILE_CREATE_PRIVATE;
if (flags & G_FILE_COPY_OVERWRITE) if (flags & G_FILE_COPY_OVERWRITE)
create_flags |= G_FILE_CREATE_REPLACE_DESTINATION; create_flags |= G_FILE_CREATE_REPLACE_DESTINATION;
@ -3289,11 +3303,13 @@ file_copy_fallback (GFile *source,
out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)), out = (GOutputStream*)_g_local_file_output_stream_replace (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
FALSE, NULL, FALSE, NULL,
flags & G_FILE_COPY_BACKUP, flags & G_FILE_COPY_BACKUP,
create_flags, info, create_flags,
(flags & G_FILE_COPY_TARGET_DEFAULT_PERMS) ? NULL : info,
cancellable, error); cancellable, error);
else else
out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)), out = (GOutputStream*)_g_local_file_output_stream_create (_g_local_file_get_filename (G_LOCAL_FILE (destination)),
FALSE, create_flags, info, FALSE, create_flags,
(flags & G_FILE_COPY_TARGET_DEFAULT_PERMS) ? NULL : info,
cancellable, error); cancellable, error);
} }
else if (flags & G_FILE_COPY_OVERWRITE) else if (flags & G_FILE_COPY_OVERWRITE)