Merge pull request #3992 from pinotree/hurd-fix-utsname

hurd: fix definition of utsname struct
rust-lang · Oct 20, 2024 · b76c4bc · b76c4bc
2 parents f68f68c + 158cd30
commit b76c4bc
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs
@@ -872,12 +872,11 @@ s! {
     }
 
     pub struct utsname {
-        pub sysname: [::c_char; 65],
-        pub nodename: [::c_char; 65],
-        pub release: [::c_char; 65],
-        pub version: [::c_char; 65],
-        pub machine: [::c_char; 65],
-        pub domainname: [::c_char; 65]
+        pub sysname: [::c_char; _UTSNAME_LENGTH],
+        pub nodename: [::c_char; _UTSNAME_LENGTH],
+        pub release: [::c_char; _UTSNAME_LENGTH],
+        pub version: [::c_char; _UTSNAME_LENGTH],
+        pub machine: [::c_char; _UTSNAME_LENGTH],
     }
 
     pub struct rlimit64 {
@@ -3436,6 +3435,9 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
 };
 pub const PTHREAD_STACK_MIN: ::size_t = 0;
 
+// Non-public helper constants
+const _UTSNAME_LENGTH: usize = 1024;
+
 const_fn! {
     {const} fn CMSG_ALIGN(len: usize) -> usize {
         len + ::mem::size_of::<usize>() - 1 & !(::mem::size_of::<usize>() - 1)