Skip to content

Commit 4034008

Browse files
cpucpu
committed
Merge remote-tracking branch 'upstream/master' into cpu-fanotify-linux-bindings
2 parents bce5b30 + 08e8a3a commit 4034008

File tree

10 files changed

+14
-131
lines changed

10 files changed

+14
-131
lines changed

‎src/unix/bsd/freebsdlike/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,6 @@ extern "C" {
12451245
buflen: ::size_t,
12461246
result: *mut *mut ::group,
12471247
) -> ::c_int;
1248-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
12491248
pub fn getpwent_r(
12501249
pwd: *mut ::passwd,
12511250
buf: *mut ::c_char,

‎src/unix/bsd/mod.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,6 @@ extern "C" {
686686
) -> ::ssize_t;
687687

688688
pub fn sync();
689-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
690689
pub fn getgrgid_r(
691690
gid: ::gid_t,
692691
grp: *mut ::group,
@@ -702,7 +701,6 @@ extern "C" {
702701
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
703702
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
704703
pub fn getdtablesize() -> ::c_int;
705-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
706704
pub fn getgrnam_r(
707705
name: *const ::c_char,
708706
grp: *mut ::group,
@@ -729,7 +727,6 @@ extern "C" {
729727
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
730728
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
731729
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
732-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
733730
pub fn getpwnam_r(
734731
name: *const ::c_char,
735732
pwd: *mut passwd,
@@ -738,7 +735,6 @@ extern "C" {
738735
result: *mut *mut passwd,
739736
) -> ::c_int;
740737
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
741-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
742738
pub fn getpwuid_r(
743739
uid: ::uid_t,
744740
pwd: *mut passwd,
@@ -750,7 +746,6 @@ extern "C" {
750746
all(target_os = "macos", target_arch = "x86"),
751747
link_name = "sigwait$UNIX2003"
752748
)]
753-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
754749
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
755750
pub fn pthread_atfork(
756751
prepare: ::Option<unsafe extern "C" fn()>,

‎src/unix/haiku/mod.rs

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,6 +1270,13 @@ f! {
12701270
extern "C" {
12711271
pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
12721272
pub fn setrlimit(resource: ::c_int, rlim: *const ::rlimit) -> ::c_int;
1273+
pub fn utimensat(
1274+
fd: ::c_int,
1275+
path: *const ::c_char,
1276+
times: *const ::timespec,
1277+
flag: ::c_int,
1278+
) -> ::c_int;
1279+
pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int;
12731280
pub fn strerror_r(
12741281
errnum: ::c_int,
12751282
buf: *mut c_char,
@@ -1394,7 +1401,6 @@ extern "C" {
13941401
addrlen: *mut ::socklen_t,
13951402
) -> ::ssize_t;
13961403
pub fn mkstemps(template: *mut ::c_char, suffixlen: ::c_int) -> ::c_int;
1397-
pub fn futimes(fd: ::c_int, times: *const ::timeval) -> ::c_int;
13981404
pub fn lutimes(file: *const ::c_char, times: *const ::timeval) -> ::c_int;
13991405
pub fn nl_langinfo(item: ::nl_item) -> *mut ::c_char;
14001406

@@ -1430,34 +1436,23 @@ extern "C" {
14301436
argv: *const *const ::c_char,
14311437
environment: *const *const ::c_char,
14321438
) -> ::c_int;
1433-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
14341439
pub fn getgrgid_r(
14351440
gid: ::gid_t,
14361441
grp: *mut ::group,
14371442
buf: *mut ::c_char,
14381443
buflen: ::size_t,
14391444
result: *mut *mut ::group,
14401445
) -> ::c_int;
1441-
#[cfg_attr(
1442-
all(target_os = "macos", target_arch = "x86"),
1443-
link_name = "sigaltstack$UNIX2003"
1444-
)]
1445-
#[cfg_attr(target_os = "netbsd", link_name = "__sigaltstack14")]
14461446
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
14471447
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
14481448
pub fn getdtablesize() -> ::c_int;
1449-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
14501449
pub fn getgrnam_r(
14511450
name: *const ::c_char,
14521451
grp: *mut ::group,
14531452
buf: *mut ::c_char,
14541453
buflen: ::size_t,
14551454
result: *mut *mut ::group,
14561455
) -> ::c_int;
1457-
#[cfg_attr(
1458-
all(target_os = "macos", target_arch = "x86"),
1459-
link_name = "pthread_sigmask$UNIX2003"
1460-
)]
14611456
pub fn pthread_sigmask(
14621457
how: ::c_int,
14631458
set: *const sigset_t,
@@ -1468,40 +1463,27 @@ extern "C" {
14681463
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
14691464
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
14701465
pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
1471-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
1472-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
14731466
pub fn getpwnam_r(
14741467
name: *const ::c_char,
14751468
pwd: *mut passwd,
14761469
buf: *mut ::c_char,
14771470
buflen: ::size_t,
14781471
result: *mut *mut passwd,
14791472
) -> ::c_int;
1480-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
1481-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
14821473
pub fn getpwuid_r(
14831474
uid: ::uid_t,
14841475
pwd: *mut passwd,
14851476
buf: *mut ::c_char,
14861477
buflen: ::size_t,
14871478
result: *mut *mut passwd,
14881479
) -> ::c_int;
1489-
#[cfg_attr(
1490-
all(target_os = "macos", target_arch = "x86"),
1491-
link_name = "sigwait$UNIX2003"
1492-
)]
1493-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
14941480
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
14951481
pub fn pthread_atfork(
14961482
prepare: ::Option<unsafe extern "C" fn()>,
14971483
parent: ::Option<unsafe extern "C" fn()>,
14981484
child: ::Option<unsafe extern "C" fn()>,
14991485
) -> ::c_int;
15001486
pub fn getgrgid(gid: ::gid_t) -> *mut ::group;
1501-
#[cfg_attr(
1502-
all(target_os = "macos", target_arch = "x86"),
1503-
link_name = "popen$UNIX2003"
1504-
)]
15051487
pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
15061488
pub fn openpty(
15071489
amaster: *mut ::c_int,

‎src/unix/linux_like/android/mod.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2349,33 +2349,22 @@ extern "C" {
23492349
pub fn setfsgid(gid: ::gid_t) -> ::c_int;
23502350
pub fn setfsuid(uid: ::uid_t) -> ::c_int;
23512351
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
2352-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
23532352
pub fn getgrgid_r(
23542353
gid: ::gid_t,
23552354
grp: *mut ::group,
23562355
buf: *mut ::c_char,
23572356
buflen: ::size_t,
23582357
result: *mut *mut ::group,
23592358
) -> ::c_int;
2360-
#[cfg_attr(
2361-
all(target_os = "macos", target_arch = "x86"),
2362-
link_name = "sigaltstack$UNIX2003"
2363-
)]
2364-
#[cfg_attr(target_os = "netbsd", link_name = "__sigaltstack14")]
23652359
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
23662360
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
2367-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
23682361
pub fn getgrnam_r(
23692362
name: *const ::c_char,
23702363
grp: *mut ::group,
23712364
buf: *mut ::c_char,
23722365
buflen: ::size_t,
23732366
result: *mut *mut ::group,
23742367
) -> ::c_int;
2375-
#[cfg_attr(
2376-
all(target_os = "macos", target_arch = "x86"),
2377-
link_name = "pthread_sigmask$UNIX2003"
2378-
)]
23792368
pub fn pthread_sigmask(
23802369
how: ::c_int,
23812370
set: *const sigset_t,
@@ -2386,29 +2375,20 @@ extern "C" {
23862375
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
23872376
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
23882377
pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
2389-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
2390-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
23912378
pub fn getpwnam_r(
23922379
name: *const ::c_char,
23932380
pwd: *mut passwd,
23942381
buf: *mut ::c_char,
23952382
buflen: ::size_t,
23962383
result: *mut *mut passwd,
23972384
) -> ::c_int;
2398-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
2399-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
24002385
pub fn getpwuid_r(
24012386
uid: ::uid_t,
24022387
pwd: *mut passwd,
24032388
buf: *mut ::c_char,
24042389
buflen: ::size_t,
24052390
result: *mut *mut passwd,
24062391
) -> ::c_int;
2407-
#[cfg_attr(
2408-
all(target_os = "macos", target_arch = "x86"),
2409-
link_name = "sigwait$UNIX2003"
2410-
)]
2411-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
24122392
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
24132393
pub fn pthread_atfork(
24142394
prepare: ::Option<unsafe extern "C" fn()>,
@@ -2427,10 +2407,6 @@ extern "C" {
24272407
attr: *const pthread_mutexattr_t,
24282408
pshared: *mut ::c_int,
24292409
) -> ::c_int;
2430-
#[cfg_attr(
2431-
all(target_os = "macos", target_arch = "x86"),
2432-
link_name = "popen$UNIX2003"
2433-
)]
24342410
pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
24352411
pub fn faccessat(
24362412
dirfd: ::c_int,

‎src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,16 +1266,12 @@ extern "C" {
12661266
pub fn sched_getcpu() -> ::c_int;
12671267
pub fn mallinfo() -> ::mallinfo;
12681268
pub fn malloc_usable_size(ptr: *mut ::c_void) -> ::size_t;
1269-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwent_r50")]
1270-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwent_r")]
12711269
pub fn getpwent_r(
12721270
pwd: *mut ::passwd,
12731271
buf: *mut ::c_char,
12741272
buflen: ::size_t,
12751273
result: *mut *mut ::passwd,
12761274
) -> ::c_int;
1277-
#[cfg_attr(target_os = "netbsd", link_name = "__getgrent_r50")]
1278-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrent_r")]
12791275
pub fn getgrent_r(
12801276
grp: *mut ::group,
12811277
buf: *mut ::c_char,

‎src/unix/linux_like/linux/mod.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3168,23 +3168,16 @@ extern "C" {
31683168
count: ::size_t,
31693169
) -> ::ssize_t;
31703170
pub fn sigsuspend(mask: *const ::sigset_t) -> ::c_int;
3171-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrgid_r")]
31723171
pub fn getgrgid_r(
31733172
gid: ::gid_t,
31743173
grp: *mut ::group,
31753174
buf: *mut ::c_char,
31763175
buflen: ::size_t,
31773176
result: *mut *mut ::group,
31783177
) -> ::c_int;
3179-
#[cfg_attr(
3180-
all(target_os = "macos", target_arch = "x86"),
3181-
link_name = "sigaltstack$UNIX2003"
3182-
)]
3183-
#[cfg_attr(target_os = "netbsd", link_name = "__sigaltstack14")]
31843178
pub fn sigaltstack(ss: *const stack_t, oss: *mut stack_t) -> ::c_int;
31853179
pub fn sem_close(sem: *mut sem_t) -> ::c_int;
31863180
pub fn getdtablesize() -> ::c_int;
3187-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getgrnam_r")]
31883181
pub fn getgrnam_r(
31893182
name: *const ::c_char,
31903183
grp: *mut ::group,
@@ -3193,10 +3186,6 @@ extern "C" {
31933186
result: *mut *mut ::group,
31943187
) -> ::c_int;
31953188
pub fn initgroups(user: *const ::c_char, group: ::gid_t) -> ::c_int;
3196-
#[cfg_attr(
3197-
all(target_os = "macos", target_arch = "x86"),
3198-
link_name = "pthread_sigmask$UNIX2003"
3199-
)]
32003189
pub fn pthread_sigmask(
32013190
how: ::c_int,
32023191
set: *const sigset_t,
@@ -3208,29 +3197,20 @@ extern "C" {
32083197
pub fn pthread_kill(thread: ::pthread_t, sig: ::c_int) -> ::c_int;
32093198
pub fn sem_unlink(name: *const ::c_char) -> ::c_int;
32103199
pub fn daemon(nochdir: ::c_int, noclose: ::c_int) -> ::c_int;
3211-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwnam_r50")]
3212-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwnam_r")]
32133200
pub fn getpwnam_r(
32143201
name: *const ::c_char,
32153202
pwd: *mut passwd,
32163203
buf: *mut ::c_char,
32173204
buflen: ::size_t,
32183205
result: *mut *mut passwd,
32193206
) -> ::c_int;
3220-
#[cfg_attr(target_os = "netbsd", link_name = "__getpwuid_r50")]
3221-
#[cfg_attr(target_os = "solaris", link_name = "__posix_getpwuid_r")]
32223207
pub fn getpwuid_r(
32233208
uid: ::uid_t,
32243209
pwd: *mut passwd,
32253210
buf: *mut ::c_char,
32263211
buflen: ::size_t,
32273212
result: *mut *mut passwd,
32283213
) -> ::c_int;
3229-
#[cfg_attr(
3230-
all(target_os = "macos", target_arch = "x86"),
3231-
link_name = "sigwait$UNIX2003"
3232-
)]
3233-
#[cfg_attr(target_os = "solaris", link_name = "__posix_sigwait")]
32343214
pub fn sigwait(set: *const sigset_t, sig: *mut ::c_int) -> ::c_int;
32353215
pub fn pthread_atfork(
32363216
prepare: ::Option<unsafe extern "C" fn()>,
@@ -3248,10 +3228,6 @@ extern "C" {
32483228
attr: *const pthread_mutexattr_t,
32493229
pshared: *mut ::c_int,
32503230
) -> ::c_int;
3251-
#[cfg_attr(
3252-
all(target_os = "macos", target_arch = "x86"),
3253-
link_name = "popen$UNIX2003"
3254-
)]
32553231
pub fn popen(command: *const c_char, mode: *const c_char) -> *mut ::FILE;
32563232
pub fn faccessat(
32573233
dirfd: ::c_int,

‎src/unix/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,12 @@ extern "C" {
14471447
n: *mut size_t,
14481448
stream: *mut FILE,
14491449
) -> ssize_t;
1450+
1451+
pub fn lockf(
1452+
fd: ::c_int,
1453+
cmd: ::c_int,
1454+
len: ::off_t,
1455+
) -> ::c_int;
14501456
}
14511457

14521458
cfg_if! {

0 commit comments

Comments
 (0)