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

glocalfileinfo: Preserve microseconds for access/modify times

Browse Source 
When setting the file time using utimensat, don't ignore
microseconds for access/modify times. By doing that, they're preserved
when using g_file_info_set_modification_date_time and then setting the file's
attributes from it.

Fixes #3116
This commit is contained in:
Lukáš Tyrychtr 2023-09-18 14:36:31 +02:00 committed by Philip Withnall
parent af912ba017
commit 0e8e941e95
2 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gio/glocalfileinfo.c
View File

@ -2832,6 +2832,16 @@ set_mtime_atime (char *filename,
} }
} }
if (atime_usec_value)
{
guint32 val_usec = 0;
if (!get_uint32 (atime_usec_value, &val_usec, error))
return FALSE;
times_n[0].tv_nsec = val_usec * 1000;
}
if (atime_nsec_value) if (atime_nsec_value)
{ {
guint32 val_nsec = 0; guint32 val_nsec = 0;
@ -2861,6 +2871,16 @@ set_mtime_atime (char *filename,
} }
} }
if (mtime_usec_value)
{
guint32 val_usec = 0;
if (!get_uint32 (mtime_usec_value, &val_usec, error))
return FALSE;
times_n[1].tv_nsec = val_usec * 1000;
}
if (mtime_nsec_value) if (mtime_nsec_value)
{ {
guint32 val_nsec = 0; guint32 val_nsec = 0;

45
gio/tests/g-file-info.c
View File

@ -1102,6 +1102,50 @@ test_xattrs (void)
g_object_unref (file); g_object_unref (file);
} }
static void
test_set_modified_date_time_precision (void)
{
GDateTime *modified = NULL;
GFile *file = NULL;
GFileIOStream *stream = NULL;
GFileInfo *info = NULL;
GError *local_error = NULL;
g_test_summary ("Test that g_file_info_set_modified_date_time() preserves microseconds");
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/3116");
file = g_file_new_tmp ("g-file-info-test-set-modified-date-time-precision-XXXXXX", &stream, &local_error);
g_assert_no_error (local_error);
modified = g_date_time_new_from_iso8601 ("2000-01-01T00:00:00.123456Z", NULL);
info = g_file_query_info (file,
G_FILE_ATTRIBUTE_TIME_MODIFIED ","
G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC ","
G_FILE_ATTRIBUTE_TIME_MODIFIED_NSEC, G_FILE_QUERY_INFO_NONE, NULL, &local_error);
g_assert_no_error (local_error);
g_file_info_set_modification_date_time (info, modified);
g_assert_true (g_file_set_attributes_from_info (file, info, G_FILE_QUERY_INFO_NONE, NULL, &local_error));
g_assert_no_error (local_error);
g_clear_object (&info);
g_clear_pointer (&modified, g_date_time_unref);
info = g_file_query_info (file,
G_FILE_ATTRIBUTE_TIME_MODIFIED ","
G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC ","
G_FILE_ATTRIBUTE_TIME_MODIFIED_NSEC, G_FILE_QUERY_INFO_NONE, NULL, &local_error);
g_assert_no_error (local_error);
g_assert_cmpuint (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC), ==, 123456);
g_clear_object (&stream);
g_clear_object (&info);
g_clear_object (&file);
}
int int
main (int argc, main (int argc,
char *argv[]) char *argv[])
@ -1116,6 +1160,7 @@ main (int argc,
g_test_add_func ("/g-file-info/internal-enhanced-stdio", test_internal_enhanced_stdio); g_test_add_func ("/g-file-info/internal-enhanced-stdio", test_internal_enhanced_stdio);
#endif #endif
g_test_add_func ("/g-file-info/xattrs", test_xattrs); g_test_add_func ("/g-file-info/xattrs", test_xattrs);
g_test_add_func ("/g-file-info/set-modified-date-time-precision", test_set_modified_date_time_precision);
return g_test_run(); return g_test_run();
} }