From e330a99f7a334fd34a93cdf0649714640c55b39e Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 21 Nov 2019 10:31:43 +0000 Subject: [PATCH] Revert "glocalfileinfo: Only return file mode, not type, as UNIX_MODE attribute" This reverts commit bfdc5fc4fc84ef8518d2d1a328c8482cf5a38e98. This changes the semantics of G_FILE_ATTRIBUTE_ID_UNIX_MODE, and we've already found one user of the previous semantics (ostree). Closes #1934 --- gio/glocalfileinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 5ba7691a6..52455672a 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c @@ -987,7 +987,7 @@ set_info_from_stat (GFileInfo *info, /* Mostly pointless on Windows. * Still, it allows for S_ISREG/S_ISDIR and IWRITE (read-only) checks. */ - _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_UNIX_MODE, statbuf->st_mode & ~S_IFMT); + _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_UNIX_MODE, statbuf->st_mode); #if defined (HAVE_STRUCT_STAT_ST_BLKSIZE) _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_UNIX_BLOCK_SIZE, statbuf->st_blksize); #endif