Skip to content

Commit da95caa

Browse files
authored
Merge pull request #4222 from no1wudi/main
Fixes for NuttX target
2 parents 4869273 + cb668df commit da95caa

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/unix/nuttx/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ s! {
5454

5555
pub struct passwd {
5656
pub pw_name: *const c_char,
57+
pub pw_passwd: *const c_char,
5758
pub pw_uid: u32,
5859
pub pw_gid: u32,
5960
pub pw_gecos: *const c_char,
@@ -128,7 +129,7 @@ s! {
128129
pub tm_yday: i32,
129130
pub tm_isdst: i32,
130131
pub tm_gmtoff: isize,
131-
pub tm_zone: *const i8,
132+
pub tm_zone: *const c_char,
132133
__reserved: [usize; __DEFAULT_RESERVED_SIZE__],
133134
}
134135

@@ -165,7 +166,7 @@ s! {
165166

166167
pub struct dirent {
167168
pub d_type: u8,
168-
pub d_name: [i8; __NAME_MAX__ + 1],
169+
pub d_name: [c_char; __NAME_MAX__ + 1],
169170
}
170171

171172
pub struct fd_set {
@@ -247,6 +248,7 @@ s! {
247248
// for example, struct passwd, https://pubs.opengroup.org/onlinepubs/009695399/basedefs/pwd.h.html,
248249
// POSIX only defines following fields in struct passwd:
249250
// char *pw_name User's login name.
251+
// char *pw_passwd Encrypted password.
250252
// uid_t pw_uid Numerical user ID.
251253
// gid_t pw_gid Numerical group ID.
252254
// char *pw_dir Initial working directory.

0 commit comments

Comments
 (0)