aa23c98450
This commit is an implementation of [RFC 1415][rfc] which deprecates all types in the `std::os::*::raw` modules. [rfc]: https://github.com/rust-lang/rfcs/blob/master/text/1415-trim-std-os.md Many of the types in these modules don't actually have a canonical platform representation, for example the definition of `stat` on 32-bit Linux will change depending on whether C code is compiled with LFS support or not. Unfortunately the current types in `std::os::*::raw` are billed as "compatible with C", which in light of this means it isn't really possible. To make matters worse, platforms like Android sometimes define these types as *smaller* than the way they're actually represented in the `stat` structure itself. This means that when methods like `DirEntry::ino` are called on Android the result may be truncated as we're tied to returning a `ino_t` type, not the underlying type. The commit here incorporates two backwards-compatible components: * Deprecate all `raw` types that aren't in `std::os::raw` * Expand the `std::os::*::fs::MetadataExt` trait on all platforms for method accessors of all fields. The fields now returned widened types which are the same across platforms (consistency across platforms is not required, however, it's just convenient). and two also backwards-incompatible components: * Change the definition of all `std::os::*::raw` type aliases to correspond to the newly widened types that are being returned on each platform. * Change the definition of `std::os::*::raw::stat` on Linux to match the LFS definitions rather than the standard ones. The breaking changes here will specifically break code that assumes that `libc` and `std` agree on the definition of `std::os::*::raw` types, or that the `std` types are faithful representations of the types in C. An [audit] has been performed of crates.io to determine the fallout which was determined two be minimal, with the two found cases of breakage having been fixed now. [audit]: https://github.com/rust-lang/rfcs/pull/1415#issuecomment-180645582 --- Ok, so after all that, we're finally able to support LFS on Linux! This commit then simultaneously starts using `stat64` and friends on Linux to ensure that we can open >4GB files on 32-bit Linux. Yay! Closes #28978 Closes #30050 Closes #31549
166 lines
6.1 KiB
Rust
166 lines
6.1 KiB
Rust
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
//! Android-specific raw type definitions
|
|
|
|
#![stable(feature = "raw_ext", since = "1.1.0")]
|
|
#![rustc_deprecated(since = "1.8.0",
|
|
reason = "these type aliases are no longer supported by \
|
|
the standard library, the `libc` crate on \
|
|
crates.io should be used instead for the correct \
|
|
definitions")]
|
|
#![allow(deprecated)]
|
|
|
|
use os::raw::c_long;
|
|
|
|
#[unstable(feature = "pthread_t", issue = "29791")] pub type pthread_t = c_long;
|
|
|
|
#[doc(inline)]
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub use self::arch::{dev_t, mode_t, blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t};
|
|
|
|
#[cfg(any(target_arch = "arm", target_arch = "x86"))]
|
|
mod arch {
|
|
use os::raw::{c_uint, c_uchar, c_ulonglong, c_longlong, c_ulong};
|
|
use os::unix::raw::{uid_t, gid_t};
|
|
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type dev_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type mode_t = u32;
|
|
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type blkcnt_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type blksize_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type ino_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type nlink_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type off_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type time_t = i64;
|
|
|
|
#[repr(C)]
|
|
#[derive(Clone)]
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub struct stat {
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_dev: c_ulonglong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __pad0: [c_uchar; 4],
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __st_ino: u32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mode: c_uint,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_nlink: c_uint,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_uid: uid_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_gid: gid_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_rdev: c_ulonglong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __pad3: [c_uchar; 4],
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_size: c_longlong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_blksize: u32,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_blocks: c_ulonglong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_atime: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_atime_nsec: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mtime: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mtime_nsec: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ctime: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ctime_nsec: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ino: c_ulonglong,
|
|
}
|
|
|
|
}
|
|
|
|
|
|
#[cfg(target_arch = "aarch64")]
|
|
mod arch {
|
|
use os::raw::{c_uchar, c_ulong};
|
|
use os::unix::raw::{uid_t, gid_t};
|
|
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type dev_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type mode_t = u32;
|
|
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type blkcnt_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type blksize_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type ino_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type nlink_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type off_t = u64;
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub type time_t = i64;
|
|
|
|
#[repr(C)]
|
|
#[derive(Clone)]
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub struct stat {
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_dev: dev_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __pad0: [c_uchar; 4],
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __st_ino: ino_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mode: mode_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_nlink: nlink_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_uid: uid_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_gid: gid_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_rdev: dev_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub __pad3: [c_uchar; 4],
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_size: off_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_blksize: blksize_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_blocks: blkcnt_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_atime: time_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_atime_nsec: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mtime: time_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_mtime_nsec: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ctime: time_t,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ctime_nsec: c_ulong,
|
|
#[stable(feature = "raw_ext", since = "1.1.0")]
|
|
pub st_ino: ino_t,
|
|
}
|
|
}
|
|
|