bpo-29619: Convert st_ino using unsigned integer #557

haypo · Mar 8, 2017

bpo-29619: os.stat() and os.DirEntry.inodeo() now convert inode
(st_ino) using unsigned integers.

zhangyangyu · Mar 8, 2017

zhangyangyu approved these changes

serhiy-storchaka · Mar 8, 2017

serhiy-storchaka requested changes

Use Py_BUILD_ASSERT.

Should test sizeof(st->st_ino) <= sizeof(unsigned long long).

Ooops, I wrote my assertion backwards... Fixed, thanks!

sizeof(self->win32_file_index) <= sizeof(unsigned long long)

Fixed.

serhiy-storchaka · Mar 8, 2017

serhiy-storchaka approved these changes

haypo · Mar 9, 2017

Ok, let's start with a backport to 3.6: #584

the-knights-who-say-ni added the CLA signed label Mar 8, 2017

haypo added the bugfix label Mar 8, 2017

serhiy-storchaka added the needs backport to 3.6 label Mar 8, 2017

haypo deleted the haypo:unsigned_st_ino branch Mar 9, 2017

berkerpeksag removed the needs backport to 3.6 label Mar 18, 2017

@@ -1927,11 +1927,13 @@ _pystat_fromstructstat(STRUCT_STAT *st)
              return NULL;
          PyStructSequence_SET_ITEM(v, 0, PyLong_FromLong((long)st->st_mode));
-    -#ifdef HAVE_LARGEFILE_SUPPORT
+    +#if defined(HAVE_LARGEFILE_SUPPORT) || defined(MS_WINDOWS)
+    +    assert(sizeof(st->st_ino) >= sizeof(unsigned long long));

@@ -11409,7 +11411,8 @@ os_DirEntry_inode_impl(DirEntry *self)
              self->win32_file_index = stat.st_ino;
              self->got_file_index = 1;
          }
-    -    return PyLong_FromLongLong((long long)self->win32_file_index);
+    +    assert(sizeof(self->win32_file_index) >= sizeof(unsigned long long));

python/cpython