luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-02 03:46:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_3785' into 'main'

Browse Source 
gio-tool-trash: Report error when emptying the trash

Closes #3785

See merge request GNOME/glib!4818
This commit is contained in:
Philip Withnall
2025-09-18 15:11:47 +00:00
parent d67aa209e2 4ab0357974
commit 68c4b3b45c
1 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
gio/gio-tool-trash.c
View File

@@ -40,14 +40,16 @@ static const GOptionEntry entries[] = {
G_OPTION_ENTRY_NULL
};
static void
delete_trash_file (GFile *file, gboolean del_file, gboolean del_children)
static gboolean
delete_trash_file (GFile *file, gboolean del_file, gboolean del_children, GError **error)
{
GFileInfo *info;
GFile *child;
GFileEnumerator *enumerator;
GError *local_error = NULL;
gboolean success = TRUE;
g_return_if_fail (g_file_has_uri_scheme (file, "trash"));
g_return_val_if_fail (g_file_has_uri_scheme (file, "trash"), FALSE);
if (del_children)
{
@@ -56,30 +58,65 @@ delete_trash_file (GFile *file, gboolean del_file, gboolean del_children)
G_FILE_ATTRIBUTE_STANDARD_TYPE,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
NULL,
NULL);
if (enumerator)
&local_error);
if (!enumerator)
{
while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL)
g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
while ((info = g_file_enumerator_next_file (enumerator, NULL, &local_error)) != NULL)
{
child = g_file_get_child (file, g_file_info_get_name (info));
/* The g_file_delete operation works differently for locations
* provided by the trash backend as it prevents modifications of
* trashed items. For that reason, it is enough to call
* g_file_delete on top-level items only.
*/
if (!delete_trash_file (child, TRUE, FALSE, &local_error))
{
child = g_file_get_child (file, g_file_info_get_name (info));
/* The g_file_delete operation works differently for locations
* provided by the trash backend as it prevents modifications of
* trashed items. For that reason, it is enough to call
* g_file_delete on top-level items only.
*/
delete_trash_file (child, TRUE, FALSE);
g_object_unref (child);
g_object_unref (info);
success = FALSE;
break;
}
g_file_enumerator_close (enumerator, NULL, NULL);
g_object_unref (enumerator);
g_object_unref (child);
g_object_unref (info);
}
if (local_error)
{
g_propagate_error (error, g_steal_pointer (&local_error));
success = FALSE;
}
if (!g_file_enumerator_close (enumerator, NULL, &local_error))
{
if (success)
g_propagate_error (error, g_steal_pointer (&local_error));
else
g_clear_error (&local_error);
success = FALSE;
}
g_object_unref (enumerator);
if (!success)
return FALSE;
}
if (del_file)
g_file_delete (file, NULL, NULL);
{
if (!g_file_delete (file, NULL, &local_error))
{
g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
}
return TRUE;
}
static gboolean
@@ -297,7 +334,12 @@ handle_trash (int argc, char *argv[], gboolean do_help)
else if (empty)
{
file = g_file_new_for_uri ("trash:");
delete_trash_file (file, FALSE, TRUE);
if (!delete_trash_file (file, FALSE, TRUE, &error))
{
print_file_error (file, error->message);
g_clear_error (&error);
retval = 1;
}
g_object_unref (file);
}