Skip to content

Commit 6e78524

Browse files
patches::rust-libc: fix
The patch was broken because the xbstrap files were committed accidently. Signed-off-by: Anhad Singh <[email protected]>
1 parent 99ea8b4 commit 6e78524

File tree

1 file changed

+16
-23
lines changed

1 file changed

+16
-23
lines changed

patches/rust-libc/rust-libc.patch

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
1-
From 56759ca28e1aa33227e0085bcafd535ebbfdcf4c Mon Sep 17 00:00:00 2001
2-
From: Andy-Python-Programmer <[email protected]>
3-
Date: Mon, 10 Apr 2023 14:02:17 +1000
1+
From a23324fdc96748fc48b5deb824db43b693b6c5dc Mon Sep 17 00:00:00 2001
2+
From: Anhad Singh <[email protected]>
3+
Date: Sun, 21 May 2023 12:58:08 +1000
44
Subject: [PATCH] <xxx>
55

66
---
7-
checkedout.xbstrap | 0
8-
fetched.xbstrap | 0
9-
patched.xbstrap | 0
107
.../linux_like/linux/gnu/b64/x86_64/mod.rs | 4 +-
118
src/unix/linux_like/linux/gnu/mod.rs | 4 +-
129
src/unix/linux_like/linux/mod.rs | 28 +-
13-
src/unix/mlibc/mod.rs | 561 ++++++++++++++++--
14-
7 files changed, 543 insertions(+), 54 deletions(-)
15-
create mode 100644 checkedout.xbstrap
16-
create mode 100644 fetched.xbstrap
17-
create mode 100644 patched.xbstrap
10+
src/unix/mlibc/mod.rs | 568 ++++++++++++++++--
11+
4 files changed, 550 insertions(+), 54 deletions(-)
1812

19-
diff --git a/checkedout.xbstrap b/checkedout.xbstrap
20-
new file mode 100644
21-
index 0000000..e69de29
22-
diff --git a/fetched.xbstrap b/fetched.xbstrap
23-
new file mode 100644
24-
index 0000000..e69de29
25-
diff --git a/patched.xbstrap b/patched.xbstrap
26-
new file mode 100644
27-
index 0000000..e69de29
2813
diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
2914
index e6307e2..cae81c4 100644
3015
--- a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
@@ -200,7 +185,7 @@ index be12190..c8762d5 100644
200185
.field("ifr_name", &self.ifr_name)
201186
.field("ifr_ifru", &self.ifr_ifru)
202187
diff --git a/src/unix/mlibc/mod.rs b/src/unix/mlibc/mod.rs
203-
index 2046530..a19b7fa 100644
188+
index 2046530..8a4f974 100644
204189
--- a/src/unix/mlibc/mod.rs
205190
+++ b/src/unix/mlibc/mod.rs
206191
@@ -47,7 +47,6 @@ pub type fsfilcnt_t = ::c_uint;
@@ -989,7 +974,7 @@ index 2046530..a19b7fa 100644
989974
pub fn pthread_create(
990975
thread: *mut ::pthread_t,
991976
attr: *const ::pthread_attr_t,
992-
@@ -752,6 +1239,8 @@ extern "C" {
977+
@@ -752,7 +1239,16 @@ extern "C" {
993978
addr: *mut ::sockaddr,
994979
addrlen: *mut ::socklen_t,
995980
) -> ::ssize_t;
@@ -998,6 +983,14 @@ index 2046530..a19b7fa 100644
998983
pub fn setgroups(ngroups: ::c_int, ptr: *const ::gid_t) -> ::c_int;
999984
pub fn setpwent();
1000985
pub fn writev(fd: ::c_int, iov: *const ::iovec, count: ::c_int) -> ::ssize_t;
986+
+
987+
+ // Non standard extensions, also found on modern BSD's.
988+
+ //
989+
+ // options/posix/include/sys/uio.h
990+
+ pub fn preadv(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t) -> ::ssize_t;
991+
+ pub fn pwritev(fd: ::c_int, iov: *const ::iovec, iovcnt: ::c_int, offset: ::off_t)
992+
+ -> ::ssize_t;
993+
}
1001994
--
1002-
2.40.0
995+
2.40.1
1003996

0 commit comments

Comments
 (0)