luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2948-gio-is-hidden' into 'main'

Browse Source 
gio: Add some missing file info attribute checks in gio-list and gio-tree

Closes #2948

See merge request GNOME/glib!3336
This commit is contained in:
Marco Trevisan 2023-03-21 14:47:47 +00:00
commit fc5fc89841
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gio/gfileinfo.c
View File

@ -1838,6 +1838,7 @@ g_file_info_get_modification_time (GFileInfo *info,
if (G_UNLIKELY (value == NULL)) if (G_UNLIKELY (value == NULL))
{ {
g_critical ("GFileInfo created without " G_FILE_ATTRIBUTE_TIME_MODIFIED); g_critical ("GFileInfo created without " G_FILE_ATTRIBUTE_TIME_MODIFIED);
result->tv_sec = result->tv_usec = 0;
g_return_if_reached (); g_return_if_reached ();
} }

6
gio/gio-tool-info.c
View File

@ -157,7 +157,8 @@ show_info (GFile *file, GFileInfo *info)
GUnixMountEntry *entry; GUnixMountEntry *entry;
#endif #endif
name = g_file_info_get_display_name (info); name = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME) ?
g_file_info_get_display_name (info) : NULL;
if (name) if (name)
{ {
/* Translators: This is a noun and represents and attribute of a file */ /* Translators: This is a noun and represents and attribute of a file */
@ -166,7 +167,8 @@ show_info (GFile *file, GFileInfo *info)
g_free (flatten); g_free (flatten);
} }
name = g_file_info_get_edit_name (info); name = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME) ?
g_file_info_get_edit_name (info) : NULL;
if (name) if (name)
{ {
/* Translators: This is a noun and represents and attribute of a file */ /* Translators: This is a noun and represents and attribute of a file */

9
gio/gio-tool-list.c
View File

@ -54,10 +54,12 @@ show_file_listing (GFileInfo *info, GFile *parent)
gboolean first_attr; gboolean first_attr;
GFile *child; GFile *child;
if ((g_file_info_get_is_hidden (info)) && !show_hidden) if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
g_file_info_get_is_hidden (info) &&
!show_hidden)
return; return;
if (print_display_names) if (print_display_names && g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
name = g_file_info_get_display_name (info); name = g_file_info_get_display_name (info);
else else
name = g_file_info_get_name (info); name = g_file_info_get_name (info);
@ -71,7 +73,8 @@ show_file_listing (GFileInfo *info, GFile *parent)
g_object_unref (child); g_object_unref (child);
} }
size = g_file_info_get_size (info); size = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_SIZE) ?
g_file_info_get_size (info) : 0;
type = file_type_to_string (g_file_info_get_file_type (info)); type = file_type_to_string (g_file_info_get_file_type (info));
if (show_long) if (show_long)
g_print ("%s\t%"G_GUINT64_FORMAT"\t(%s)", print_uris? uri: name, (guint64)size, type); g_print ("%s\t%"G_GUINT64_FORMAT"\t(%s)", print_uris? uri: name, (guint64)size, type);

11
gio/gio-tool-tree.c
View File

@ -95,7 +95,9 @@ do_tree (GFile *f, unsigned int level, guint64 pattern)
info_list = NULL; info_list = NULL;
while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL) while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL)
{ {
if (g_file_info_get_is_hidden (info) && !show_hidden) if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) &&
g_file_info_get_is_hidden (info) &&
!show_hidden)
{ {
g_object_unref (info); g_object_unref (info);
} }
@ -151,7 +153,8 @@ do_tree (GFile *f, unsigned int level, guint64 pattern)
} }
else else
{ {
if (g_file_info_get_is_symlink (info)) if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK) &&
g_file_info_get_is_symlink (info))
{ {
const char *target; const char *target;
target = g_file_info_get_symlink_target (info); target = g_file_info_get_symlink_target (info);
@ -162,7 +165,9 @@ do_tree (GFile *f, unsigned int level, guint64 pattern)
g_print ("\n"); g_print ("\n");
if ((type & G_FILE_TYPE_DIRECTORY) && if ((type & G_FILE_TYPE_DIRECTORY) &&
(follow_symlinks || !g_file_info_get_is_symlink (info))) (follow_symlinks ||
!(g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK) &&
g_file_info_get_is_symlink (info))))
{ {
guint64 new_pattern; guint64 new_pattern;
GFile *child; GFile *child;

4
gio/gpollfilemonitor.c
View File

@ -94,7 +94,9 @@ calc_event_type (GFileInfo *last,
g_strcmp0 (g_file_info_get_etag (last), g_file_info_get_etag (new)) != 0) g_strcmp0 (g_file_info_get_etag (last), g_file_info_get_etag (new)) != 0)
return G_FILE_MONITOR_EVENT_CHANGED; return G_FILE_MONITOR_EVENT_CHANGED;
if (g_file_info_get_size (last) != g_file_info_get_size (new)) if (g_file_info_has_attribute (last, G_FILE_ATTRIBUTE_STANDARD_SIZE) &&
g_file_info_has_attribute (new, G_FILE_ATTRIBUTE_STANDARD_SIZE) &&
g_file_info_get_size (last) != g_file_info_get_size (new))
return G_FILE_MONITOR_EVENT_CHANGED; return G_FILE_MONITOR_EVENT_CHANGED;
return -1; return -1;