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

g_local_file_trash: write info file first

Browse Source 
Recent changes to file monitors removed the delay before events were
reported.  Among other things, this caused the trash backend of gvfs to
notice trashed files sooner than before.

On noticing trashed files, the backend tries to read the info file to
discover (among other things) the original location of the file.

Unfortunately, g_local_file_trash() does a strange dance when trashing a
file.  It does a loop of open(O_EXCL) in order to file an empty filename
in the trash to write an info file to, trashes the file, and only then
writes the contents of the info file.  This means that at the time the
file is moved to the trash, the info file is an empty stub.

Change the order so that we write out the actual content of the info
file first.  If the actual trash files then we will unlink the info file
anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=749314
This commit is contained in:
Ryan Lortie 2015-09-29 10:16:52 -04:00
parent 7c6d29967e
commit 8ece2de964
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gio/glocalfile.c
View File

@ -2103,6 +2103,34 @@ g_local_file_trash (GFile *file,
(void) g_close (fd, NULL);
/* Write the full content of the info file before trashing to make
* sure someone doesn't read an empty file. See #749314
*/
/* Use absolute names for homedir */
if (is_homedir_trash)
original_name = g_strdup (local->filename);
else
original_name = try_make_relative (local->filename, topdir);
original_name_escaped = g_uri_escape_string (original_name, "/", FALSE);
g_free (original_name);
g_free (topdir);
{
time_t t;
struct tm now;
t = time (NULL);
localtime_r (&t, &now);
delete_time[0] = 0;
strftime(delete_time, sizeof (delete_time), "%Y-%m-%dT%H:%M:%S", &now);
}
data = g_strdup_printf ("[Trash Info]\nPath=%s\nDeletionDate=%s\n",
original_name_escaped, delete_time);
g_file_set_contents (infofile, data, -1, NULL);
/* TODO: Maybe we should verify that you can delete the file from the trash
before moving it? OTOH, that is hard, as it needs a recursive scan */
@ -2146,29 +2174,6 @@ g_local_file_trash (GFile *file,
/* TODO: Do we need to update mtime/atime here after the move? */
/* Use absolute names for homedir */
if (is_homedir_trash)
original_name = g_strdup (local->filename);
else
original_name = try_make_relative (local->filename, topdir);
original_name_escaped = g_uri_escape_string (original_name, "/", FALSE);
g_free (original_name);
g_free (topdir);
{
time_t t;
struct tm now;
t = time (NULL);
localtime_r (&t, &now);
delete_time[0] = 0;
strftime(delete_time, sizeof (delete_time), "%Y-%m-%dT%H:%M:%S", &now);
}
data = g_strdup_printf ("[Trash Info]\nPath=%s\nDeletionDate=%s\n",
original_name_escaped, delete_time);
g_file_set_contents (infofile, data, -1, NULL);
g_free (infofile);
g_free (data);